Use Argeo TP v2.1.26 in order to support Java 11 complicance level.

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 7fa145544cffaf3c5f344fc528448f7b24184e61..95284c0bec3a2d13e7b031698ee540929db9c535 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
@@ -40,8 +42,21 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.javax</groupId>
-                       <artifactId>javax.transaction</artifactId>
+                       <artifactId>javax.el-api</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.interceptor-api</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.enterprise.cdi-api</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.transaction-api</artifactId>
+               </dependency>
+               
                <dependency>
                        <groupId>org.argeo.tp.apache</groupId>
                        <artifactId>org.apache.log4j</artifactId>
@@ -63,6 +78,20 @@
                        <artifactId>org.slf4j.commons.logging</artifactId>
                </dependency>
 
+               <!-- OSGi annotations -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
+<!--                   <artifactId>osgi.annotation</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
+<!--                   <artifactId>org.osgi.service.metatype.annotations</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
+<!--                   <artifactId>org.osgi.service.component.annotations</artifactId> -->
+<!--           </dependency> -->
+
                <!-- Freemarker -->
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>

diff --git a/pom.xml b/pom.xml
index e86d2c678680409bfabdf534a3b2aa47bf4f5a07..f5f735fcf9a16f43eb73e1fd57263e38cbbb8a6c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
        <!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
        <properties>
                <version.argeo-commons>2.1.83-SNAPSHOT</version.argeo-commons>
-               <version.argeo-tp>2.1.25</version.argeo-tp>
+               <version.argeo-tp>2.1.26</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -142,7 +142,7 @@ limitations under the License.
                                        <version>3.8.1</version>
                                        <configuration>
                                                <source>1.8</source>
-<!--                                           <source>11</source> -->
+                                               <!-- <source>11</source> -->
                                                <target>1.8</target>
                                                <compilerId>eclipse</compilerId>
                                                <!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->