aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csie...@apache.org
Subject aries-jax-rs-whiteboard git commit: [JAXRS] build API jar against final release, fix contract, build first
Date Fri, 30 Jun 2017 06:54:21 GMT
Repository: aries-jax-rs-whiteboard
Updated Branches:
  refs/heads/master 1a1c2b708 -> 712aff838


[JAXRS] build API jar against final release, fix contract, build first

Signed-off-by: Raymond Auge <raymond.auge@liferay.com>


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/712aff83
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/712aff83
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/712aff83

Branch: refs/heads/master
Commit: 712aff8383ba4ea9ffe6c9d3c760e2a0c4e570fa
Parents: 1a1c2b7
Author: Raymond Auge <raymond.auge@liferay.com>
Authored: Thu Jun 29 12:41:00 2017 -0400
Committer: Raymond Auge <raymond.auge@liferay.com>
Committed: Thu Jun 29 12:41:00 2017 -0400

----------------------------------------------------------------------
 javax-ws-rs/2_0/bnd.bnd | 45 +++++++++--------------------------------
 javax-ws-rs/2_0/pom.xml | 48 ++++++++++++++++++++++++++++----------------
 pom.xml                 |  2 +-
 3 files changed, 42 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/712aff83/javax-ws-rs/2_0/bnd.bnd
----------------------------------------------------------------------
diff --git a/javax-ws-rs/2_0/bnd.bnd b/javax-ws-rs/2_0/bnd.bnd
index e3b960a..2c8f923 100644
--- a/javax-ws-rs/2_0/bnd.bnd
+++ b/javax-ws-rs/2_0/bnd.bnd
@@ -1,38 +1,13 @@
-# Double exports copied from Geronimo to ensure maximal 
-# compatibility
+# Keep -include instruction first because order matters
+-include: ~jar:file:${.}/target/lib/jaxrs-api.jar!/META-INF/MANIFEST.MF
 
-Export-Package:\
-    javax.ws.rs;jaxrs="2.0";version="1.1",\
-    javax.ws.rs;jaxrs="2.0";version="2.0",\
-    javax.ws.rs.client;jaxrs="2.0";version="1.1",\
-	javax.ws.rs.client;jaxrs="2.0";version="2.0",\
-	javax.ws.rs.container;jaxrs="2.0";version="1.1",\
-	javax.ws.rs.container;jaxrs="2.0";version="2.0",\
-	javax.ws.rs.core;jaxrs="2.0";version="1.1",\
-	javax.ws.rs.core;jaxrs="2.0";version="2.0",\
-	javax.ws.rs.ext;jaxrs="2.0";version="1.1",\
-	javax.ws.rs.ext;jaxrs="2.0";version="2.0"
-
-    
+Bundle-SymbolicName: ${project.artifactId}
+Bundle-Version: ${project.version}
 Provide-Capability:\
-    osgi.contract;osgi.contract="JavaJAXRS";version:List<Version>="2,1";\
-    uses:="javax.ws.rs,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.core,javax.ws.rs.ext"
-
-# Make the API substitutable with unversioned imports and a contract requirement
-
-Import-Package:\
-    !org.apache.geronimo.*,\
-    javax.ws.rs;version=0.0.0,\
-    javax.ws.rs.client;version=0.0.0,\
-    javax.ws.rs.container;version=0.0.0,\
-    javax.ws.rs.core;version=0.0.0,\
-    javax.ws.rs.ext;version=0.0.0,\
-    *
-
-Require-Capability:\
-    osgi.contract;filter:="(&(osgi.contract=JavaJAXRS)(version=2)(!(version>=2.1)))"
-
-Private-Package:\
-	org.apache.geronimo.osgi.locator
+	osgi.contract;\
+		osgi.contract=JavaJAXRS;\
+		uses:="javax.ws.rs,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.core,javax.ws.rs.ext";\
+		version:List<Version>="2,1.1"
 
-Bundle-SymbolicName: org.apache.aries.jax.rs.javax.ws.rs_2.0
\ No newline at end of file
+-includeresource:\
+	@${.}/target/lib/jaxrs-api.jar!/!META-INF/maven/(javax.ws.rs|org.apache.servicemix.specs)/*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/712aff83/javax-ws-rs/2_0/pom.xml
----------------------------------------------------------------------
diff --git a/javax-ws-rs/2_0/pom.xml b/javax-ws-rs/2_0/pom.xml
index f134a74..d590bfc 100644
--- a/javax-ws-rs/2_0/pom.xml
+++ b/javax-ws-rs/2_0/pom.xml
@@ -27,32 +27,46 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>javax.ws.rs_2.0</artifactId>
+    <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId>
     <name>Apache Aries JAX-RS Specification 2.0 API</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>6.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>5.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxrs_2.0_spec</artifactId>
-            <version>1.0-alpha-1</version>
-            <scope>provided</scope>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId>
+            <version>2.9.0</version>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                  <execution>
+                    <id>copy</id>
+                    <phase>process-classes</phase>
+                    <goals>
+                      <goal>copy</goal>
+                    </goals>
+                  </execution>
+                </executions>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>org.apache.servicemix.specs</groupId>
+                            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId>
+                            <overWrite>false</overWrite>
+                            <destFileName>jaxrs-api.jar</destFileName>
+                        </artifactItem>
+                    </artifactItems>
+                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                    <overWriteReleases>false</overWriteReleases>
+                    <overWriteSnapshots>true</overWriteSnapshots>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
             </plugin>

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/712aff83/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c811b57..def5ee6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,10 +140,10 @@
         </pluginManagement>
     </build>
     <modules>
+        <module>javax-ws-rs</module>
         <module>jax-rs.whiteboard</module>
         <module>jax-rs.itests</module>
         <module>jax-rs.example</module>
-        <module>javax-ws-rs</module>
     </modules>
     <dependencies>
         <dependency>


Mime
View raw message