Changing cxf, jackson version

This commit is contained in:
Martin Stockhammer 2020-01-12 19:42:01 +01:00
parent 363123dd2c
commit 53da1a29d7
5 changed files with 17 additions and 12 deletions

View File

@ -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>
<!--

View File

@ -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>

View File

@ -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();
}

View File

@ -124,7 +124,7 @@ public void getNoPermissionAuthz()
WebClient.client( service ).header( "Authorization", authorizationHeader );
assertTrue( service.testAuthzWithoutKarmasNeededButAuthz().booleanValue() );
assertTrue( service.testAuthzWithoutKarmasNeededButAuthz() );
}
catch ( ForbiddenException e )

View File

@ -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>