Improve SDK components.

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 72734ff0fe6cdab8b3d555a54627b2403ce2b609..52f5a98fd49e8c37e3a8dc8c5ba0b0f08f869bdd 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -23,25 +23,17 @@
                                <ref bean="javax.mail" />
                                <ref bean="javax.websocket" />
 
-                               <!-- Builder -->
-                               <ref bean="biz.aQute.bnd" />
-                               <!-- <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" /> -->
-
                                <!-- Standalone projects -->
                                <ref bean="misc/org.slf4j" />
+                               <ref bean="slf4j.osgi" />
                                <ref bean="org.aopalliance" />
                                <ref bean="org.junit" />
-                               <!-- <ref bean="org.joda.time" /> -->
                                <ref bean="com.jcraft.jsch" />
                                <ref bean="EDU.oswego.cs.dl.util.concurrent" />
                                <ref bean="org.objectweb.asm" />
                                <ref bean="org.aspectj.weaver" />
                                <ref bean="misc/org.bouncycastle" />
-                               <!-- <ref bean="org.quartz-scheduler.quartz" /> -->
-                               <!-- <ref bean="org.quartz-scheduler.quartz.jobs" /> -->
                                <ref bean="bitronix.tm" />
-                               <!-- <ref bean="misc/org.w3c.css.sac" /> -->
-                               <!-- <ref bean="com.steadystate.css" /> -->
                                <ref bean="com.googlecode.javaewah.JavaEWAH" />
                                <ref bean="org.w3c.dom.svg" />
                                <ref bean="org.tukaani.xz" />
@@ -56,8 +48,6 @@
                                <ref bean="org.apache.mina.core" />
                                <ref bean="apache/org.apache.sshd" />
                                <ref bean="org.apache.tomcat.jni" />
-                               <!-- <ref bean="org.apache.aries.util" /> -->
-                               <!-- <ref bean="org.apache.aries.spifly.dynamic.bundle" /> -->
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -73,8 +63,6 @@
                                <ref bean="apache/org.apache.commons.exec" />
                                <ref bean="apache/org.apache.commons.math3" />
                                <ref bean="apache/org.apache.commons.cli" />
-                               <!-- <ref bean="apache/org.apache.commons.jxpath" /> -->
-                               <!-- <ref bean="apache/org.apache.commons.jci" /> -->
                                <ref bean="apache/org.apache.commons.compress" />
                                <ref bean="apache/org.apache.commons.lang3" />
 
@@ -109,11 +97,12 @@
                                <!-- Databases -->
                                <ref bean="org.postgresql.jdbc42" />
                                <ref bean="org.h2" />
-                               <!-- <ref bean="org.dbunit" /> -->
+
                                <!-- ALM -->
+                               <ref bean="org.osgi.annotation.bundle" />
+                               <ref bean="biz.aQute.bndlib" />
                                <ref bean="org.redline-rpm" />
                                <ref bean="org.eclipse.jgit" />
-                               <!-- <ref bean="misc/org.tmatesoft.svnkit" /> -->
                        </list>
                </property>
        </bean>

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 2b7b6609c6911852bb26288de84a9c4e8bf794da..f1a5410ae6e1b4236907af95b6494da1ea0b5fab 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -219,6 +219,15 @@
                </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 +326,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,17 +362,17 @@
                        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"
+               p:sourceCoords="org.freemarker:freemarker:2.3.29"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant
@@ -382,25 +391,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

diff --git a/META-INF/spring/sdk.xml b/META-INF/spring/sdk.xml
index ca66d744a8d6b91e828b875d9e75cba6c9302c37..9d1a345409ff3e36702212751a83567cfcdcb82f 100644 (file)
--- a/META-INF/spring/sdk.xml
+++ b/META-INF/spring/sdk.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:flow="http://www.argeo.org/schema/slc-flow"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
-       <bean id="org.junit" p:version="4.11.0" p:sourceCoords="junit:junit:4.11"
-               parent="template.mavenSdk">
+       <bean id="org.junit" p:version="4.11.0"
+               p:sourceCoords="junit:junit:4.11" parent="template.mavenSdk">
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.EPL" />
                </property>
                <property name="bndProperties">
                        <props merge="true">
