From 30736a826aac0d297c7411ee869506133b4d3929 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 22 Apr 2019 14:48:05 +0200
Subject: [PATCH] Adapt to changes in Argeo TP

---
 demo/cms-e4-rap.properties         |   3 +
 dep/org.argeo.dep.cms.node/pom.xml | 112 +++++++++++++++++++++++++----
 pom.xml                            |   2 +-
 3 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/demo/cms-e4-rap.properties b/demo/cms-e4-rap.properties
index 327829c7e..e3f443524 100644
--- a/demo/cms-e4-rap.properties
+++ b/demo/cms-e4-rap.properties
@@ -1,3 +1,6 @@
+argeo.osgi.start.1.node=\
+org.apache.aries.spifly.dynamic.bundle
+
 argeo.osgi.start.2.node=\
 org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.http.jetty,\
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index e956db9e0..2e2b2b83d 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -113,7 +113,16 @@
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>com.vladsch.flexmark.formatter</artifactId>
 		</dependency>
-
+		
+		<!-- Aries -->
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.aries.util</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+		</dependency>
 
 		<!-- HTTP Server -->
 		<dependency>
@@ -126,10 +135,10 @@
 		</dependency>
 
 		<!-- Jetty -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.client</artifactId> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.client</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.continuation</artifactId>
@@ -142,10 +151,10 @@
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.io</artifactId>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.jmx</artifactId> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.jmx</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.security</artifactId>
@@ -158,14 +167,91 @@
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.servlet</artifactId>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.servlets</artifactId> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.servlets</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.util</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.xml</artifactId>
+		</dependency>
+
+		<!-- HTTP2 -->
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.alpn.api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.alpn.client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.alpn.server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.client.http</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.http2.hpack</artifactId>
+		</dependency>
+
+		<!-- Async -->
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.websocket</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.websocket.api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.websocket.common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.websocket.client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.websocket.server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.websocket.servlet</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.websocket.javax.websocket</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.websocket.javax.websocket.server</artifactId>
+		</dependency>
+		<!-- Atmosphere -->
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.atmosphere.runtime</artifactId>
+		</dependency>
 
 	</dependencies>
 
diff --git a/pom.xml b/pom.xml
index 6f82746d4..0c5ed5d21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
 	<properties>
 		<version.argeo-commons>2.1.77-SNAPSHOT</version.argeo-commons>
-		<version.argeo-tp>2.1.23</version.argeo-tp>
+		<version.argeo-tp>2.1.24-SNAPSHOT</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
-- 
2.30.2