From 1ff9877b362afffdacd90da555e2cbd8519469e0 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 22 Nov 2019 19:40:39 +0100
Subject: [PATCH] Use Argeo TP v2.1.26 in order to support Java 11 complicance
 level.

---
 dep/org.argeo.dep.cms.client/pom.xml | 33 ++++++++++++++++++++++++++--
 pom.xml                              |  4 ++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 7fa145544..95284c0be 100644
--- 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 e86d2c678..f5f735fcf 100644
--- 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 -->
-- 
2.30.2