Argeo TP v2.1.27, for Java 11 support.

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 8042183d47501b7e0ba36f210e6631f769bd4253..c240da28a1e893807bd4a0675feb6ed802752321 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.26.r201911221719\r
+Bundle-Version: 2.1.27.r201911272021\r
 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version\r
  ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi\r
  ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or\r

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 2c39891e3bf108f6096e6a2b0a20c1fc2fe8fb71..001d6d372a4852ba5e634f11f380e6efbe3bcc26 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -148,7 +148,7 @@
        </flow:flow>
 
        <flow:flow name="apache/org.apache.poi" spec="spec.version">
-               <flow:arg name="version" value="4.1.0" />
+               <flow:arg name="version" value="4.1.1" />
                <!-- <bean id="org.apache.poi" parent="template.apacheMaven" -->
                <!-- p:version="@{version}" -->
                <!-- p:sourceCoords="org.apache.servicemix.bundles:org.apache.servicemix.bundles.poi:@{version}_1"> -->
@@ -163,8 +163,10 @@
                                <props merge="true">
                                        <!-- <prop key="Fragment-Host">org.apache.poi</prop> -->
                                        <prop key="Import-Package">
+                                               com.graphbuilder.*;resolution:=optional,
                                                com.graphbuilder.*;resolution:=optional,
                                                org.etsi.uri.*;resolution:=optional,
+                                               org.apache.batik.*;resolution:=optional,
                                                *
                                        </prop>
                                </props>
@@ -201,12 +203,14 @@
        </flow:flow>
 
        <bean id="org.apache.xmlbeans"
-               p:sourceCoords="org.apache.xmlbeans:xmlbeans:3.0.1"
+               p:sourceCoords="org.apache.xmlbeans:xmlbeans:3.1.0"
                parent="template.apacheMaven">
                <property name="bndProperties">
                        <props merge="true">
                                <prop key="DynamicImport-Package">*</prop>
                                <prop key="Import-Package">
+                                       org.apache.tools.ant.*;resolution:=optional,
+                                       net.sf.saxon.*;resolution:=optional,
                                        com.sun.*;resolution:=optional,
                                        *
                                </prop>
@@ -241,10 +245,13 @@
                parent="template.apacheMaven" />
 
        <flow:flow name="apache/org.apache.batik" spec="spec.version">
-               <flow:arg name="version" value="1.10" />
+               <flow:arg name="version" value="1.12" />
                <!-- <bean id="org.apache.batik.ext" parent="template.apacheMaven" -->
                <!-- p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-ext:jar:@{version}" 
                        /> -->
+               <bean id="org.apache.batik.constants" parent="template.apacheMaven"
+                       p:version="@{version}.0"
+                       p:sourceCoords="org.apache.xmlgraphics:batik-constants:jar:@{version}" />
                <bean id="org.apache.batik.i18n" parent="template.apacheMaven"
                        p:version="@{version}.0"
                        p:sourceCoords="org.apache.xmlgraphics:batik-i18n:jar:@{version}" />
@@ -254,11 +261,14 @@
                <bean id="org.apache.batik.css" parent="template.apacheMaven"
                        p:version="@{version}.0"
                        p:sourceCoords="org.apache.xmlgraphics:batik-css:jar:@{version}" />
+               <bean id="org.apache.batik.anim" parent="template.apacheMaven"
+                       p:version="@{version}.0"
+                       p:sourceCoords="org.apache.xmlgraphics:batik-anim:jar:@{version}" />
        </flow:flow>
 
        <flow:flow name="apache/org.apache.xmlgraphics"
                spec="spec.version">
-               <flow:arg name="version" value="2.3" />
+               <flow:arg name="version" value="2.4" />
                <bean id="org.apache.xmlgraphics.commons"
                        parent="template.apacheMaven" p:version="@{version}.0"
                        p:sourceCoords="org.apache.xmlgraphics:xmlgraphics-commons:jar:@{version}" />

diff --git a/META-INF/spring/bouncycastle.xml b/META-INF/spring/bouncycastle.xml
index e9d572128eebb3425296ec08ffe39f4338b64632..d99bfa25096b125a62b49d9cca8a10215fe3011e 100644 (file)
--- a/META-INF/spring/bouncycastle.xml
+++ b/META-INF/spring/bouncycastle.xml
@@ -11,9 +11,9 @@
 
        <!-- REGISTER -->
        <flow:flow name="misc/org.bouncycastle" spec="spec.version">
-               <flow:arg name="version" value="1.63" />
+               <flow:arg name="version" value="1.64" />
                <bean id="bcprov"
-                       p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-163.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-164.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -24,7 +24,7 @@
                        </property>
                </bean>
                <bean id="bcpkix"
-                       p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-163.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-164.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -35,7 +35,7 @@
                        </property>
                </bean>
                <bean id="bcmail"
-                       p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-163.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-164.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -46,7 +46,7 @@
                        </property>
                </bean>
                <bean id="bcpg"
