You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2018/04/03 15:12:07 UTC
[1/2] aries-jax-rs-whiteboard git commit: fix the resolve issue using
blacklist for embedded dependencies
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 5b2caed2a -> 1bbd8eccb
fix the resolve issue using blacklist for embedded dependencies
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/583cc447
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/583cc447
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/583cc447
Branch: refs/heads/master
Commit: 583cc447134d66c6eb05d5e779029bf924d98b33
Parents: 5b2caed
Author: Raymond Auge <ro...@apache.org>
Authored: Tue Apr 3 10:10:57 2018 -0400
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Apr 3 16:47:43 2018 +0200
----------------------------------------------------------------------
jax-rs.itests/itest.bndrun | 12 +++++-------
jax-rs.itests/pom.xml | 11 ++++++++++-
pom.xml | 15 ++++++++++++++-
3 files changed, 29 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/583cc447/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 36c7574..63ecff4 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -28,19 +28,17 @@
javax.json-api;version='[1.0.0,1.0.1)',\
org.apache.aries.javax.annotation-api;version='[0.0.1,0.0.2)',\
org.apache.aries.javax.jax.rs-api;version='[0.0.1,0.0.2)',\
- org.apache.aries.jax.rs.itests;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.itests-fragment;version='[0.0.1,0.0.2)',\
+ org.apache.aries.jax.rs.itests;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.whiteboard;version='[0.0.1,0.0.2)',\
+ org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\
org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
- osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.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.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
- org.apache.ws.xmlschema.core;version='[2.2.3,2.2.4)',\
- org.osgi.service.http.whiteboard;version='[1.0.0,1.0.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)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/583cc447/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index bf6e67b..ec9d633 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -53,6 +53,16 @@
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <bndruns>
+ <bndrun>itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
<configuration>
<failOnChanges>true</failOnChanges>
@@ -99,7 +109,6 @@
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.itests-fragment</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.spec</groupId>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/583cc447/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5632820..77b3dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.2.4</cxf.version>
- <bnd.version>3.5.0</bnd.version>
+ <bnd.version>4.0.0-SNAPSHOT</bnd.version>
</properties>
<scm>
@@ -185,4 +185,17 @@
<layout>default</layout>
</repository>
</repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>bnd-snapshots</id>
+ <url>https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
</project>
\ No newline at end of file
[2/2] aries-jax-rs-whiteboard git commit: Add automatically resolved
dependency
Posted by cs...@apache.org.
Add automatically resolved dependency
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/1bbd8ecc
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/1bbd8ecc
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/1bbd8ecc
Branch: refs/heads/master
Commit: 1bbd8eccb7e4047aca577a0e5ffe5d84b32996a3
Parents: 583cc44
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Apr 3 17:07:39 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Apr 3 17:07:39 2018 +0200
----------------------------------------------------------------------
jax-rs.itests/itest.bndrun | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/1bbd8ecc/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 63ecff4..34e61a2 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -33,6 +33,7 @@
org.apache.aries.jax.rs.whiteboard;version='[0.0.1,0.0.2)',\
org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\
+ org.apache.felix.http.api;version='[3.0.0,3.0.1)',\
org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\