You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2020/01/12 18:42:07 UTC
[archiva-redback-core] branch master updated: Changing cxf,
jackson version
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
The following commit(s) were added to refs/heads/master by this push:
new 53da1a2 Changing cxf, jackson version
53da1a2 is described below
commit 53da1a29d77f880c8a9f0c24b70342586ecac70f
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Jan 12 19:42:01 2020 +0100
Changing cxf, jackson version
---
pom.xml | 9 +++++++--
.../redback-rest/redback-rest-services/pom.xml | 12 +++++-------
.../redback/rest/services/FakeCreateAdminService.java | 2 +-
.../archiva/redback/rest/services/UserServiceTest.java | 2 +-
.../src/test/resources/META-INF/spring-context.xml | 4 +++-
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 175a48c..91a9e59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gpg.useagent>true</gpg.useagent>
- <cxf.version>3.0.3</cxf.version>
+
+ <cxf.version>3.2.11</cxf.version>
+ <jackson.version>2.9.10</jackson.version>
+ <javax.ws.rs.version>2.1.1</javax.ws.rs.version>
<junit.platform.version>1.5.2</junit.platform.version>
<junit.jupiter.version>5.5.2</junit.jupiter.version>
@@ -539,10 +542,12 @@
<artifactId>stax-api</artifactId>
<version>1.0-2</version>
</dependency>
+
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.0</version>
+ <version>${javax.ws.rs.version}</version>
+ <scope>provided</scope>
</dependency>
<!--
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 56d54c8..6538a3a 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -137,6 +137,10 @@
<artifactId>mail</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </dependency>
<dependency>
@@ -183,13 +187,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminService.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminService.java
index 3ff767b..7b48d4c 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminService.java
@@ -36,7 +36,7 @@ public interface FakeCreateAdminService
@Path( "/testAuthzWithoutKarmasNeeded" )
@GET
- @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML} )
@RedbackAuthorization( noRestriction = false, noPermission = true )
Boolean testAuthzWithoutKarmasNeededButAuthz();
}
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
index e5e86cf..0bac7e2 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
@@ -124,7 +124,7 @@ public class UserServiceTest
WebClient.client( service ).header( "Authorization", authorizationHeader );
- assertTrue( service.testAuthzWithoutKarmasNeededButAuthz().booleanValue() );
+ assertTrue( service.testAuthzWithoutKarmasNeededButAuthz() );
}
catch ( ForbiddenException e )
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml
index 3f22e2a..b4da721 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml
@@ -33,11 +33,13 @@
-->
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
-
<jaxrs:server id="testServices" address="/fakeCreateAdminService">
<jaxrs:serviceBeans>
<ref bean="fakeCreateAdminService"/>
</jaxrs:serviceBeans>
+ <jaxrs:providers>
+ <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider"/>
+ </jaxrs:providers>
</jaxrs:server>