diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 1f6f6725ed7..1432b756eab 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -38,6 +38,7 @@ jobs: server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Cache local Maven repository uses: actions/cache@v5 with: @@ -232,6 +233,6 @@ jobs: SC_VERSION: SC_NEXT_VERSION: GPG_PRIVATE_KEY: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }} - GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }} GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }} GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }} diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml index 5e89d45571f..6ae51fbc4ca 100644 --- a/modules/swagger-codegen-cli/pom.xml +++ b/modules/swagger-codegen-cli/pom.xml @@ -39,7 +39,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.3.0 + ${maven-shade-plugin-version} process-resources diff --git a/modules/swagger-codegen-maven-plugin/pom.xml b/modules/swagger-codegen-maven-plugin/pom.xml index 73e6d82fcb9..1146bc49024 100644 --- a/modules/swagger-codegen-maven-plugin/pom.xml +++ b/modules/swagger-codegen-maven-plugin/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.9.5 + 3.10.0 @@ -43,7 +43,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.10.2 + ${maven-plugin-plugin-version} io.swagger @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.6.0 + ${maven-plugin-plugin-version} true diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml index 562fca394d2..3db9f826870 100644 --- a/modules/swagger-codegen/pom.xml +++ b/modules/swagger-codegen/pom.xml @@ -45,7 +45,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + ${exec-maven-plugin-version} @@ -59,6 +59,7 @@ maven-dependency-plugin + ${maven-dependency-plugin-version} package @@ -73,12 +74,12 @@ maven-compiler-plugin - 3.13.0 + ${maven-compiler-plugin-version} org.apache.maven.plugins maven-jar-plugin - 3.3.0 + ${maven-jar-plugin-version} @@ -100,7 +101,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + ${maven-site-plugin-version} org.apache.maven.plugins @@ -157,7 +158,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.2 + ${maven-javadoc-plugin-version} 1.8 UTF-8 @@ -168,7 +169,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.3.0 + ${maven-jxr-plugin-version} true @@ -176,7 +177,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.2 + ${maven-project-info-reports-plugin-version} diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml index e87f75473b0..85af96d1705 100644 --- a/modules/swagger-generator/pom.xml +++ b/modules/swagger-generator/pom.xml @@ -26,6 +26,7 @@ maven-dependency-plugin + ${maven-dependency-plugin-version} package @@ -42,7 +43,7 @@ org.codehaus.mojo properties-maven-plugin - 1.0.0 + ${properties-maven-plugin-version} pre-integration-test @@ -68,7 +69,7 @@ org.apache.maven.plugins maven-war-plugin - 3.1.0 + ${maven-war-plugin-version} @@ -83,7 +84,7 @@ maven-failsafe-plugin - 2.6 + ${maven-failsafe-plugin-version} false false @@ -136,7 +137,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.2.1 + ${download-maven-plugin-version} swagger-ui @@ -341,10 +342,10 @@ 2.5 - 1.5.32 + 1.6.5 1.0.0 2.5 - 2.11.5 + 2.11.6 9.4.53.v20231009 2.42 diff --git a/pom.xml b/pom.xml index f1aef120519..e4c7c9dac88 100644 --- a/pom.xml +++ b/pom.xml @@ -111,25 +111,12 @@ maven-surefire-plugin ${surefire-version} - none:none -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit-version}/jmockit-${jmockit-version}.jar --add-opens java.base/java.lang=ALL-UNNAMED -Djdk.attach.allowAttachSelf - - - test-testng - test - - test - - - none:none - org.testng:testng - - - maven-dependency-plugin + ${maven-dependency-plugin-version} package @@ -144,12 +131,12 @@ maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin-version} org.apache.maven.plugins maven-jar-plugin - 3.3.0 + ${maven-jar-plugin-version} @@ -164,12 +151,12 @@ org.apache.maven.plugins maven-site-plugin - 3.12.0 + ${maven-site-plugin-version} org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + ${maven-javadoc-plugin-version} true 1.8 @@ -190,7 +177,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + ${maven-source-plugin-version} attach-sources @@ -204,7 +191,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.2.1 + ${maven-enforcer-plugin-version} enforce-versions @@ -224,7 +211,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.7.0 + ${central-publishing-maven-plugin-version} true central @@ -244,7 +231,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + ${maven-gpg-plugin-version} @@ -302,7 +289,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + ${build-helper-maven-plugin-version} add-source @@ -334,7 +321,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + ${maven-gpg-plugin-version} sign-artifacts @@ -923,7 +910,7 @@ maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin-version} 1.8 1.8 @@ -993,7 +980,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.3.0 + ${maven-jxr-plugin-version} true @@ -1001,7 +988,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.2 + ${maven-project-info-reports-plugin-version} @@ -1067,28 +1054,47 @@ 1.0.76 2.11.1 3.3.0 - 1.6.14 - 2.16.1 - 1.7.0 + 1.6.16 + 2.22.0 + 1.11.0 4.13.2 - 2.21.2 + 2.22.4 1.0.0 - 3.18.0 + 3.21.0 1.7.36 3.2.1 + 3.16.0 + 3.5.1 + 3.4.0 + 3.12.0 + 3.6.0 + 3.9.0 + 3.6.3 + 3.2.8 + 3.6.2 + 0.12.0 + 3.6.2 + 3.16.0 + 3.22.0 + 3.6.4 + 3.11.0 + 3.5.1 + 3.6.0 + 1.3.1 + 1.13.0 1.15 - 7.10.2 - 3.0.0 + 7.12.0 + 3.6.0 1.49 - 5.11.0 + 5.24.0 0.10.2 - 2.2 + 2.7 4.5.14 - 20231013 + 20260814 UTF-8