From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 May 2019 06:39:46 +0000 (+0200)
Subject: Adapt to changes in Argeo TP
X-Git-Tag: argeo-commons-2.1.77~5
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=04520ae57734bfb4f8d1242b53eecee67d185d15

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 3e25980d5..c1adbe9f9 100644
--- 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 135f392e9..8b1b7146d 100644
--- 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 2450e28d8..bf3ad91ec 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.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>