This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push: new 65ac0fc Upgrading Spring Boot and cargo-maven2-plugin, cleaning up WebAuthN transitive deps 65ac0fc is described below commit 65ac0fc692f66267451154256f66f8520d4b3639 Author: Francesco Chicchiriccò <ilgro...@apache.org> AuthorDate: Fri Sep 18 08:47:10 2020 +0200 Upgrading Spring Boot and cargo-maven2-plugin, cleaning up WebAuthN transitive deps --- pom.xml | 32 ++++++++++++++++++++-- .../wa/starter/SyncopeCoreTestingServer.java | 2 +- .../saml/SyncopeWASAML2ClientCustomizerTest.java | 4 +-- .../SyncopeWASAML2ClientMetadataGeneratorTest.java | 2 +- .../saml/SyncopeWASAML2MetadataResolverTest.java | 2 +- .../src/test/resources/debug/keymaster.properties | 2 +- wa/starter/src/test/resources/debug/wa.properties | 2 +- 7 files changed, 37 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 552974f..80e7e69 100644 --- a/pom.xml +++ b/pom.xml @@ -411,7 +411,7 @@ under the License. <spring.version>5.2.9.RELEASE</spring.version> <spring-security.version>5.4.0</spring-security.version> - <spring-boot.version>2.3.3.RELEASE</spring-boot.version> + <spring-boot.version>2.3.4.RELEASE</spring-boot.version> <spring-cloud-gateway.version>2.2.5.RELEASE</spring-cloud-gateway.version> <openjpa.version>3.1.2</openjpa.version> @@ -1582,11 +1582,39 @@ under the License. <groupId>org.apereo.cas</groupId> <artifactId>cas-server-support-webauthn</artifactId> <version>${cas.version}</version> + <exclusions> + <exclusion> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apereo.cas</groupId> <artifactId>cas-server-support-webauthn-core</artifactId> <version>${cas.version}</version> + <exclusions> + <exclusion> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apereo.cas</groupId> @@ -2242,7 +2270,7 @@ under the License. <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> - <version>1.8.0</version> + <version>1.8.1</version> <configuration> <configuration> <type>standalone</type> diff --git a/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java b/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java index bcb7adc..bc6bc06 100644 --- a/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java +++ b/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java @@ -50,7 +50,7 @@ public class SyncopeCoreTestingServer implements ApplicationListener<ContextRefr public static final List<WAClientApp> APPS = new ArrayList<>(); - private static final String ADDRESS = "http://localhost:9080/syncope/rest"; + private static final String ADDRESS = "http://localhost:9081/syncope/rest"; @Autowired private ServiceOps serviceOps; diff --git a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2ClientCustomizerTest.java b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2ClientCustomizerTest.java index 339f6ec5..f5f2656 100644 --- a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2ClientCustomizerTest.java +++ b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2ClientCustomizerTest.java @@ -53,7 +53,7 @@ public class SyncopeWASAML2ClientCustomizerTest extends BaseSyncopeWASAML2Client .build(); WASAML2SPKeystoreService saml2SPKeystoreService = mock(WASAML2SPKeystoreService.class); when(saml2SPKeystoreService.getByOwner(anyString())).thenReturn(keystoreTO); - when(saml2SPKeystoreService.set(any())).thenReturn(Response.created(new URI("http://localhost:9080/syncop-wa")).build()); + when(saml2SPKeystoreService.set(any())).thenReturn(Response.created(new URI("http://localhost:9081/syncop-wa")).build()); SAML2SPMetadataTO metadataTO = new SAML2SPMetadataTO.Builder() .owner("Syncope") @@ -62,7 +62,7 @@ public class SyncopeWASAML2ClientCustomizerTest extends BaseSyncopeWASAML2Client WASAML2SPMetadataService saml2SPMetadataService = mock(WASAML2SPMetadataService.class); when(saml2SPMetadataService.getByOwner(anyString())).thenReturn(metadataTO); - when(saml2SPMetadataService.set(any())).thenReturn(Response.created(new URI("http://localhost:9080/syncop-wa")).build()); + when(saml2SPMetadataService.set(any())).thenReturn(Response.created(new URI("http://localhost:9081/syncop-wa")).build()); WARestClient restClient = mock(WARestClient.class); diff --git a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2ClientMetadataGeneratorTest.java b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2ClientMetadataGeneratorTest.java index 2acf6fb..1f6ee23 100644 --- a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2ClientMetadataGeneratorTest.java +++ b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2ClientMetadataGeneratorTest.java @@ -71,7 +71,7 @@ public class SyncopeWASAML2ClientMetadataGeneratorTest extends BaseSyncopeWASAML client.getConfiguration().setKeystoreResourceFilepath(keystoreFile); SAML2MetadataGenerator generator = new SyncopeWASAML2ClientMetadataGenerator( - getWaRestClient(Response.created(new URI("http://localhost:9080/syncop-wa")).build()), client); + getWaRestClient(Response.created(new URI("http://localhost:9081/syncop-wa")).build()), client); EntityDescriptor entityDescriptor = generator.buildEntityDescriptor(); String metadata = generator.getMetadata(entityDescriptor); assertNotNull(generator.storeMetadata(metadata, null, false)); diff --git a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2MetadataResolverTest.java b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2MetadataResolverTest.java index 9a2b27b..2046299 100644 --- a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2MetadataResolverTest.java +++ b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/SyncopeWASAML2MetadataResolverTest.java @@ -56,7 +56,7 @@ public class SyncopeWASAML2MetadataResolverTest extends BaseSyncopeWASAML2Client WASAML2SPMetadataService saml2SPMetadataService = mock(WASAML2SPMetadataService.class); when(saml2SPMetadataService.getByOwner(anyString())).thenReturn(metadataTO); - when(saml2SPMetadataService.set(any())).thenReturn(Response.created(new URI("http://localhost:9080/syncop-wa")).build()); + when(saml2SPMetadataService.set(any())).thenReturn(Response.created(new URI("http://localhost:9081/syncop-wa")).build()); SyncopeClient syncopeClient = mock(SyncopeClient.class); when(syncopeClient.getService(WASAML2SPMetadataService.class)).thenReturn(saml2SPMetadataService); diff --git a/wa/starter/src/test/resources/debug/keymaster.properties b/wa/starter/src/test/resources/debug/keymaster.properties index 033fe3b..4642f9b 100644 --- a/wa/starter/src/test/resources/debug/keymaster.properties +++ b/wa/starter/src/test/resources/debug/keymaster.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -keymaster.address=http://localhost:9080/syncope/rest/keymaster +keymaster.address=http://localhost:9081/syncope/rest/keymaster keymaster.username=${anonymousUser} keymaster.password=${anonymousKey} diff --git a/wa/starter/src/test/resources/debug/wa.properties b/wa/starter/src/test/resources/debug/wa.properties index 29f53c3..adac573 100644 --- a/wa/starter/src/test/resources/debug/wa.properties +++ b/wa/starter/src/test/resources/debug/wa.properties @@ -26,7 +26,7 @@ cas.standalone.configurationDirectory=${conf.directory} cas.server.name=http://localhost:8080 cas.server.prefix=${cas.server.name}/syncope-wa cas.server.scope=syncope.org -cas.authn.syncope.url=http://localhost:9080/syncope/rest/ +cas.authn.syncope.url=http://localhost:9081/syncope/rest/ cas.tgc.secure=false cas.logout.follow-service-redirects=true