-                       p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-163.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-164.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 199c072e9aa37d095d4d0ab571cd042d28a38bd1..a579eb627c29526cd5f16f7122dd2c490c3c830c 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,7 +13,7 @@
        <bean id="argeo-tp"
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
-               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.26" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.27" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -22,11 +22,12 @@
                                <ref bean="javax.interceptor-api" />
                                <ref bean="javax.enterprise.cdi-api" />
                                <ref bean="javax.transaction-api" />
+                               <ref bean="javax.activation" />
                                <ref bean="javax.mail" />
                                <!-- Javax4hipsters -->
                                <ref bean="javax.websocket" />
                                <!-- <ref bean="javax.persistence" /> -->
-                               <!-- <ref bean="javax.xml.bind" /> -->
+                               <ref bean="javax.xml.bind" />
                                <!-- <ref bean="javax.ws.rs" /> -->
                                <!-- <ref bean="javax.annotation" /> -->
 
@@ -41,15 +42,15 @@
                                <ref bean="misc/org.bouncycastle" />
                                <ref bean="bitronix.tm" />
                                <ref bean="com.googlecode.javaewah.JavaEWAH" />
-                               <ref bean="org.w3c.dom.svg" />
+                               <!-- <ref bean="org.w3c.dom.svg" /> -->
                                <ref bean="org.tukaani.xz" />
                                <ref bean="net.i2p.crypto.eddsa" />
                                <ref bean="org.yaml.snakeyaml" />
 
                                <!-- Apache -->
                                <ref bean="apache/org.apache.log4j" />
-                               <ref bean="apache/org.apache.xmlgraphics" />
-                               <ref bean="apache/org.apache.batik" />
+                               <!-- <ref bean="apache/org.apache.xmlgraphics" /> -->
+                               <!-- <ref bean="apache/org.apache.batik" /> -->
                                <ref bean="apache/org.apache.httpcomponents.httpcore" />
                                <ref bean="apache/org.apache.httpcomponents.httpclient" />
                                <ref bean="org.apache.mina.core" />
@@ -128,7 +129,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.26" />
+                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.27" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -140,7 +141,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.26" />
+                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.27" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -154,7 +155,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.26" />
+                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.27" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index 8380055987192465980c63e9f288c67e1e540375..b2904caa3970343c41b02a670c26d7e517e9ac89 100644 (file)
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -12,7 +12,7 @@
 
        <flow:flow name="eclipse/org.argeo.tp.jetty"
                spec="spec.version">
-               <flow:arg name="version" value="9.4.21.v20190926" />
+               <flow:arg name="version" value="9.4.24.v20191120" />
                <bean id="org.eclipse.jetty.client" parent="template.jettyMaven"
                        p:sourceCoords="org.eclipse.jetty:jetty-client:@{version}" />
                <bean id="org.eclipse.jetty.continuation"

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index b9e0deaee50296a55c08e8ff1736b3a5c68545f7..a7920873945f38d8a37f00b0293354964e00e712 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -35,11 +35,16 @@
                                static-field="org.argeo.slc.repo.FreeLicense.GPL" />
                </property>
                <property name="doNotModify" value="true" />
-               <!-- <property name="bndProperties"> -->
-               <!-- <props merge="true"> -->
-               <!-- <prop key="Fragment-Host">system.bundle; extension:=framework</prop> -->
-               <!-- </props> -->
-               <!-- </property> -->
+       </bean>
+
+       <bean id="javax.activation"
+               p:sourceCoords="com.sun.activation:javax.activation:1.2.0"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
+               </property>
+               <property name="doNotModify" value="true" />
        </bean>
 
        <bean id="javax.interceptor-api"
@@ -75,24 +80,14 @@
                <property name="doNotModify" value="true" />
        </bean>
 
-       <!-- Javax transaction 1.3 has dependencies -->
-       <!-- <bean id="javax.transaction-api" p:version="1.3" -->
-       <!-- p:sourceCoords="javax.transaction:javax.transaction-api:1.3" -->
-       <!-- parent="template.mavenJavax"> -->
-       <!-- <property name="license"> -->
-       <!-- <util:constant -->
-       <!-- static-field="org.argeo.slc.repo.FreeLicense.CDDL" /> -->
-       <!-- </property> -->
-       <!-- <property name="doNotModify" value="true" /> -->
-       <!-- </bean> -->
-
        <bean id="javax.mail"
-               p:sourceCoords="com.sun.mail:javax.mail:1.6.2"
+               p:sourceCoords="javax.mail:javax.mail-api:1.6.2"
                parent="template.mavenJavax">
                <property name="license">
                        <util:constant
                                static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
                </property>
+               <property name="doNotModify" value="true" />
        </bean>
 
        <bean id="javax.annotation"

diff --git a/pom.xml b/pom.xml
index 5d9c9b09bf49a7907d6f2e99a9c7643ffea1f5c8..c55050c33827f1195d1f21b4ed894d388fde010d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.26</version>
+       <version>2.1.27</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>