Work on Jersey packaging.

[gpl/argeo-tp.git] / META-INF / spring / misc.xml

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 2b7b6609c6911852bb26288de84a9c4e8bf794da..8f7ad0d8b8695971f6fb0f90b05e83fdef82c0db 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -36,6 +36,16 @@
                </property>
        </bean>
 
+       <bean id="javassist" p:version="3.26.0"
+               p:sourceCoords="org.javassist:javassist:3.26.0-GA"
+               parent="template.mavenWrapper">
+               <property name="doNotModify" value="true" />
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+       </bean>
+
        <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.199"
                parent="template.mavenWrapper">
                <property name="doNotModify" value="true" />
@@ -193,32 +203,85 @@
        <!-- </property> -->
        <!-- </bean> -->
 
+       <!-- <flow:flow name="misc/org.slf4j" spec="spec.version"> -->
+       <!-- <flow:arg name="version" value="1.7.5" /> -->
+       <!-- <bean parent="template.archiveWrapper"> -->
+       <!-- <property name="uri" -->
+       <!-- value="http://www.slf4j.org/dist/slf4j-@{version}.zip" /> -->
+       <!-- <property name="license"> -->
+       <!-- <util:constant -->
+       <!-- static-field="org.argeo.slc.repo.FreeLicense.MIT" /> -->
+       <!-- </property> -->
+       <!-- <property name="wrappers"> -->
+       <!-- <map> -->
+       <!-- <entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar"> -->
+       <!-- <bean id="org.slf4j.log4j12" parent="template.bndWrapper" /> -->
+       <!-- </entry> -->
+       <!-- <entry key="slf4j-@{version}/slf4j-api-@{version}.jar"> -->
+       <!-- <bean id="org.slf4j.api" parent="template.bndWrapper" /> -->
+       <!-- </entry> -->
+       <!-- <entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar"> -->
+       <!-- <bean id="org.slf4j.commons.logging" -->
+       <!-- parent="template.bndWrapper" /> -->
+       <!-- </entry> -->
+       <!-- </map> -->
+       <!-- </property> -->
+       <!-- </bean> -->
+       <!-- </flow:flow> -->
+
        <flow:flow name="misc/org.slf4j" spec="spec.version">
-               <flow:arg name="version" value="1.7.5" />
-               <bean parent="template.archiveWrapper">
-                       <property name="uri"
-                               value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
+               <flow:arg name="version" value="1.7.28" />
+               <bean id="org.slf4j.api" parent="template.mavenWrapper"
+                       p:sourceCoords="org.slf4j:slf4j-api:@{version}">
+                       <property name="license">
+                               <util:constant
+                                       static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
+               </bean>
+               <bean id="org.slf4j.log4j12" parent="template.mavenWrapper"
+                       p:sourceCoords="org.slf4j:slf4j-log4j12:@{version}">
+                       <property name="bndProperties">
+                               <props merge="true">
+                                       <prop key="Export-Package">org.slf4j.impl</prop>
+                               </props>
+                       </property>
+                       <property name="license">
+                               <util:constant
+                                       static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
+               </bean>
+               <bean id="org.slf4j.commons.logging"
+                       parent="template.mavenWrapper"
+                       p:sourceCoords="org.slf4j:jcl-over-slf4j:@{version}">
                        <property name="license">
                                <util:constant
-                                       static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+                                       static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
+               </bean>
+               <bean id="org.slf4j.osgi.service.log"
+                       parent="template.mavenWrapper"
+                       p:sourceCoords="org.slf4j:osgi-over-slf4j:@{version}">
+                       <property name="bndProperties">
+                               <props merge="true">
+                                       <prop key="Bundle-Activator">org.slf4j.osgi.logservice.impl.Activator</prop>
+                               </props>
                        </property>
