update to latest CXF and several other build fixes
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/aec6ebe6 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/aec6ebe6 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/aec6ebe6 Branch: refs/heads/master Commit: aec6ebe6d58cf9d930fef536cb735e44803d1877 Parents: 7eb883d Author: Raymond Auge <[email protected]> Authored: Tue Nov 28 13:54:57 2017 -0500 Committer: Raymond Auge <[email protected]> Committed: Tue Nov 28 13:54:57 2017 -0500 ---------------------------------------------------------------------- jax-rs.example/example.bndrun | 16 ++++++---------- jax-rs.example/pom.xml | 34 +++++++++------------------------- jax-rs.itests/itest.bndrun | 11 ++++------- jax-rs.itests/pom.xml | 24 +++++++----------------- jax-rs.whiteboard/bnd.bnd | 7 ++++--- jax-rs.whiteboard/pom.xml | 21 +++++++++++++-------- pom.xml | 2 +- 7 files changed, 44 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/aec6ebe6/jax-rs.example/example.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.example/example.bndrun b/jax-rs.example/example.bndrun index c6a3b96..fb7623f 100644 --- a/jax-rs.example/example.bndrun +++ b/jax-rs.example/example.bndrun @@ -5,7 +5,7 @@ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\ - osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\ osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)' -runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]' @@ -25,24 +25,20 @@ -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.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.example;version='[0.0.1,0.0.2)',\ - org.apache.aries.jax.rs.jaxrs.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)',\ org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\ org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\ - org.apache.felix.gogo.jline;version='[1.0.6,1.0.7)',\ org.apache.felix.gogo.runtime;version='[1.0.6,1.0.7)',\ + org.apache.felix.gogo.shell;version='[1.0.0,1.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.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.http.whiteboard;version='[1.0.0,1.0.1)',\ 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)' + slf4j.api;version='[1.7.25,1.7.26)' http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/aec6ebe6/jax-rs.example/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml index 6f90fb6..3981b1a 100644 --- a/jax-rs.example/pom.xml +++ b/jax-rs.example/pom.xml @@ -83,9 +83,9 @@ <version>6.0.0</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> + <groupId>org.apache.aries.cdi</groupId> + <artifactId>org.apache.aries.javax.annotation-api</artifactId> + <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.json</groupId> @@ -94,18 +94,12 @@ </dependency> <dependency> <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId> + <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId> <version>0.0.1-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId> + <groupId>org.apache.aries.spec</groupId> + <artifactId>org.apache.aries.javax.jax.rs-api</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> @@ -135,13 +129,13 @@ </dependency> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.gogo.jline</artifactId> + <artifactId>org.apache.felix.gogo.runtime</artifactId> <version>1.0.6</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.gogo.runtime</artifactId> - <version>1.0.6</version> + <artifactId>org.apache.felix.gogo.shell</artifactId> + <version>1.0.0</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -149,11 +143,6 @@ <version>2.0.8</version> </dependency> <dependency> - <groupId>org.apache.ws.xmlschema</groupId> - <artifactId>xmlschema-core</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.eclipse.equinox.metatype</artifactId> <version>1.4.100.v20150408-1437</version> @@ -178,10 +167,5 @@ <artifactId>org.osgi.service.jaxrs</artifactId> <version>LATEST</version> </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>5.0.4</version> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/aec6ebe6/jax-rs.itests/itest.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun index f55468a..1529517 100644 --- a/jax-rs.itests/itest.bndrun +++ b/jax-rs.itests/itest.bndrun @@ -25,23 +25,20 @@ -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.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.jaxrs.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)',\ 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.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\ - org.objectweb.asm;version='[5.0.4,5.0.5)',\ + org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)',\ 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)' + 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/aec6ebe6/jax-rs.itests/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml index 8c06936..0a20016 100644 --- a/jax-rs.itests/pom.xml +++ b/jax-rs.itests/pom.xml @@ -86,18 +86,13 @@ <version>6.0.0</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> - </dependency> - <dependency> <groupId>javax.json</groupId> <artifactId>javax.json-api</artifactId> <version>1.0</version> </dependency> <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId> + <groupId>org.apache.aries.cdi</groupId> + <artifactId>org.apache.aries.javax.annotation-api</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> @@ -106,6 +101,11 @@ <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.apache.aries.spec</groupId> + <artifactId>org.apache.aries.javax.jax.rs-api</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> <version>1.8.14</version> @@ -131,11 +131,6 @@ <version>2.0.8</version> </dependency> <dependency> - <groupId>org.apache.ws.xmlschema</groupId> - <artifactId>xmlschema-core</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.eclipse.osgi</artifactId> <version>3.10.100.v20150529-1857</version> @@ -155,10 +150,5 @@ <artifactId>osgi.enroute.hamcrest.wrapper</artifactId> <version>1.3.0</version> </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>5.0.4</version> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/aec6ebe6/jax-rs.whiteboard/bnd.bnd ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/bnd.bnd b/jax-rs.whiteboard/bnd.bnd index 6e8a87e..081f99d 100644 --- a/jax-rs.whiteboard/bnd.bnd +++ b/jax-rs.whiteboard/bnd.bnd @@ -31,13 +31,14 @@ Import-Package:\ !org.jvnet.fastinfoset.*,\ !org.jvnet.staxex.*,\ !org.ietf.jgss.*,\ + !org.objectweb.asm.*,\ !org.osgi.service.blueprint.*,\ !org.relaxng.datatype.*,\ !org.slf4j.spi.*,\ !org.springframework.*,\ * --contract: JavaJAXRS, JavaServlet +-contract: JavaAnnotation, JavaJAXRS, JavaServlet -exportcontents:\ org.apache.aries.jax.rs.whiteboard,\ @@ -52,5 +53,5 @@ Import-Package:\ lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-*.jar;lib:=true,\ lib/cxf-rt-transports-http.jar=cxf-rt-transports-http-*.jar;lib:=true,\ lib/cxf-tools-common.jar=cxf-tools-common-*.jar;lib:=true,\ - lib/cxf-tools-validator.jar=cxf-tools-validator-*.jar;lib:=true,\ - lib/jettison.jar=jettison-*.jar;lib:=true + lib/jettison.jar=jettison-*.jar;lib:=true,\ + lib/xmlschema-core.jar=xmlschema-core-*.jar;lib:=true http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/aec6ebe6/jax-rs.whiteboard/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml index 7216e38..242a079 100644 --- a/jax-rs.whiteboard/pom.xml +++ b/jax-rs.whiteboard/pom.xml @@ -33,14 +33,19 @@ <dependencies> <dependency> + <groupId>org.apache.aries.cdi</groupId> + <artifactId>org.apache.aries.javax.annotation-api</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.apache.aries.component-dsl</groupId> <artifactId>org.apache.aries.component-dsl.component-dsl</artifactId> <version>0.0.1-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId> + <groupId>org.apache.aries.spec</groupId> + <artifactId>org.apache.aries.javax.jax.rs-api</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> @@ -60,6 +65,12 @@ <artifactId>cxf-rt-databinding-jaxb</artifactId> <version>${cxf.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -86,12 +97,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-tools-validator</artifactId> - <version>${cxf.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.servlet-api</artifactId> <version>1.1.2</version> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/aec6ebe6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3f8b399..12e0f62 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.2-SNAPSHOT</cxf.version> <bnd.version>3.5.0</bnd.version> </properties>
