diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 32f412fa..16a3f376 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -19,7 +19,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2 + uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2 with: fail: false # Don't fail on broken links, create an issue instead diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ca3a78c..1d725b82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -119,28 +119,28 @@ jobs: git config --global user.name "GitHub Actions" git pull - - name: Set up JDK OSSRH + - name: Set up JDK uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' distribution: 'temurin' - server-id: ossrh + server-id: sonatype-central-portal server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to OSSRH + - name: Publish to Central Portal run: | modules=("bom") dependency_management_block=$(grep -ozP '(\r|\n|.)*<\/dependencyManagement>' 'bom/pom.xml' | tr -d '\0') modules+=($(echo $dependency_management_block | grep -oP '(?<=)[^<]+')) printf -v modules_joined '%s,' "${modules[@]}" modules_arg=$(echo "${modules_joined%,}") - ./mvnw -B deploy -pl "$modules_arg" -am -T2C -Possrh -DskipTests + ./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish-sonatype-central-portal -DskipTests env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} publish-pages: diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 70afd61d..34472a35 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -10,26 +10,26 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK OSSRH + - name: Set up JDK uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' java-version: '17' - server-id: ossrh + server-id: sonatype-central-portal server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to OSSRH + - name: Publish to Central Portal run: | modules=("bom") dependency_management_block=$(grep -ozP '(\r|\n|.)*<\/dependencyManagement>' 'bom/pom.xml' | tr -d '\0') modules+=($(echo $dependency_management_block | grep -oP '(?<=)[^<]+')) printf -v modules_joined '%s,' "${modules[@]}" modules_arg=$(echo "${modules_joined%,}") - ./mvnw -B deploy -pl "$modules_arg" -am -T2C -Possrh -DskipTests + ./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish-sonatype-central-portal -DskipTests env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/.gitignore b/.gitignore index fd1526af..c3a0ab2e 100644 --- a/.gitignore +++ b/.gitignore @@ -93,6 +93,7 @@ vite.generated.ts .idea/* !.idea/saveactions_settings.xml !.idea/checkstyle-idea.xml +!.idea/externalDependencies.xml !.idea/inspectionProfiles/ .idea/inspectionProfiles/* diff --git a/CHANGELOG.md b/CHANGELOG.md index 2753866c..17fd84cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.0.5 +* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155) +* Updated dependencies + # 1.0.4 * OAuth2-OIDC * ``DefaultDeAuthApplier``: Use already present request/response if possible diff --git a/bom/pom.xml b/bom/pom.xml index b1da2bee..c59c47b3 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -167,7 +132,7 @@ - ossrh + publish-sonatype-central-portal @@ -211,16 +176,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/client-storage/pom.xml b/client-storage/pom.xml index 4ff9c38a..abbd0f35 100644 --- a/client-storage/pom.xml +++ b/client-storage/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - software.xdev.sse @@ -184,7 +149,7 @@ - ossrh + publish-sonatype-central-portal @@ -228,16 +193,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index 3efad847..866bb6c5 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - org.junit.jupiter @@ -191,7 +156,7 @@ - ossrh + publish-sonatype-central-portal @@ -235,16 +200,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/crypto-symmetric-managed/pom.xml b/crypto-symmetric-managed/pom.xml index f6295472..9d94a998 100644 --- a/crypto-symmetric-managed/pom.xml +++ b/crypto-symmetric-managed/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -211,7 +176,7 @@ - ossrh + publish-sonatype-central-portal @@ -255,16 +220,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index cfb2f51d..3248dbfe 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - org.junit.jupiter @@ -191,7 +156,7 @@ - ossrh + publish-sonatype-central-portal @@ -235,16 +200,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/csp/pom.xml b/csp/pom.xml index 97caa4f7..e901b73f 100644 --- a/csp/pom.xml +++ b/csp/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -200,7 +165,7 @@ - ossrh + publish-sonatype-central-portal @@ -244,16 +209,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/demo/pom.xml b/demo/pom.xml index a9c4ca40..43694613 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -22,7 +22,7 @@ UTF-8 - 24.7.2 + 24.7.4 3.4.5 @@ -124,14 +124,14 @@ software.xdev tci-base - 1.1.0 + 1.1.2 org.seleniumhq.selenium selenium-dependencies-bom - 4.31.0 + 4.32.0 pom import @@ -154,7 +154,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - 2.8.6 + 2.8.8 @@ -177,7 +177,7 @@ software.xdev testcontainers-selenium - 1.1.0 + 1.2.0 software.xdev @@ -187,7 +187,7 @@ software.xdev testcontainers-advanced-imagebuilder - 1.0.2 + 1.1.0 org.testcontainers diff --git a/demo/tci-db/src/main/java/software/xdev/sse/demo/tci/db/factory/DBTCIFactory.java b/demo/tci-db/src/main/java/software/xdev/sse/demo/tci/db/factory/DBTCIFactory.java index f4f623bd..b5813c14 100644 --- a/demo/tci-db/src/main/java/software/xdev/sse/demo/tci/db/factory/DBTCIFactory.java +++ b/demo/tci-db/src/main/java/software/xdev/sse/demo/tci/db/factory/DBTCIFactory.java @@ -8,8 +8,8 @@ import software.xdev.sse.demo.tci.db.DBTCI; import software.xdev.sse.demo.tci.db.containers.DBContainer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; public class DBTCIFactory extends PreStartableTCIFactory diff --git a/demo/tci-oidc/src/main/java/software/xdev/sse/demo/tci/oidc/factory/OIDCTCIFactory.java b/demo/tci-oidc/src/main/java/software/xdev/sse/demo/tci/oidc/factory/OIDCTCIFactory.java index 15483798..e3769516 100644 --- a/demo/tci-oidc/src/main/java/software/xdev/sse/demo/tci/oidc/factory/OIDCTCIFactory.java +++ b/demo/tci-oidc/src/main/java/software/xdev/sse/demo/tci/oidc/factory/OIDCTCIFactory.java @@ -9,8 +9,8 @@ import software.xdev.sse.demo.tci.oidc.OIDCTCI; import software.xdev.sse.demo.tci.oidc.containers.OIDCServerContainer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; public class OIDCTCIFactory extends PreStartableTCIFactory diff --git a/demo/tci-selenium/src/main/java/software/xdev/sse/demo/tci/selenium/factory/BrowserTCIFactory.java b/demo/tci-selenium/src/main/java/software/xdev/sse/demo/tci/selenium/factory/BrowserTCIFactory.java index bf71b57c..31321a3d 100644 --- a/demo/tci-selenium/src/main/java/software/xdev/sse/demo/tci/selenium/factory/BrowserTCIFactory.java +++ b/demo/tci-selenium/src/main/java/software/xdev/sse/demo/tci/selenium/factory/BrowserTCIFactory.java @@ -18,8 +18,8 @@ import software.xdev.sse.demo.tci.selenium.BrowserTCI; import software.xdev.sse.demo.tci.selenium.containers.SeleniumBrowserWebDriverContainer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; import software.xdev.testcontainers.selenium.containers.browser.BrowserWebDriverContainer; import software.xdev.testcontainers.selenium.containers.recorder.SeleniumRecordingContainer; diff --git a/demo/tci-testcontainers/src/main/java/software/xdev/sse/demo/tci/util/ContainerMemory.java b/demo/tci-testcontainers/src/main/java/software/xdev/sse/demo/tci/util/ContainerMemory.java deleted file mode 100644 index e339cdc1..00000000 --- a/demo/tci-testcontainers/src/main/java/software/xdev/sse/demo/tci/util/ContainerMemory.java +++ /dev/null @@ -1,15 +0,0 @@ -package software.xdev.sse.demo.tci.util; - -public final class ContainerMemory -{ - // Docker uses 1024 as conversion - public static final long M128M = 128 * 1024L * 1024L; - public static final long M256M = M128M * 2; - public static final long M512M = M256M * 2; - public static final long M1G = M512M * 2; - public static final long M2G = M1G * 2; - - private ContainerMemory() - { - } -} diff --git a/demo/tci-webapp-rest/src/main/java/software/xdev/sse/demo/tci/webapp/factory/RestWebAppTCIFactory.java b/demo/tci-webapp-rest/src/main/java/software/xdev/sse/demo/tci/webapp/factory/RestWebAppTCIFactory.java index 3b76188d..0b3e1e76 100644 --- a/demo/tci-webapp-rest/src/main/java/software/xdev/sse/demo/tci/webapp/factory/RestWebAppTCIFactory.java +++ b/demo/tci-webapp-rest/src/main/java/software/xdev/sse/demo/tci/webapp/factory/RestWebAppTCIFactory.java @@ -3,12 +3,12 @@ import java.time.Duration; import java.util.function.Consumer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.sse.demo.tci.webapp.RestWebAppTCI; import software.xdev.sse.demo.tci.webapp.WebAppTCI; import software.xdev.sse.demo.tci.webapp.containers.RestWebAppContainer; import software.xdev.sse.demo.tci.webapp.containers.WebAppContainerBuilder; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; public class RestWebAppTCIFactory extends PreStartableTCIFactory diff --git a/demo/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppTCIFactory.java b/demo/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppTCIFactory.java index 4e6246eb..803533ff 100644 --- a/demo/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppTCIFactory.java +++ b/demo/tci-webapp-vaadin/src/main/java/software/xdev/sse/demo/tci/webapp/factory/VaadinWebAppTCIFactory.java @@ -3,12 +3,12 @@ import java.time.Duration; import java.util.function.Consumer; -import software.xdev.sse.demo.tci.util.ContainerMemory; import software.xdev.sse.demo.tci.webapp.VaadinWebAppTCI; import software.xdev.sse.demo.tci.webapp.WebAppTCI; import software.xdev.sse.demo.tci.webapp.containers.VaadinWebAppContainer; import software.xdev.sse.demo.tci.webapp.containers.WebAppContainerBuilder; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; +import software.xdev.tci.misc.ContainerMemory; public class VaadinWebAppTCIFactory extends PreStartableTCIFactory diff --git a/demo/webapp-vaadin/src/main/resources/META-INF/resources/manifest.webmanifest b/demo/webapp-vaadin/src/main/resources/META-INF/resources/manifest.webmanifest index e673c34a..8d4e1a8d 100644 --- a/demo/webapp-vaadin/src/main/resources/META-INF/resources/manifest.webmanifest +++ b/demo/webapp-vaadin/src/main/resources/META-INF/resources/manifest.webmanifest @@ -1,7 +1,6 @@ { "name": "Demo", "short_name": "Demo", - "display": "standalone", "background_color": "#c02222", "theme_color": "#c02222", "start_url": ".", diff --git a/metrics/pom.xml b/metrics/pom.xml index 34f3a376..711f10de 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -195,7 +160,7 @@ - ossrh + publish-sonatype-central-portal @@ -239,16 +204,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 25d925fc..23fdbfcb 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -225,7 +190,7 @@ - ossrh + publish-sonatype-central-portal @@ -269,16 +234,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/oauth2-oidc/README.md b/oauth2-oidc/README.md index 4dd621e9..fb733519 100644 --- a/oauth2-oidc/README.md +++ b/oauth2-oidc/README.md @@ -22,7 +22,8 @@ Also provides a [OAuth2/OIDC server "is offline" fallback](./src/main/java/softw #### Requirements -* The OAuth2/OIDC Server should provide a [refresh token](https://datatracker.ietf.org/doc/html/rfc6749#section-1.5) (to recheck authentication).
Usually this can be achieved with the [``offline_access`` scope](https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess). +* The OAuth2/OIDC Server should provide a [refresh token](https://datatracker.ietf.org/doc/html/rfc6749#section-1.5) (to recheck authentication).
Usually this can be achieved with the [``offline_access`` scope](https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess) but it's highly dependent on the OIDC Provider. +For example IdentityServer requires it, while KeyCloak must not use it at all (as the UI otherwise asks for a login every time) and requires a different setting. #### Usage diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 80027488..cc734ba5 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -244,7 +209,7 @@ - ossrh + publish-sonatype-central-portal @@ -288,16 +253,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 5b9d5609..9f0a214a 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -97,7 +62,7 @@ com.vaadin vaadin-bom - 24.7.2 + 24.7.4 pom import @@ -241,7 +206,7 @@ - ossrh + publish-sonatype-central-portal @@ -285,16 +250,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 77205bd8..88744755 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -228,7 +193,7 @@ - ossrh + publish-sonatype-central-portal @@ -272,16 +237,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/web-sidecar-common/pom.xml b/web-sidecar-common/pom.xml index 49eb0025..ce0819b3 100644 --- a/web-sidecar-common/pom.xml +++ b/web-sidecar-common/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -205,7 +170,7 @@ - ossrh + publish-sonatype-central-portal @@ -249,16 +214,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true diff --git a/web/pom.xml b/web/pom.xml index f6a2d04d..a32c9d8c 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -195,7 +160,7 @@ - ossrh + publish-sonatype-central-portal @@ -239,16 +204,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true