-                       <property name="wrappers">
-                               <map>
-                                       <entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar">
-                                               <bean id="org.slf4j.log4j12" parent="template.bndWrapper" />
-                                       </entry>
-                                       <entry key="slf4j-@{version}/slf4j-api-@{version}.jar">
-                                               <bean id="org.slf4j.api" parent="template.bndWrapper" />
-                                       </entry>
-                                       <entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar">
-                                               <bean id="org.slf4j.commons.logging"
-                                                       parent="template.bndWrapper" />
-                                       </entry>
-                               </map>
+                       <property name="license">
+                               <util:constant
+                                       static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                        </property>
                </bean>
        </flow:flow>
 
+       <bean id="slf4j.osgi" p:sourceCoords="org.osgi:slf4j.osgi:1.7.0"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
+
        <!-- <flow:flow name="misc/org.w3c.css.sac" spec="spec.version"> -->
        <!-- <flow:arg name="version" value="1.3" /> -->
        <!-- <bean parent="template.archiveWrapper"> -->
@@ -317,7 +380,7 @@
 
        <flow:flow name="misc/com.vladsch.flexmark"
                spec="spec.version">
-               <flow:arg name="version" value="0.40.16" />
+               <flow:arg name="version" value="0.50.40" />
                <bean id="com.vladsch.flexmark"
                        p:sourceCoords="com.vladsch.flexmark:flexmark:@{version}"
                        parent="template.mavenWrapperBSD">
@@ -353,22 +416,18 @@
                        parent="template.mavenWrapperBSD" />
        </flow:flow>
 
-       <bean id="org.jsoup" p:sourceCoords="org.jsoup:jsoup:1.11.3"
+       <bean id="org.jsoup" p:sourceCoords="org.jsoup:jsoup:1.2.1"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant
                                static-field="org.argeo.slc.repo.FreeLicense.MIT" />
                </property>
-               <property name="doNotModify" value="true" />
+               <!-- <property name="doNotModify" value="true" /> -->
        </bean>
 
        <bean id="org.freemarker"
-               p:sourceCoords="org.freemarker:freemarker:2.3.28"
-               parent="template.mavenWrapper">
-               <property name="license">
-                       <util:constant
-                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-               </property>
+               p:sourceCoords="org.freemarker:freemarker:2.3.29"
+               parent="template.mavenWrapperApacheLicense">
                <property name="doNotModify" value="true" />
        </bean>
 
@@ -382,25 +441,25 @@
                <property name="doNotModify" value="true" />
        </bean>
 
-       <bean id="org.atmosphere.runtime"
-               p:sourceCoords="org.atmosphere:atmosphere-runtime:2.4.32"
-               parent="template.mavenWrapper">
-               <property name="license">
-                       <util:constant
-                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-               </property>
-               <property name="doNotModify" value="true" />
-       </bean>
+       <!-- <bean id="org.atmosphere.runtime" -->
+       <!-- p:sourceCoords="org.atmosphere:atmosphere-runtime:2.4.32" -->
+       <!-- parent="template.mavenWrapper"> -->
+       <!-- <property name="license"> -->
+       <!-- <util:constant -->
+       <!-- static-field="org.argeo.slc.repo.FreeLicense.APACHE" /> -->
+       <!-- </property> -->
+       <!-- <property name="doNotModify" value="true" /> -->
+       <!-- </bean> -->
 
-       <bean id="org.atmosphere.socketio"
-               p:sourceCoords="org.atmosphere:atmosphere-socketio:2.4.21"
-               parent="template.mavenWrapper">
-               <property name="license">
-                       <util:constant
-                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-               </property>
-               <property name="doNotModify" value="true" />
-       </bean>
+       <!-- <bean id="org.atmosphere.socketio" -->
+       <!-- p:sourceCoords="org.atmosphere:atmosphere-socketio:2.4.21" -->
+       <!-- parent="template.mavenWrapper"> -->
+       <!-- <property name="license"> -->
+       <!-- <util:constant -->
+       <!-- static-field="org.argeo.slc.repo.FreeLicense.APACHE" /> -->
+       <!-- </property> -->
+       <!-- <property name="doNotModify" value="true" /> -->
+       <!-- </bean> -->
 
 
 </beans>
\ No newline at end of file