Adapt to changes in Argeo TP

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 3e25980d56807abfd5574a98c957073c4992eaa7..c1adbe9f99038f26b9d8d7f52d8ad6e7c215c96b 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -118,16 +118,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>
+               <!-- <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>

diff --git a/org.argeo.ext.equinox.jetty/bnd.bnd b/org.argeo.ext.equinox.jetty/bnd.bnd
index 135f392e90419212eac794005ad5fb6de74a1b86..8b1b7146d7f1a2c315b703142489e2165ef7c7d8 100644 (file)
--- a/org.argeo.ext.equinox.jetty/bnd.bnd
+++ b/org.argeo.ext.equinox.jetty/bnd.bnd
@@ -1,4 +1,6 @@
 Fragment-Host: org.eclipse.equinox.http.jetty
 
 Import-Package: org.eclipse.jetty.websocket.jsr356,\
+org.eclipse.jetty.websocket.api,\
+org.eclipse.jetty.websocket.common,\
 *
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 2450e28d8c1125ae64d82ed9b1a377c87f7a78da..bf3ad91ecf31aa2a584d87009dce066ac4eea334 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.24-SNAPSHOT</version.argeo-tp>
+               <version.argeo-tp>2.1.24</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>