Update Javax APIs in order to build with Java 11 constraints. OSGi

annotations.

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index d9d6b6dd8c9167374fb0417a19eeb40f1267c30e..b0477339e71efb19f2df2d7bc2b0db57ce523145 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.25.r201910171408\r
+Bundle-Version: 2.1.26.SNAPSHOT-r201911221251\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/distribution.xml b/META-INF/spring/distribution.xml
index 6785f1fc9392b394207a49bc5072c2d0007a5b79..d765fb09293c5edbbcdf6278ec0ffb6a435ec538 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -14,12 +14,15 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp:2.1.25" />
+                       value="org.argeo.tp:argeo-tp:2.1.26-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
                                <ref bean="javax.jcr" />
-                               <ref bean="javax.transaction" />
+                               <ref bean="javax.el-api" />
+                               <ref bean="javax.interceptor-api" />
+                               <ref bean="javax.enterprise.cdi-api" />
+                               <ref bean="javax.transaction-api" />
                                <ref bean="javax.mail" />
                                <!-- Javax4hipsters -->
                                <ref bean="javax.websocket" />
@@ -112,7 +115,9 @@
                                <!-- ALM -->
                                <ref bean="org.junit" />
                                <ref bean="org.hamcrest" />
-                               <ref bean="org.osgi.annotation.bundle" />
+                               <ref bean="osgi.annotation" />
+                               <ref bean="org.osgi.service.metatype.annotations" />
+                               <ref bean="org.osgi.service.component.annotations" />
                                <ref bean="biz.aQute.bndlib" />
                                <ref bean="org.redline-rpm" />
                                <ref bean="org.eclipse.jgit" />
@@ -124,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.25" />
+                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.26-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -136,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.25" />
+                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.26-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -150,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.25" />
+       value="org.argeo.tp:argeo-tp-rap-e3:2.1.26-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 1daeb1e8f24cfe4d1f59d94a08c6e5233615477c..b9e0deaee50296a55c08e8ff1736b3a5c68545f7 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -26,18 +26,53 @@
                </property>
        </bean>
 
-       <bean id="javax.transaction" p:version="1.1.0"
-               p:sourceCoords="javax.transaction:jta:1.1"
+       <bean id="javax.transaction-api"
+               p:sourceCoords="javax.transaction:javax.transaction-api:1.3"
                parent="template.mavenJavax">
                <property name="license">
+                       <!-- GPL with classpath exception -->
                        <util:constant
-                               static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
+                               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.interceptor-api"
+               p:sourceCoords="javax.interceptor:javax.interceptor-api:1.2.2"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- GPL with classpath exception -->
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
+
+       <bean id="javax.el-api"
+               p:sourceCoords="javax.el:javax.el-api:2.2.5"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- GPL with classpath exception -->
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.GPL" />
                </property>
-               <property name="bndProperties">
-                       <props merge="true">
-                               <prop key="Fragment-Host">system.bundle; extension:=framework</prop>
-                       </props>
+               <property name="doNotModify" value="true" />
+       </bean>
+
+       <bean id="javax.enterprise.cdi-api" p:version="2.0.0.SP1"
+               p:sourceCoords="javax.enterprise:cdi-api:2.0.SP1"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- GPL with classpath exception -->
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
+               <property name="doNotModify" value="true" />
        </bean>
 
        <!-- Javax transaction 1.3 has dependencies -->

diff --git a/META-INF/spring/sdk.xml b/META-INF/spring/sdk.xml
index 69801a783415dfb24bfd77fe738b73b7f9d8c419..bfd313952fe8e31d9f481891ec2e7fc21f6f7e2a 100644 (file)
--- a/META-INF/spring/sdk.xml
+++ b/META-INF/spring/sdk.xml
@@ -62,8 +62,28 @@
                <!-- </property> -->
        </bean>
 
-       <bean id="org.osgi.annotation.bundle"
-               p:sourceCoords="org.osgi:org.osgi.annotation.bundle:1.0.0"
+       <bean id="osgi.annotation"
+               p:sourceCoords="org.osgi:osgi.annotation:7.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.osgi.service.metatype.annotations"
+               p:sourceCoords="org.osgi:org.osgi.service.metatype.annotations:1.4.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.osgi.service.component.annotations"
+               p:sourceCoords="org.osgi:org.osgi.service.component.annotations:1.4.0"
                parent="template.mavenSdk">
                <property name="doNotModify" value="true" />
                <property name="license">

diff --git a/pom.xml b/pom.xml
index 73f8055eb04c403a85f081cb1e05821d66fbe58e..9a6d490ae74d212d91dc6d49ec5476ac74dc6f98 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.25</version>
+       <version>2.1.26-SNAPSHOT</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>