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 2017/11/07 08:51:31 UTC
aries-jax-rs-whiteboard git commit: Upgrade to CXF 3.2.0 to support
JAX-RS 2.1 spec
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 9b7afe5ec -> 7f3c4633b
Upgrade to CXF 3.2.0 to support JAX-RS 2.1 spec
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/7f3c4633
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/7f3c4633
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/7f3c4633
Branch: refs/heads/master
Commit: 7f3c4633ba37ab9259788cde284a633d5d819f08
Parents: 9b7afe5
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Nov 7 09:50:36 2017 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Nov 7 09:50:36 2017 +0100
----------------------------------------------------------------------
javax-ws-rs/2_1/bnd.bnd | 13 +++++++
javax-ws-rs/2_1/pom.xml | 75 ++++++++++++++++++++++++++++++++++++++
javax-ws-rs/pom.xml | 3 +-
jax-rs.example/example.bndrun | 6 +--
jax-rs.example/pom.xml | 4 +-
jax-rs.itests/itest.bndrun | 6 +--
jax-rs.itests/pom.xml | 4 +-
pom.xml | 2 +-
8 files changed, 101 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7f3c4633/javax-ws-rs/2_1/bnd.bnd
----------------------------------------------------------------------
diff --git a/javax-ws-rs/2_1/bnd.bnd b/javax-ws-rs/2_1/bnd.bnd
new file mode 100644
index 0000000..9a93ee3
--- /dev/null
+++ b/javax-ws-rs/2_1/bnd.bnd
@@ -0,0 +1,13 @@
+# Keep -include instruction first because order matters
+-include: ~jar:file:${.}/target/lib/jaxrs-api.jar!/META-INF/MANIFEST.MF
+
+Bundle-SymbolicName: ${project.artifactId}
+Bundle-Version: ${project.version}
+Provide-Capability:\
+ 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"
+
+-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/7f3c4633/javax-ws-rs/2_1/pom.xml
----------------------------------------------------------------------
diff --git a/javax-ws-rs/2_1/pom.xml b/javax-ws-rs/2_1/pom.xml
new file mode 100644
index 0000000..a26f930
--- /dev/null
+++ b/javax-ws-rs/2_1/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries.jax.rs</groupId>
+ <artifactId>org.apache.aries.jax.javax.ws.rs.parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId>
+ <name>Apache Aries JAX-RS Specification 2.1 API</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxrs-api-2.1</artifactId>
+ <version>2.9.1</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.jaxrs-api-2.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>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7f3c4633/javax-ws-rs/pom.xml
----------------------------------------------------------------------
diff --git a/javax-ws-rs/pom.xml b/javax-ws-rs/pom.xml
index e06f63a..9015dc9 100644
--- a/javax-ws-rs/pom.xml
+++ b/javax-ws-rs/pom.xml
@@ -36,7 +36,8 @@
</properties>
<modules>
- <module>2_0</module>
+ <!-- <module>2_0</module>-->
+ <module>2_1</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7f3c4633/jax-rs.example/example.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.example/example.bndrun b/jax-rs.example/example.bndrun
index c6a3b96..40b0703 100644
--- a/jax-rs.example/example.bndrun
+++ b/jax-rs.example/example.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)',\
- javax.annotation-api;version='[1.2.0,1.2.1)',\
javax.json-api;version='[1.0.0,1.0.1)',\
log4j.over.slf4j;version='[1.7.25,1.7.26)',\
org.apache.aries.jax.rs.example;version='[0.0.1,0.0.2)',\
@@ -41,8 +40,9 @@
org.apache.felix.scr;version='[2.0.8,2.0.9)',\
org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
org.jline;version='[3.2.0,3.2.1)',\
- 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)',\
slf4j.api;version='[1.7.25,1.7.26)',\
- org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)'
+ org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)',\
+ javax.annotation-api;version='[1.3.0,1.3.1)',\
+ org.objectweb.asm;version='[5.2.0,5.2.1)'
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7f3c4633/jax-rs.example/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 6f90fb6..b70ccda 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>5.0.4</version>
+ <version>5.2</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7f3c4633/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index d1f4237..3ca17b7 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -24,7 +24,6 @@
-runbundles: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- javax.annotation-api;version='[1.2.0,1.2.1)',\
javax.json-api;version='[1.0.0,1.0.1)',\
log4j.over.slf4j;version='[1.7.25,1.7.26)',\
org.apache.aries.jax.rs.itests;version='[0.0.1,0.0.2)',\
@@ -35,12 +34,13 @@
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.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)',\
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)',\
org.osgi.service.http;version='[1.2.1,1.2.2)',\
- org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)'
+ org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)',\
+ javax.annotation-api;version='[1.3.0,1.3.1)',\
+ org.objectweb.asm;version='[5.2.0,5.2.1)'
-include: -personal.bnd
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7f3c4633/jax-rs.itests/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 8c06936..616fd07 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>5.0.4</version>
+ <version>5.2</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7f3c4633/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3783df3..aca0540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.1.10</cxf.version>
+ <cxf.version>3.2.0</cxf.version>
<bnd.version>3.5.0</bnd.version>
</properties>