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/06/26 08:29:13 UTC
[2/9] aries-jax-rs-whiteboard git commit: Use released libraries
Use released libraries
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/21c72a90
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/21c72a90
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/21c72a90
Branch: refs/heads/master
Commit: 21c72a906f7cc4cd2ef72cfb187afb18c7551d43
Parents: 59bbb2d
Author: Carlos Sierra <cs...@apache.org>
Authored: Mon Jun 18 13:05:31 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 09:44:53 2018 +0200
----------------------------------------------------------------------
javax.jax.rs-api/README | 12 ------------
javax.jax.rs-api/bnd.bnd | 9 +++++++--
javax.jax.rs-api/pom.xml | 32 +++++++++++++++----------------
jax-rs.itests-jaxb-json/itest.bndrun | 4 ++--
jax-rs.itests-jsonb/itest.bndrun | 5 +++--
jax-rs.itests-jsonp/itest.bndrun | 5 +++--
jax-rs.itests/itest.bndrun | 4 ++--
jax-rs.whiteboard/pom.xml | 6 +++---
8 files changed, 36 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/javax.jax.rs-api/README
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/README b/javax.jax.rs-api/README
deleted file mode 100644
index 646a59e..0000000
--- a/javax.jax.rs-api/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Aries JAX-RS Specification API
-Copyright 2017 The Apache Software Foundation
-
-This product includes software originating from [1] repackaged under the
-CDDL-1.1 license.
-
-The repackaging adds additional OSGi metadata following the directions
-located at [2].
-
-[1] https://jcp.org/en/jsr/detail?id=370
-[2] http://apache.org/legal/resolved.html#osgi-category-b
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/javax.jax.rs-api/bnd.bnd
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/bnd.bnd b/javax.jax.rs-api/bnd.bnd
index fcec762..3b68be4 100644
--- a/javax.jax.rs-api/bnd.bnd
+++ b/javax.jax.rs-api/bnd.bnd
@@ -18,7 +18,10 @@
# Keep -include instruction first because order matters
-include: ${.}/target/sources/META-INF/MANIFEST.MF
-Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html"
+Import-Package:\
+ org.apache.geronimo.osgi.registry.api;resolution:=optional,\
+ *
+
Provide-Capability:\
osgi.contract;\
osgi.contract=JavaJAXRS;\
@@ -27,5 +30,7 @@ Provide-Capability:\
-exportcontents: javax.ws.rs.*;version='2.1'
--includeresource: META-INF/README=README
+-includeresource:\
+ lib/geronimo-osgi-locator.jar=geronimo-osgi-locator-*.jar;lib:=true
+
-removeheaders: Archiver-Version, Created-By, Built-By, Build-Jdk
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/javax.jax.rs-api/pom.xml
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/pom.xml b/javax.jax.rs-api/pom.xml
index a79f084..a347866 100644
--- a/javax.jax.rs-api/pom.xml
+++ b/javax.jax.rs-api/pom.xml
@@ -32,27 +32,12 @@
<name>Apache Aries JAX-RS Specification API</name>
<version>0.0.1-SNAPSHOT</version>
- <properties>
- <spec.groupId>javax.ws.rs</spec.groupId>
- <spec.artifactId>javax.ws.rs-api</spec.artifactId>
- <spec.version>2.1</spec.version>
- <remoteresources.skip>true</remoteresources.skip>
- </properties>
-
- <licenses>
- <license>
- <name>CDDL-1.1</name>
- <url>https://spdx.org/licenses/CDDL-1.1.html</url>
- <comments>This project uses the javax.ws.rs API artifact under the terms of the CDDL-1.1 license.</comments>
- </license>
- </licenses>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
+ <configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
@@ -96,4 +81,19 @@
</plugins>
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-locator</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <spec.groupId>org.apache.geronimo.specs</spec.groupId>
+ <spec.artifactId>geronimo-jaxrs_2.1_spec</spec.artifactId>
+ <spec.version>1.0</spec.version>
+ <remoteresources.skip>true</remoteresources.skip>
+ </properties>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.itests-jaxb-json/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jaxb-json/itest.bndrun b/jax-rs.itests-jaxb-json/itest.bndrun
index 2a0a0ea..ae50046 100644
--- a/jax-rs.itests-jaxb-json/itest.bndrun
+++ b/jax-rs.itests-jaxb-json/itest.bndrun
@@ -26,7 +26,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- 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.whiteboard;version='[0.0.1,0.0.2)',\
org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
@@ -43,5 +42,6 @@
org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.aries.jax.rs.itests-jaxb-json;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.jaxb.json;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-fragment;version='[0.0.1,0.0.2)',\
+ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.itests-jsonb/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonb/itest.bndrun b/jax-rs.itests-jsonb/itest.bndrun
index 5c93446..ed3d612 100644
--- a/jax-rs.itests-jsonb/itest.bndrun
+++ b/jax-rs.itests-jsonb/itest.bndrun
@@ -26,7 +26,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- 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.whiteboard;version='[0.0.1,0.0.2)',\
org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
@@ -43,5 +42,7 @@
org.apache.aries.jax.rs.jsonb;version='[0.0.1,0.0.2)',\
org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.aries.jax.rs.itests-jsonb;version='[0.0.1,0.0.2)',\
- javax.json.bind-api;version='[1.0.0,1.0.1)'
+ javax.json.bind-api;version='[1.0.0,1.0.1)',\
+ javax.ws.rs-api;version='[2.1.0,2.1.1)',\
+ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.itests-jsonp/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jsonp/itest.bndrun b/jax-rs.itests-jsonp/itest.bndrun
index d82927d..341d97f 100644
--- a/jax-rs.itests-jsonp/itest.bndrun
+++ b/jax-rs.itests-jsonp/itest.bndrun
@@ -26,7 +26,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- 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.whiteboard;version='[0.0.1,0.0.2)',\
org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
@@ -42,5 +41,7 @@
slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.aries.jax.rs.jsonp;version='[0.0.1,0.0.2)',\
org.apache.servicemix.specs.json-api-1.1;version='[2.9.0,2.9.1)',\
- org.apache.aries.jax.rs.itests-jsonp;version='[0.0.1,0.0.2)'
+ org.apache.aries.jax.rs.itests-jsonp;version='[0.0.1,0.0.2)',\
+ javax.ws.rs-api;version='[2.1.0,2.1.1)',\
+ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 8839de2..8ad686b 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -25,7 +25,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- 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-fragment;version='[0.0.1,0.0.2)',\
org.apache.aries.jax.rs.itests;version='[0.0.1,0.0.2)',\
@@ -40,6 +39,7 @@
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)'
+ slf4j.api;version='[1.7.25,1.7.26)',\
+ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)'
-include: -personal.bnd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/21c72a90/jax-rs.whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index c7519fd..2c952f5 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -39,9 +39,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.spec</groupId>
- <artifactId>org.apache.aries.javax.annotation-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.annotation-api-1.3</artifactId>
+ <version>1.3_1</version>
</dependency>
<dependency>
<groupId>org.apache.aries.spec</groupId>