Adapt to changes in Argeo TP

diff --git a/demo/cms-e4-rap.properties b/demo/cms-e4-rap.properties
index 327829c7edf85585580e03e52db7f2a4606d95c1..e3f443524eaf8907b8b812a0624f194e46ca9a3d 100644 (file)
--- 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 e956db9e0d9a49bd438b0dc34154e4f361f6e32b..2e2b2b83dc45b5d4f7289ef01e1720ece6988544 100644 (file)
--- 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 6f82746d48825dc35b5bccf0a17f65447b1be373..0c5ed5d215d7efef0f4eeb6d2df21db5061ecb14 100644 (file)
--- 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>