@@ -23,30 +26,48 @@
                </property>
        </bean>
 
-       <bean id="biz.aQute.bnd" p:sourceCoords="biz.aQute.bnd:biz.aQute.bnd:4.2.0"
+       <bean id="biz.aQute.bndlib"
+               p:sourceCoords="biz.aQute.bnd:biz.aQute.bndlib:4.2.0"
                parent="template.mavenSdk">
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
-               <property name="bndProperties">
-                       <props merge="true">
-                               <prop key="Import-Package">
-                                       com.cloudius.*;resolution:=optional,
-                                       com.google.*;resolution:=optional,
-                                       org.eclipse.*;resolution:=optional,
-                                       org.apache.tools.ant.*;resolution:=optional,
-                                       junit.*;resolution:=optional,
-                                       slf4j.*;resolution:=optional,
-                                       *
-                               </prop>
-                       </props>
+               <property name="doNotModify" value="true" />
+<!--           <property name="bndProperties"> -->
+<!--                   <props merge="true"> -->
+<!--                           <prop key="Import-Package"> -->
+<!--                                   com.cloudius.*;resolution:=optional, -->
+<!--                                   com.google.*;resolution:=optional, -->
+<!--                                   org.eclipse.*;resolution:=optional, -->
+<!--                                   org.apache.tools.ant.*;resolution:=optional, -->
+<!--                                   junit.*;resolution:=optional, -->
+<!--                                   slf4j.*;resolution:=optional, -->
+<!--                                   !org.osgi.annotation.*, -->
+<!--                                   org.osgi.namespace.*;resolution:=optional, -->
+<!--                                   org.osgi.service.*;resolution:=optional, -->
+<!--                                   sun.misc;resolution:=optional, -->
+<!--                                   * -->
+<!--                           </prop> -->
+<!--                   </props> -->
+<!--           </property> -->
+       </bean>
+
+       <bean id="org.osgi.annotation.bundle"
+               p:sourceCoords="org.osgi:org.osgi.annotation.bundle:1.0.0"
+               parent="template.mavenSdk">
+               <property name="doNotModify" value="true" />
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
        </bean>
 
        <bean id="org.dbunit" p:sourceCoords="org.dbunit:dbunit:2.5.0"
                parent="template.mavenSdk">
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
                </property>
                <property name="bndProperties">
                        <props merge="true">
@@ -57,15 +78,19 @@
                </property>
        </bean>
 
-       <bean id="org.redline-rpm" p:sourceCoords="org.redline-rpm:redline:1.2.8"
+       <bean id="org.redline-rpm"
+               p:sourceCoords="org.redline-rpm:redline:1.2.8"
                parent="template.mavenSdk">
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.MIT" />
                </property>
                <property name="bndProperties">
                        <props merge="true">
                                <prop key="Import-Package">
                                        sun.security.*;resolution:=optional,
+                                       org.apache.tools.ant.*;resolution:=optional,
+                                       org.apache.tools.zip;resolution:=optional,
                                        *
                                </prop>
                        </props>
@@ -74,13 +99,15 @@
 
 
        <!-- SVN Kit -->
-       <flow:flow name="misc/org.tmatesoft.svnkit" spec="spec.version">
+       <flow:flow name="misc/org.tmatesoft.svnkit"
+               spec="spec.version">
                <flow:arg name="version" value="1.8.12" />
                <bean parent="template.archiveWrapper">
                        <property name="uri"
                                value="https://svnkit.com/org.tmatesoft.svn_@{version}.standalone.nojna.zip" />
                        <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+                               <util:constant
+                                       static-field="org.argeo.slc.repo.FreeLicense.EPL" />
                        </property>
                        <property name="wrappers">
                                <map>
@@ -105,7 +132,8 @@
                        </property>
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-                                       <property name="base" value="/svnkit-@{version}/svnkit/src/main/java/" />
+                                       <property name="base"
+                                               value="/svnkit-@{version}/svnkit/src/main/java/" />
                                        <property name="uri"
                                                value="https://svnkit.com/org.tmatesoft.svn_@{version}.src.zip" />
                                        <property name="osgiFactory" ref="osgiFactory" />