From 04520ae57734bfb4f8d1242b53eecee67d185d15 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 3 May 2019 08:39:46 +0200 Subject: [PATCH] Adapt to changes in Argeo TP --- dep/org.argeo.dep.cms.node/pom.xml | 18 +++++++++--------- org.argeo.ext.equinox.jetty/bnd.bnd | 2 ++ pom.xml | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) 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 @@ org.argeo.tp.misc com.vladsch.flexmark.formatter - + - - org.argeo.tp.apache - org.apache.aries.util - - - org.argeo.tp.apache - org.apache.aries.spifly.dynamic.bundle - + + + + + + + + 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 @@ 2.1.77-SNAPSHOT - 2.1.24-SNAPSHOT + 2.1.24 7 /srv/rpmfactory/argeo-osgi-2/el7 -- 2.30.2