aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rotty3...@apache.org
Subject [2/3] aries-jax-rs-whiteboard git commit: update the resolutions to reflect the fixed API bundle
Date Thu, 10 Aug 2017 17:13:43 GMT
update the resolutions to reflect the fixed API bundle

Signed-off-by: Raymond Auge <rotty3000@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/195f4381
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/195f4381
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/195f4381

Branch: refs/heads/master
Commit: 195f438102553ab78ca4f0ba6081f774e6c7c523
Parents: 92705d0
Author: Raymond Auge <rotty3000@apache.org>
Authored: Thu Aug 10 13:06:18 2017 -0400
Committer: Raymond Auge <rotty3000@apache.org>
Committed: Thu Aug 10 13:08:18 2017 -0400

----------------------------------------------------------------------
 jax-rs.example/example.bndrun |  2 --
 jax-rs.example/pom.xml        | 10 ----------
 jax-rs.itests/itest.bndrun    |  2 --
 jax-rs.itests/pom.xml         | 10 ----------
 4 files changed, 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/195f4381/jax-rs.example/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example/example.bndrun b/jax-rs.example/example.bndrun
index af22a5c..c6a3b96 100644
--- a/jax-rs.example/example.bndrun
+++ b/jax-rs.example/example.bndrun
@@ -44,7 +44,5 @@
 	org.objectweb.asm;version='[5.0.4,5.0.5)',\
 	org.osgi.service.http;version='[1.2.1,1.2.2)',\
 	org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
-	org.osgi.util.function;version='[1.1.0,1.1.1)',\
-	org.osgi.util.promise;version='[1.1.0,1.1.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)'

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/195f4381/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index c33ff7e..6f90fb6 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -175,20 +175,10 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.util.function</artifactId>
-            <version>LATEST</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.jaxrs</artifactId>
             <version>LATEST</version>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.util.promise</artifactId>
-            <version>LATEST</version>
-        </dependency>
-        <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
             <version>5.0.4</version>

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/195f4381/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index f87d845..c74b820 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -37,8 +37,6 @@
 	org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
 	org.objectweb.asm;version='[5.0.4,5.0.5)',\
 	org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
-	org.osgi.util.function;version='[1.1.0,1.1.1)',\
-	org.osgi.util.promise;version='[1.1.0,1.1.1)',\
 	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
 	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/195f4381/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 8d94f57..8c06936 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -142,21 +142,11 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.util.function</artifactId>
-            <version>LATEST</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.jaxrs</artifactId>
             <version>LATEST</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.util.promise</artifactId>
-            <version>LATEST</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
             <artifactId>osgi.enroute.junit.wrapper</artifactId>
             <version>4.12.0</version>
         </dependency>


Mime
View raw message