Repository: aries-jax-rs-whiteboard Updated Branches: refs/heads/master 8c26a7a55 -> d3511f3c9
Use latest release 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/d3511f3c Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/d3511f3c Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/d3511f3c Branch: refs/heads/master Commit: d3511f3c9b1bdfd677df471477afaa39b112e494 Parents: 8c26a7a Author: Carlos Sierra <csie...@apache.org> Authored: Tue Apr 3 12:38:25 2018 +0200 Committer: Carlos Sierra <csie...@apache.org> Committed: Tue Apr 3 12:41:37 2018 +0200 ---------------------------------------------------------------------- jax-rs.itests-fragment/bnd.bnd | 36 ++++++++++++++++++++++++++++++++---- jax-rs.itests/itest.bndrun | 4 +--- jax-rs.itests/pom.xml | 14 ++------------ pom.xml | 2 +- 4 files changed, 36 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d3511f3c/jax-rs.itests-fragment/bnd.bnd ---------------------------------------------------------------------- diff --git a/jax-rs.itests-fragment/bnd.bnd b/jax-rs.itests-fragment/bnd.bnd index 28efb4b..ec9861d 100644 --- a/jax-rs.itests-fragment/bnd.bnd +++ b/jax-rs.itests-fragment/bnd.bnd @@ -1,6 +1,34 @@ Fragment-Host: org.apache.aries.jax.rs.whiteboard Export-Package:\ - org.apache.cxf;version="3.2.3",\ - org.apache.cxf.message;version="3.2.3",\ - org.apache.cxf.feature;version="3.2.3",\ - org.apache.cxf.jaxrs.ext;version="3.2.3" + org.apache.cxf;version="3.2.4",\ + org.apache.cxf.attachment;version="3.2.4",\ + org.apache.cxf.common.classloader;version="3.2.4",\ + org.apache.cxf.common.logging;version="3.2.4",\ + org.apache.cxf.common.security;version="3.2.4",\ + org.apache.cxf.common.util;version="3.2.4",\ + org.apache.cxf.configuration.security;version="3.2.4",\ + org.apache.cxf.endpoint;version="3.2.4",\ + org.apache.cxf.helpers;version="3.2.4",\ + org.apache.cxf.interceptor;version="3.2.4",\ + org.apache.cxf.interceptor.security;version="3.2.4",\ + org.apache.cxf.io;version="3.2.4",\ + org.apache.cxf.jaxrs;version="3.2.4",\ + org.apache.cxf.jaxrs.ext;version="3.2.4",\ + org.apache.cxf.jaxrs.impl;version="3.2.4",\ + org.apache.cxf.jaxrs.model;version="3.2.4",\ + org.apache.cxf.jaxrs.provider;version="3.2.4",\ + org.apache.cxf.jaxrs.utils;version="3.2.4",\ + org.apache.cxf.jaxrs.utils.multipart;version="3.2.4",\ + org.apache.cxf.message;version="3.2.4",\ + org.apache.cxf.phase;version="3.2.4",\ + org.apache.cxf.resource;version="3.2.4",\ + org.apache.cxf.security;version="3.2.4",\ + org.apache.cxf.security.transport;version="3.2.4",\ + org.apache.cxf.service.model;version="3.2.4",\ + org.apache.cxf.staxutils;version="3.2.4",\ + org.apache.cxf.staxutils.transform;version="3.2.4",\ + org.apache.cxf.transport.http.auth;version="3.2.4",\ + org.apache.cxf.helpers;version="3.2.4",\ + org.apache.cxf.helpers;version="3.2.4",\ + org.apache.cxf.helpers;version="3.2.4",\ + org.apache.cxf.common.util;version="3.2.4" http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d3511f3c/jax-rs.itests/itest.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun index 8aa4418..36c7574 100644 --- a/jax-rs.itests/itest.bndrun +++ b/jax-rs.itests/itest.bndrun @@ -29,6 +29,7 @@ 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.whiteboard;version='[0.0.1,0.0.2)',\ org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\ org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\ @@ -40,9 +41,6 @@ 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.aries.jax.rs.itests-fragment;version='[0.0.1,0.0.2)',\ - org.apache.cxf.cxf-core;version='[3.2.3,3.2.4)',\ - org.apache.cxf.cxf-rt-transports-http;version='[3.2.3,3.2.4)',\ org.apache.ws.xmlschema.core;version='[2.2.3,2.2.4)',\ org.osgi.service.http.whiteboard;version='[1.0.0,1.0.1)' -include: -personal.bnd http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d3511f3c/jax-rs.itests/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml index cdbed44..bf6e67b 100644 --- a/jax-rs.itests/pom.xml +++ b/jax-rs.itests/pom.xml @@ -53,16 +53,6 @@ </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> @@ -174,13 +164,13 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-core</artifactId> - <version>3.2.3-SNAPSHOT</version> + <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>3.2.3-SNAPSHOT</version> + <version>${cxf.version}</version> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/d3511f3c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a380667..5632820 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.2.3</cxf.version> + <cxf.version>3.2.4</cxf.version> <bnd.version>3.5.0</bnd.version> </properties>
