This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 874f58b0f23d25ad947c35b894abc4c2463d9b46 Author: Juan Cabrerizo <[email protected]> AuthorDate: Tue Jan 15 10:12:46 2019 +0000 Solved dependency problems --- karaf/features/src/main/feature/feature.xml | 1 + rest/rest-resources/pom.xml | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index 42cf4e4..de2d896 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -207,6 +207,7 @@ <feature>cxf-jaxrs</feature> <bundle dependency="true">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}</bundle> + <bundle dependency="true">mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${cxf.version}</bundle> <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle> diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml index 17effa1..5e605ff 100644 --- a/rest/rest-resources/pom.xml +++ b/rest/rest-resources/pom.xml @@ -77,10 +77,6 @@ </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> </dependency> @@ -121,6 +117,11 @@ <artifactId>cxf-rt-rs-security-cors</artifactId> <version>${cxf.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <version>${cxf.version}</version> + </dependency> <dependency> <groupId>org.apache.brooklyn</groupId>
