diff --git a/pom.xml b/pom.xml index 47cec56de..1bbaa5631 100644 --- a/pom.xml +++ b/pom.xml @@ -35,12 +35,12 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -316,7 +316,7 @@ true ossrh - https://oss.sonatype.org/ + https://s01.oss.sonatype.org/ true diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup deleted file mode 100644 index 1255fba17..000000000 --- a/pom.xml.releaseBackup +++ /dev/null @@ -1,403 +0,0 @@ - - - 4.0.0 - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - pom - spring-addons - Set of tools I find useful to work with Spring (mostly spring-security for OpenID) - https://github.com/ch4mpy/spring-addons/ - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - - - - - ch4mpy - Jérôme Wacongne - ch4mp@c4-soft.com - https://github.com/ch4mpy - - - - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - HEAD - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - 17 - ${java.version} - ${java.version} - UTF-8 - UTF-8 - - 3.13.0 - 3.1.2 - 3.4.1 - 3.6.3 - 3.0.1 - 3.5.3 - 3.3.1 - - 3.11.0.3922 - - 3.3.0 - - 0.2.0 - 1.6.0.Beta2 - - ${env.HOSTNAME} - https - - 2.5.0 - 1.4 - - - paketobuildpacks/builder:tiny - ${project.basedir}/bindings/ca-certificates - false - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - com.c4-soft.springaddons - spring-addons-oauth2 - ${project.version} - - - com.c4-soft.springaddons - spring-addons-oauth2-test - ${project.version} - - - - com.c4-soft.springaddons - spring-addons-starter-oidc - ${project.version} - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - ${project.version} - - - - com.c4-soft.springaddons - spring-addons-starter-rest - ${project.version} - - - - org.springdoc - springdoc-openapi-starter-webflux-api - ${springdoc-openapi.version} - - - org.springdoc - springdoc-openapi-starter-webflux-ui - ${springdoc-openapi.version} - - - org.springdoc - springdoc-openapi-starter-webmvc-api - ${springdoc-openapi.version} - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc-openapi.version} - - - - - - - - - repository.spring.release - Spring GA Repository - http://repo.spring.io/release - - false - - - true - never - - - - - - - - repository.spring.release - Spring GA Repository - http://repo.spring.io/plugins-release - - false - - - true - never - - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-shade-plugin - ${maven-shade-plugin.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - org.sonatype.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${sonar-maven-plugin.version} - - - - - - - maven-compiler-plugin - - true - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - true - - - - - org.sonatype.plugins - maven-deploy-plugin - - true - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - true - false - release - deploy - - - - - - - - release - - spring-addons-oauth2 - spring-addons-oauth2-test - spring-addons-starter-oidc - spring-addons-starter-oidc-test - spring-addons-starter-rest - spring-addons-starter-openapi - starters - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - gpg - - - --pinentry-mode - loopback - - - - - - - - - - default - - true - - - spring-addons-oauth2 - spring-addons-oauth2-test - spring-addons-starter-oidc - spring-addons-starter-oidc-test - spring-addons-starter-rest - spring-addons-starter-openapi - starters - samples - - - - - diff --git a/release.properties b/release.properties deleted file mode 100644 index fa0a646cc..000000000 --- a/release.properties +++ /dev/null @@ -1,140 +0,0 @@ -#release configuration -#Mon Jun 10 16:47:48 TAHT 2024 -project.dev.com.c4-soft.springaddons\:spring-addons=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_ui=7.8.2 -projectVersionPolicyId=default -scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} -project.dev.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_ui=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons.samples\:webflux-jwt-default.empty=true -project.scm.com.c4-soft.springaddons\:spring-addons-starter-oidc.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons.samples.tutorials\:servlet-resource-server.empty=true -project.dev.com.c4-soft.springaddons.samples\:webmvc-jwt-oauthentication=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons.starter\:spring-addons-starters-recaptcha=7.8.2 -project.rel.com.c4-soft.springaddons.samples.tutorials\:reactive-client=7.8.2 -project.scm.com.c4-soft.springaddons\:spring-addons-oauth2.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons.samples\:webmvc-jwt-default-jpa-authorities.empty=true -project.scm.com.c4-soft.springaddons\:spring-addons.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -project.dev.com.c4-soft.springaddons.samples.tutorials\:reactive-resource-server=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons.samples\:webflux-jwt-oauthentication.empty=true -project.scm.com.c4-soft.springaddons.samples.tutorials\:reactive-resource-server.empty=true -project.dev.com.c4-soft.springaddons\:spring-addons-oauth2=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons.starter\:spring-addons-starters-recaptcha.tag=spring-addons-7.6.11 -project.dev.com.c4-soft.springaddons.samples\:webflux-introspecting-default=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_additional-header=7.8.2 -project.scm.com.c4-soft.springaddons.samples.tutorials\:reactive-client.empty=true -project.scm.com.c4-soft.springaddons\:spring-addons-starter-rest.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -scm.tag=spring-addons-7.8.2 -project.scm.com.c4-soft.springaddons.samples.tutorials\:tutorials.empty=true -project.scm.com.c4-soft.springaddons.samples\:webflux-introspecting-default.empty=true -project.scm.com.c4-soft.springaddons\:spring-addons-starter-openapi.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -preparationGoals=clean verify -project.rel.com.c4-soft.springaddons.samples\:webflux-introspecting-oauthentication=7.8.2 -project.dev.com.c4-soft.springaddons.starter\:spring-addons-starters-webclient=7.8.3-SNAPSHOT -exec.pomFileName=pom.xml -project.scm.com.c4-soft.springaddons.starter\:spring-addons-starters-recaptcha.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -project.dev.com.c4-soft.springaddons.samples\:webmvc-introspecting-oauthentication=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons.samples.tutorials\:resource-server_multitenant_dynamic.empty=true -project.dev.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_oauthentication=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons\:starters=7.8.2 -project.scm.com.c4-soft.springaddons\:spring-addons-oauth2.tag=spring-addons-7.6.11 -project.rel.com.c4-soft.springaddons.samples.tutorials\:resource-server_multitenant_dynamic=7.8.2 -project.scm.com.c4-soft.springaddons\:spring-addons-oauth2-test.url=https\://github.com/ch4mpy/spring-addons -project.rel.com.c4-soft.springaddons.samples.tutorials\:tutorials=7.8.2 -pushChanges=true -project.rel.com.c4-soft.springaddons.samples\:spring-addons-samples=7.8.2 -project.rel.com.c4-soft.springaddons.samples.tutorials\:servlet-resource-server=7.8.2 -project.rel.com.c4-soft.springaddons.samples\:webmvc-jwt-oauthentication=7.8.2 -project.scm.com.c4-soft.springaddons\:spring-addons.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons.samples.tutorials\:servlet-client.empty=true -project.scm.com.c4-soft.springaddons\:spring-addons-oauth2-test.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -project.dev.com.c4-soft.springaddons\:spring-addons-oauth2-test=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons\:spring-addons=7.8.2 -scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} -project.dev.com.c4-soft.springaddons.samples.tutorials\:servlet-resource-server=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons.samples\:webflux-introspecting-default=7.8.2 -project.dev.com.c4-soft.springaddons.samples\:webmvc-jwt-default=7.8.3-SNAPSHOT -scm.url=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -project.dev.com.c4-soft.springaddons.samples\:webmvc-jwt-default-jpa-authorities=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_additional-header.empty=true -project.scm.com.c4-soft.springaddons.samples\:webmvc-jwt-oauthentication.empty=true -scm.developmentCommitComment=@{prefix} prepare for next development iteration -project.dev.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_introspection=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons\:spring-addons-oauth2-test=7.8.2 -project.scm.com.c4-soft.springaddons\:spring-addons-starter-rest.url=https\://github.com/ch4mpy/spring-addons -project.dev.com.c4-soft.springaddons.samples.tutorials\:resource-server_multitenant_dynamic=7.8.3-SNAPSHOT -project.dev.com.c4-soft.springaddons.samples\:webflux-introspecting-oauthentication=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons\:spring-addons-starter-oidc.url=https\://github.com/ch4mpy/spring-addons -project.rel.com.c4-soft.springaddons.samples.tutorials\:servlet-client=7.8.2 -project.scm.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_oauthentication.empty=true -project.scm.com.c4-soft.springaddons\:spring-addons-starter-openapi.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -project.dev.com.c4-soft.springaddons\:starters=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons.samples\:webmvc-introspecting-default=7.8.2 -project.scm.com.c4-soft.springaddons.starter\:spring-addons-starters-webclient.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons\:spring-addons-starter-rest.tag=spring-addons-7.6.11 -project.scm.com.c4-soft.springaddons.samples\:webmvc-introspecting-default.empty=true -project.scm.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_ui.empty=true -project.scm.com.c4-soft.springaddons.starter\:spring-addons-starters-webclient.url=https\://github.com/ch4mpy/spring-addons -projectVersionPolicyConfig=${projectVersionPolicyConfig}\n -project.dev.com.c4-soft.springaddons\:spring-addons-starter-openapi=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons\:spring-addons-starter-oidc.tag=spring-addons-7.6.11 -project.dev.com.c4-soft.springaddons.starter\:spring-addons-starters-recaptcha=7.8.3-SNAPSHOT -project.dev.com.c4-soft.springaddons\:spring-addons-starter-rest=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons\:spring-addons-oauth2.url=https\://github.com/ch4mpy/spring-addons -project.rel.com.c4-soft.springaddons\:spring-addons-starter-openapi=7.8.2 -project.rel.com.c4-soft.springaddons.samples\:webflux-jwt-oauthentication=7.8.2 -project.scm.com.c4-soft.springaddons\:spring-addons-starter-openapi.url=https\://github.com/ch4mpy/spring-addons -project.rel.com.c4-soft.springaddons.samples\:webmvc-jwt-default=7.8.2 -project.dev.com.c4-soft.springaddons\:spring-addons-starter-oidc=7.8.3-SNAPSHOT -project.dev.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_specialized_oauthentication=7.8.3-SNAPSHOT -releaseStrategyId=default -scm.commentPrefix=[maven-release-plugin] -project.rel.com.c4-soft.springaddons.samples\:webmvc-jwt-default-jpa-authorities=7.8.2 -project.dev.com.c4-soft.springaddons\:spring-addons-starter-oidc-test=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons\:spring-addons-starter-oidc-test.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons\:spring-addons.tag=HEAD -project.rel.com.c4-soft.springaddons.starter\:spring-addons-starters-webclient=7.8.2 -project.rel.com.c4-soft.springaddons\:spring-addons-starter-oidc=7.8.2 -project.scm.com.c4-soft.springaddons\:spring-addons-oauth2-test.tag=spring-addons-7.6.11 -project.scm.com.c4-soft.springaddons.samples\:webmvc-jwt-default.empty=true -completedPhase=run-completion-goals -project.scm.com.c4-soft.springaddons\:spring-addons-oauth2-test.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -project.rel.com.c4-soft.springaddons\:spring-addons-starter-rest=7.8.2 -project.dev.com.c4-soft.springaddons.samples\:spring-addons-samples=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons\:starters.empty=true -project.rel.com.c4-soft.springaddons\:spring-addons-starter-oidc-test=7.8.2 -project.dev.com.c4-soft.springaddons.samples\:webflux-jwt-oauthentication=7.8.3-SNAPSHOT -project.dev.com.c4-soft.springaddons.samples.tutorials\:servlet-client=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons\:spring-addons-starter-openapi.tag=spring-addons-7.6.11 -project.dev.com.c4-soft.springaddons.samples.tutorials\:reactive-client=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons.samples\:webflux-introspecting-oauthentication.empty=true -project.dev.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_additional-header=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons.samples\:webflux-jwt-default=7.8.2 -pinExternals=false -project.dev.com.c4-soft.springaddons.samples.tutorials\:tutorials=7.8.3-SNAPSHOT -project.scm.com.c4-soft.springaddons\:spring-addons-starter-oidc-test.tag=spring-addons-7.6.11 -project.scm.com.c4-soft.springaddons.samples\:spring-addons-samples.empty=true -project.dev.com.c4-soft.springaddons.samples\:webflux-jwt-default=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_oauthentication=7.8.2 -project.rel.com.c4-soft.springaddons.samples.tutorials\:reactive-resource-server=7.8.2 -project.dev.com.c4-soft.springaddons.samples\:webmvc-introspecting-default=7.8.3-SNAPSHOT -project.rel.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_introspection=7.8.2 -remoteTagging=true -project.scm.com.c4-soft.springaddons.starter\:spring-addons-starters-recaptcha.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons\:spring-addons-starter-oidc-test.url=https\://github.com/ch4mpy/spring-addons -project.scm.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_introspection.empty=true -project.scm.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_specialized_oauthentication.empty=true -project.scm.com.c4-soft.springaddons\:spring-addons-starter-rest.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons.samples\:webmvc-introspecting-oauthentication.empty=true -project.rel.com.c4-soft.springaddons.samples\:webmvc-introspecting-oauthentication=7.8.2 -scm.tagNameFormat=@{project.artifactId}-@{project.version} -project.rel.com.c4-soft.springaddons.samples.tutorials\:resource-server_with_specialized_oauthentication=7.8.2 -project.scm.com.c4-soft.springaddons\:spring-addons-oauth2.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons\:spring-addons-starter-oidc.developerConnection=scm\:git\:git@github.com\:ch4mpy/spring-addons.git -project.rel.com.c4-soft.springaddons\:spring-addons-oauth2=7.8.2 -project.scm.com.c4-soft.springaddons.starter\:spring-addons-starters-webclient.tag=spring-addons-7.6.11 -project.scm.com.c4-soft.springaddons.starter\:spring-addons-starters-recaptcha.url=https\://github.com/ch4mpy/spring-addons -project.scm.com.c4-soft.springaddons\:spring-addons-starter-oidc-test.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -project.scm.com.c4-soft.springaddons.starter\:spring-addons-starters-webclient.connection=scm\:git\:git\://github.com/ch4mpy/spring-addons.git -exec.snapshotReleasePluginAllowed=false -project.scm.com.c4-soft.springaddons\:spring-addons.url=https\://github.com/ch4mpy/spring-addons -scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} diff --git a/samples/pom.xml.releaseBackup b/samples/pom.xml.releaseBackup deleted file mode 100644 index 34e026537..000000000 --- a/samples/pom.xml.releaseBackup +++ /dev/null @@ -1,310 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - .. - - com.c4-soft.springaddons.samples - spring-addons-samples - pom - - - 17 - 2023.0.1 - - - 2.2.19 - ${project.basedir} - http - localhost - 8080 - - - - webflux-introspecting-default - webflux-introspecting-oauthentication - webflux-jwt-default - webflux-jwt-oauthentication - webmvc-introspecting-default - webmvc-introspecting-oauthentication - webmvc-jwt-default - webmvc-jwt-default-jpa-authorities - webmvc-jwt-oauthentication - tutorials - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - io.swagger.core.v3 - swagger-annotations - ${io.swagger.core.v3.version} - - - io.swagger.core.v3 - swagger-annotations-jakarta - ${io.swagger.core.v3.version} - - - - com.c4-soft.springaddons - spring-addons-starter-oidc - ${project.version} - - - com.c4-soft.springaddons - spring-addons-oauth2-test - ${project.version} - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - ${project.version} - - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - org.projectlombok - lombok-mapstruct-binding - ${lombok-mapstruct-binding.version} - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - org.projectlombok - lombok - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - ${repackage.classifier} - - ${image.builder} - - - ${ca-certificates.binding}:/platform/bindings/ca-certificates:ro - - - ${java.version} - - - - - org.projectlombok - lombok - - - - - - - - - - - - - openapi-webmvc - - - org.springdoc - springdoc-openapi-starter-webmvc-api - ${springdoc-openapi.version} - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - pre-integration-test - - start - - - - post-integration-test - - stop - - - - - - org.springdoc - springdoc-openapi-maven-plugin - ${springdoc-openapi-maven-plugin.version} - - - ${integration-tests.scheme}://${integration-tests.hostname}:${integration-tests.port}/v3/api-docs - ${project.artifactId}.openapi.json - ${springdoc-openapi.output-dir} - false - - - - integration-test - - generate - - - - - - - - - openapi-webflux - - - org.springdoc - springdoc-openapi-starter-webflux-api - ${springdoc-openapi.version} - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - pre-integration-test - - start - - - - post-integration-test - - stop - - - - - - org.springdoc - springdoc-openapi-maven-plugin - ${springdoc-openapi-maven-plugin.version} - - - ${integration-tests.scheme}://${integration-tests.hostname}:${integration-tests.port}/v3/api-docs - ${project.artifactId}.openapi.json - ${springdoc-openapi.output-dir} - false - - - - integration-test - - generate - - - - - - - - - - - - spring-release - Spring release - https://repo.spring.io/release - - false - - - - spring-milestone - Spring milestone - https://repo.spring.io/milestone - - false - - - - spring-snapshot - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - - - spring-release - Spring release - https://repo.spring.io/release - - false - - - - spring-milestone - Spring milestone - https://repo.spring.io/milestone - - false - - - - spring-snapshot - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - - diff --git a/samples/tutorials/pom.xml.releaseBackup b/samples/tutorials/pom.xml.releaseBackup deleted file mode 100644 index 35a1bb2af..000000000 --- a/samples/tutorials/pom.xml.releaseBackup +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - com.c4-soft.springaddons.samples.tutorials - tutorials - pom - - - resource-server_with_introspection - resource-server_with_oauthentication - resource-server_with_specialized_oauthentication - resource-server_with_ui - resource-server_with_additional-header - reactive-client - servlet-client - reactive-resource-server - servlet-resource-server - resource-server_multitenant_dynamic - - diff --git a/samples/tutorials/reactive-client/pom.xml.releaseBackup b/samples/tutorials/reactive-client/pom.xml.releaseBackup deleted file mode 100644 index 384d3dcbe..000000000 --- a/samples/tutorials/reactive-client/pom.xml.releaseBackup +++ /dev/null @@ -1,86 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - reactive-client - reactive-client - Spring Boot reactive OAuth2 client - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-client - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-webflux - - - com.jayway.jsonpath - json-path - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - io.projectreactor - reactor-test - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - com.c4-soft.springaddons - spring-addons-oauth2-test - test - - - - - - - org.graalvm.buildtools - native-maven-plugin - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/samples/tutorials/reactive-resource-server/pom.xml.releaseBackup b/samples/tutorials/reactive-resource-server/pom.xml.releaseBackup deleted file mode 100644 index fc486457b..000000000 --- a/samples/tutorials/reactive-resource-server/pom.xml.releaseBackup +++ /dev/null @@ -1,71 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - reactive-resource-server - reactive-resource-server - - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.boot - spring-boot-starter-webflux - - - com.jayway.jsonpath - json-path - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - com.c4-soft.springaddons - spring-addons-oauth2-test - test - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - diff --git a/samples/tutorials/resource-server_multitenant_dynamic/pom.xml.releaseBackup b/samples/tutorials/resource-server_multitenant_dynamic/pom.xml.releaseBackup deleted file mode 100644 index 86a8608c2..000000000 --- a/samples/tutorials/resource-server_multitenant_dynamic/pom.xml.releaseBackup +++ /dev/null @@ -1,74 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - resource-server_multitenant_dynamic - resource-server_multitenant_dynamic - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.security - spring-security-config - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - - - jakarta.servlet - jakarta.servlet-api - provided - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.springframework.boot - spring-boot-starter-test - test - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - diff --git a/samples/tutorials/resource-server_with_additional-header/pom.xml.releaseBackup b/samples/tutorials/resource-server_with_additional-header/pom.xml.releaseBackup deleted file mode 100644 index 5589768a5..000000000 --- a/samples/tutorials/resource-server_with_additional-header/pom.xml.releaseBackup +++ /dev/null @@ -1,71 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - resource-server_with_additional-header - resource-server with additional-header - - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.boot - spring-boot-starter-web - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - diff --git a/samples/tutorials/resource-server_with_introspection/pom.xml.releaseBackup b/samples/tutorials/resource-server_with_introspection/pom.xml.releaseBackup deleted file mode 100644 index ab2b3a8ae..000000000 --- a/samples/tutorials/resource-server_with_introspection/pom.xml.releaseBackup +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - resource-server_with_introspection - resource-server with access-token introspection - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - diff --git a/samples/tutorials/resource-server_with_oauthentication/pom.xml.releaseBackup b/samples/tutorials/resource-server_with_oauthentication/pom.xml.releaseBackup deleted file mode 100644 index a50bdf868..000000000 --- a/samples/tutorials/resource-server_with_oauthentication/pom.xml.releaseBackup +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - resource-server_with_oauthentication - resource-server with OAuthentication - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.security - spring-security-config - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.springframework.boot - spring-boot-starter-test - test - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - diff --git a/samples/tutorials/resource-server_with_specialized_oauthentication/pom.xml.releaseBackup b/samples/tutorials/resource-server_with_specialized_oauthentication/pom.xml.releaseBackup deleted file mode 100644 index 80480172f..000000000 --- a/samples/tutorials/resource-server_with_specialized_oauthentication/pom.xml.releaseBackup +++ /dev/null @@ -1,78 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - resource-server_with_specialized_oauthentication - resource-server with specialized OAuthentication - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.security - spring-security-config - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - diff --git a/samples/tutorials/resource-server_with_ui/pom.xml.releaseBackup b/samples/tutorials/resource-server_with_ui/pom.xml.releaseBackup deleted file mode 100644 index c08ed611f..000000000 --- a/samples/tutorials/resource-server_with_ui/pom.xml.releaseBackup +++ /dev/null @@ -1,105 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - resource-server_with_ui - resource-server with UI and OAuth2 login - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - org.springframework.boot - spring-boot-starter-oauth2-client - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - com.c4-soft.springaddons - spring-addons-starter-rest - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-webflux - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - - org.springframework.boot - spring-boot-starter-test - test - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - diff --git a/samples/tutorials/servlet-client/pom.xml.releaseBackup b/samples/tutorials/servlet-client/pom.xml.releaseBackup deleted file mode 100644 index 6f5e3d086..000000000 --- a/samples/tutorials/servlet-client/pom.xml.releaseBackup +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - servlet-client - servlet-client - Spring Boot Servlet OAuth2 client - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-client - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - com.jayway.jsonpath - json-path - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - diff --git a/samples/tutorials/servlet-resource-server/pom.xml.releaseBackup b/samples/tutorials/servlet-resource-server/pom.xml.releaseBackup deleted file mode 100644 index 06ce5def1..000000000 --- a/samples/tutorials/servlet-resource-server/pom.xml.releaseBackup +++ /dev/null @@ -1,75 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples.tutorials - tutorials - 7.8.2-SNAPSHOT - .. - - servlet-resource-server - servlet-resource-server - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.boot - spring-boot-starter-web - - - com.jayway.jsonpath - json-path - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - com.c4-soft.springaddons - spring-addons-oauth2-test - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - diff --git a/samples/webflux-introspecting-default/pom.xml.releaseBackup b/samples/webflux-introspecting-default/pom.xml.releaseBackup deleted file mode 100644 index c99aa70e2..000000000 --- a/samples/webflux-introspecting-default/pom.xml.releaseBackup +++ /dev/null @@ -1,67 +0,0 @@ - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webflux-introspecting-default - Sample reactive OAuth2 resource-server with access-token introspection and Spring default Authentication implementation: JwtAuthenticationToken - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/samples/webflux-introspecting-oauthentication/pom.xml.releaseBackup b/samples/webflux-introspecting-oauthentication/pom.xml.releaseBackup deleted file mode 100644 index 36b9380c4..000000000 --- a/samples/webflux-introspecting-oauthentication/pom.xml.releaseBackup +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webflux-introspecting-oauthentication - Sample reactive OAuth2 resource-server with access-token introspection and OAuthentication - - - - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-actuator - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/samples/webflux-jwt-default/pom.xml.releaseBackup b/samples/webflux-jwt-default/pom.xml.releaseBackup deleted file mode 100644 index 18e72af5e..000000000 --- a/samples/webflux-jwt-default/pom.xml.releaseBackup +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webflux-jwt-default - Sample reactive OAuth2 resource-server with JWT decoder and Spring default Authentication implementation: JwtAuthenticationToken - - - - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/samples/webflux-jwt-oauthentication/pom.xml.releaseBackup b/samples/webflux-jwt-oauthentication/pom.xml.releaseBackup deleted file mode 100644 index 312dba0cd..000000000 --- a/samples/webflux-jwt-oauthentication/pom.xml.releaseBackup +++ /dev/null @@ -1,67 +0,0 @@ - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webflux-jwt-oauthentication - Sample reactive OAuth2 resource-server with JWT decoder and OAuthentication - - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/samples/webmvc-introspecting-default/pom.xml.releaseBackup b/samples/webmvc-introspecting-default/pom.xml.releaseBackup deleted file mode 100644 index 59172a358..000000000 --- a/samples/webmvc-introspecting-default/pom.xml.releaseBackup +++ /dev/null @@ -1,92 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webmvc-introspecting-default - Sample servlet OAuth2 resource-server with access-token introspection and Spring default Authentication implementation: JwtAuthenticationToken - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - org.springframework.security - spring-security-config - - - - io.swagger.core.v3 - swagger-annotations - - - - org.mapstruct - mapstruct - - - org.projectlombok - lombok-mapstruct-binding - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/samples/webmvc-introspecting-oauthentication/pom.xml.releaseBackup b/samples/webmvc-introspecting-oauthentication/pom.xml.releaseBackup deleted file mode 100644 index 8caecc3c5..000000000 --- a/samples/webmvc-introspecting-oauthentication/pom.xml.releaseBackup +++ /dev/null @@ -1,96 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webmvc-introspecting-oauthentication - Sample servlet OAuth2 resource-server with access-token introspection and OAuthentication - - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - org.springframework.security - spring-security-config - - - - io.swagger.core.v3 - swagger-annotations - - - - org.mapstruct - mapstruct - - - org.projectlombok - lombok-mapstruct-binding - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/samples/webmvc-jwt-default-jpa-authorities/pom.xml.releaseBackup b/samples/webmvc-jwt-default-jpa-authorities/pom.xml.releaseBackup deleted file mode 100644 index 66a6289e9..000000000 --- a/samples/webmvc-jwt-default-jpa-authorities/pom.xml.releaseBackup +++ /dev/null @@ -1,111 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webmvc-jwt-default-jpa-authorities - Sample servlet OAuth2 resource-server with JWT decoder and Spring default Authentication implementation and user authorities (roles) retrieved from DB by a JPA repository - - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - org.springframework.security - spring-security-config - - - - io.swagger.core.v3 - swagger-annotations - - - - org.mapstruct - mapstruct - - - org.projectlombok - lombok-mapstruct-binding - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - - com.h2database - h2 - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/samples/webmvc-jwt-default/pom.xml.releaseBackup b/samples/webmvc-jwt-default/pom.xml.releaseBackup deleted file mode 100644 index 7e402bdc4..000000000 --- a/samples/webmvc-jwt-default/pom.xml.releaseBackup +++ /dev/null @@ -1,96 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webmvc-jwt-default - Sample servlet OAuth2 resource-server with JWT decoder and Spring default Authentication implementation: JwtAuthenticationToken - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - org.springframework.security - spring-security-config - - - - io.swagger.core.v3 - swagger-annotations - - - - org.mapstruct - mapstruct - - - org.projectlombok - lombok-mapstruct-binding - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/samples/webmvc-jwt-oauthentication/pom.xml.releaseBackup b/samples/webmvc-jwt-oauthentication/pom.xml.releaseBackup deleted file mode 100644 index 50ca9b398..000000000 --- a/samples/webmvc-jwt-oauthentication/pom.xml.releaseBackup +++ /dev/null @@ -1,96 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons.samples - spring-addons-samples - 7.8.2-SNAPSHOT - .. - - - webmvc-jwt-oauthentication - Sample servlet OAuth2 resource-server with JWT decoder and OAuthentication - - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - org.springframework.security - spring-security-config - - - - io.swagger.core.v3 - swagger-annotations - - - - org.mapstruct - mapstruct - - - org.projectlombok - lombok-mapstruct-binding - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - com.c4-soft.springaddons - spring-addons-starter-oidc-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.graalvm.buildtools - native-maven-plugin - - - - \ No newline at end of file diff --git a/spring-addons-oauth2-test/pom.xml.releaseBackup b/spring-addons-oauth2-test/pom.xml.releaseBackup deleted file mode 100644 index d9e74b23b..000000000 --- a/spring-addons-oauth2-test/pom.xml.releaseBackup +++ /dev/null @@ -1,87 +0,0 @@ - - - 4.0.0 - - - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - .. - - spring-addons-oauth2-test - - https://github.com/ch4mpy/spring-addons/ - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - spring-addons-7.6.11 - - - - - com.c4-soft.springaddons - spring-addons-oauth2 - - - - org.springframework.security - spring-security-oauth2-client - - - org.springframework.security - spring-security-oauth2-resource-server - - - org.springframework.boot - spring-boot-test-autoconfigure - - - org.springframework.security - spring-security-test - - - com.jayway.jsonpath - json-path - - - org.mockito - mockito-core - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.junit.jupiter - junit-jupiter-params - - - io.projectreactor - reactor-core - - - - org.projectlombok - lombok - true - - - - junit - junit - test - - - org.assertj - assertj-core - test - - - org.springframework.security - spring-security-config - test - - - - diff --git a/spring-addons-oauth2/pom.xml.releaseBackup b/spring-addons-oauth2/pom.xml.releaseBackup deleted file mode 100644 index 288292072..000000000 --- a/spring-addons-oauth2/pom.xml.releaseBackup +++ /dev/null @@ -1,92 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - .. - - spring-addons-oauth2 - - https://github.com/ch4mpy/spring-addons/ - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - spring-addons-7.6.11 - - - - - org.springframework.security - spring-security-oauth2-jose - - - org.springframework.security - spring-security-config - - - org.springframework.security - spring-security-oauth2-client - - - com.jayway.jsonpath - json-path - - - io.projectreactor - reactor-core - - - - org.springframework.boot - spring-boot-autoconfigure - provided - true - - - org.springframework.security - spring-security-config - provided - true - - - org.springframework.boot - spring-boot - provided - true - - - jakarta.servlet - jakarta.servlet-api - provided - true - - - org.projectlombok - lombok - provided - - - junit - junit - test - - - org.assertj - assertj-core - test - - - org.mockito - mockito-core - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - \ No newline at end of file diff --git a/spring-addons-starter-oidc-test/pom.xml.releaseBackup b/spring-addons-starter-oidc-test/pom.xml.releaseBackup deleted file mode 100644 index 9e3eec969..000000000 --- a/spring-addons-starter-oidc-test/pom.xml.releaseBackup +++ /dev/null @@ -1,102 +0,0 @@ - - 4.0.0 - - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - .. - - spring-addons-starter-oidc-test - - https://github.com/ch4mpy/spring-addons/ - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - spring-addons-7.6.11 - - - - - com.c4-soft.springaddons - spring-addons-oauth2-test - - - com.c4-soft.springaddons - spring-addons-starter-oidc - - - com.jayway.jsonpath - json-path - - - io.projectreactor - reactor-core - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.junit.jupiter - junit-jupiter-params - - - org.mockito - mockito-core - - - org.springframework - spring-web - provided - - - org.springframework - spring-webmvc - provided - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot - spring-boot-test - - - org.springframework.boot - spring-boot-test-autoconfigure - - - org.springframework.security - spring-security-config - - - org.springframework.security - spring-security-oauth2-client - - - org.springframework.security - spring-security-oauth2-jose - - - org.springframework.security - spring-security-oauth2-resource-server - - - org.springframework.security - spring-security-test - - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-configuration-processor - true - - - \ No newline at end of file diff --git a/spring-addons-starter-oidc/pom.xml.releaseBackup b/spring-addons-starter-oidc/pom.xml.releaseBackup deleted file mode 100644 index 41ba2ab09..000000000 --- a/spring-addons-starter-oidc/pom.xml.releaseBackup +++ /dev/null @@ -1,116 +0,0 @@ - - 4.0.0 - - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - .. - - spring-addons-starter-oidc - - https://github.com/ch4mpy/spring-addons/ - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - spring-addons-7.6.11 - - - - - com.c4-soft.springaddons - spring-addons-oauth2 - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.security - spring-security-oauth2-jose - - - org.springframework.security - spring-security-config - - - org.springframework.security - spring-security-oauth2-client - true - - - org.springframework - spring-webflux - true - - - org.springframework.security - spring-security-oauth2-resource-server - true - - - com.jayway.jsonpath - json-path - - - io.projectreactor - reactor-core - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-autoconfigure - provided - true - - - org.springframework.security - spring-security-config - provided - true - - - org.springframework.boot - spring-boot - provided - true - - - jakarta.servlet - jakarta.servlet-api - provided - true - - - org.projectlombok - lombok - provided - - - org.slf4j - slf4j-api - provided - - - - org.junit.jupiter - junit-jupiter - test - - - org.assertj - assertj-core - test - - - org.mockito - mockito-core - test - - - \ No newline at end of file diff --git a/spring-addons-starter-openapi/pom.xml.releaseBackup b/spring-addons-starter-openapi/pom.xml.releaseBackup deleted file mode 100644 index 578c6e4c0..000000000 --- a/spring-addons-starter-openapi/pom.xml.releaseBackup +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - .. - - spring-addons-starter-openapi - - https://github.com/ch4mpy/spring-addons/ - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - spring-addons-7.6.11 - - - - - org.springdoc - springdoc-openapi-starter-webflux-api - true - - - org.springdoc - springdoc-openapi-starter-webmvc-api - true - - - - org.projectlombok - lombok - provided - - - \ No newline at end of file diff --git a/spring-addons-starter-rest/pom.xml.releaseBackup b/spring-addons-starter-rest/pom.xml.releaseBackup deleted file mode 100644 index df86ce07d..000000000 --- a/spring-addons-starter-rest/pom.xml.releaseBackup +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - - - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - .. - - spring-addons-starter-rest - - https://github.com/ch4mpy/spring-addons/ - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - spring-addons-7.6.11 - - - - - org.springframework - spring-context - - - org.springframework.boot - spring-boot - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot - spring-boot-starter-webflux - true - - - org.springframework.security - spring-security-core - true - - - org.springframework.security - spring-security-oauth2-client - - - org.springframework.security - spring-security-oauth2-jose - true - - - org.springframework.security - spring-security-oauth2-resource-server - true - - - - org.slf4j - slf4j-api - - - org.projectlombok - lombok - true - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/spring-addons-starter-rest/src/main/java/com/c4_soft/springaddons/rest/SpringAddonsRestProperties.java b/spring-addons-starter-rest/src/main/java/com/c4_soft/springaddons/rest/SpringAddonsRestProperties.java index b9489bbd9..597c9c743 100644 --- a/spring-addons-starter-rest/src/main/java/com/c4_soft/springaddons/rest/SpringAddonsRestProperties.java +++ b/spring-addons-starter-rest/src/main/java/com/c4_soft/springaddons/rest/SpringAddonsRestProperties.java @@ -1,5 +1,6 @@ package com.c4_soft.springaddons.rest; +import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.Charset; import java.util.HashMap; @@ -54,10 +55,20 @@ public static class ClientProperties { /** * Base URI used to build the REST client ({@link RestClient} or {@link WebClient}) */ - private Optional baseUrl = Optional.empty(); + private Optional baseUrl = Optional.empty(); private AuthorizationProperties authorization = new AuthorizationProperties(); + public Optional getBaseUrl() { + return baseUrl.map(t -> { + try { + return new URL(t); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + }); + } + @Data @ConfigurationProperties public static class AuthorizationProperties { diff --git a/spring-addons-starter-rest/src/main/java/com/c4_soft/springaddons/rest/SystemProxyProperties.java b/spring-addons-starter-rest/src/main/java/com/c4_soft/springaddons/rest/SystemProxyProperties.java index 7694c67ce..cbfe6dd25 100644 --- a/spring-addons-starter-rest/src/main/java/com/c4_soft/springaddons/rest/SystemProxyProperties.java +++ b/spring-addons-starter-rest/src/main/java/com/c4_soft/springaddons/rest/SystemProxyProperties.java @@ -1,5 +1,6 @@ package com.c4_soft.springaddons.rest; +import java.net.MalformedURLException; import java.net.URL; import java.util.List; import java.util.Optional; @@ -28,8 +29,18 @@ public class SystemProxyProperties { /* also parse standard environment variables */ @Value("${http_proxy:#{null}}") - private Optional httpProxy = Optional.empty(); + private Optional httpProxy = Optional.empty(); - @Value("${no_proxy:#{T(java.util.List).of()}}") + @Value("${no_proxy:}") private List noProxy = List.of(); + + public Optional getHttpProxy() { + return httpProxy.map(t -> { + try { + return new URL(t); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + }); + } } diff --git a/starters/pom.xml.releaseBackup b/starters/pom.xml.releaseBackup deleted file mode 100644 index 6d6848678..000000000 --- a/starters/pom.xml.releaseBackup +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - com.c4-soft.springaddons - spring-addons - 7.8.2-SNAPSHOT - .. - - starters - pom - - - spring-addons-starters-webclient - spring-addons-starters-recaptcha - - - - - - com.c4-soft.springaddons.starter - spring-addons-starters-webclient - ${project.version} - - - - - diff --git a/starters/spring-addons-starters-recaptcha/pom.xml.releaseBackup b/starters/spring-addons-starters-recaptcha/pom.xml.releaseBackup deleted file mode 100644 index 2bd58bed2..000000000 --- a/starters/spring-addons-starters-recaptcha/pom.xml.releaseBackup +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - - com.c4-soft.springaddons - starters - 7.8.2-SNAPSHOT - .. - - com.c4-soft.springaddons.starter - spring-addons-starters-recaptcha - - https://github.com/ch4mpy/spring-addons/ - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - spring-addons-7.6.11 - - - - - org.springframework - spring-web - - - org.springframework.boot - spring-boot - - - org.springframework.boot - spring-boot-autoconfigure - - - com.c4-soft.springaddons - spring-addons-starter-rest - - - - org.slf4j - slf4j-api - - - org.projectlombok - lombok - true - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - diff --git a/starters/spring-addons-starters-webclient/pom.xml.releaseBackup b/starters/spring-addons-starters-webclient/pom.xml.releaseBackup deleted file mode 100644 index 18d33ac54..000000000 --- a/starters/spring-addons-starters-webclient/pom.xml.releaseBackup +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - - com.c4-soft.springaddons - starters - 7.8.2-SNAPSHOT - .. - - com.c4-soft.springaddons.starter - spring-addons-starters-webclient - - https://github.com/ch4mpy/spring-addons/ - - scm:git:git://github.com/ch4mpy/spring-addons.git - scm:git:git@github.com:ch4mpy/spring-addons.git - https://github.com/ch4mpy/spring-addons - spring-addons-7.6.11 - - - - - org.springframework - spring-context - - - org.springframework.boot - spring-boot - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot - spring-boot-starter-webflux - - - - org.slf4j - slf4j-api - - - org.projectlombok - lombok - true - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - org.springframework.boot - spring-boot-starter-test - test - - -