From e156794a57f3b06dabb3f45c30ff18b511b619bb Mon Sep 17 00:00:00 2001 From: "KingYen." <1696918097@qq.com> Date: Tue, 1 Apr 2025 21:33:16 +0800 Subject: [PATCH 1/4] chore(workflow): format maven-publish.yml for improved readability --- .github/workflows/maven-publish.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 8890225..4d198e9 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -12,18 +12,17 @@ jobs: steps: - name: Check out Git repository uses: actions/checkout@v4 - - name: Set up Maven Central Repository - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - server-id: ossrh - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD - name: Publish package - run: mvn --batch-mode deploy - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} \ No newline at end of file + run: mvn --batch-mode deploy + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} \ No newline at end of file From 4bc9ae1233debc110137783deb58bad41a2d8d8d Mon Sep 17 00:00:00 2001 From: "KingYen." <1696918097@qq.com> Date: Fri, 18 Apr 2025 11:00:18 +0800 Subject: [PATCH 2/4] chore(workflow): format maven-publish.yml for improved readability --- .gitignore | 2 +- pom.xml | 55 +++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 7c7dcdb..6650f4e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ target/ !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ -setting.pom +setting.xml ### IntelliJ IDEA ### .idea/modules.xml diff --git a/pom.xml b/pom.xml index 2a17e1a..9070cec 100644 --- a/pom.xml +++ b/pom.xml @@ -55,8 +55,6 @@ - - deploy @@ -64,15 +62,42 @@ org.apache.maven.plugins maven-source-plugin + 3.1.0 + + + package + + jar-no-fork + + + org.apache.maven.plugins maven-javadoc-plugin + 3.2.0 + + + package + + jar + + + - org.apache.maven.plugins maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + @@ -81,12 +106,12 @@ - ossrh + cn.kingyen Nexus Release Repository https://oss.sonatype.org/service/local/staging/deploy/maven2 - sonatype-nexus-snapshots + cn.kingyen Nexus Snapshot Repository https://oss.sonatype.org/content/repositories/snapshots @@ -150,24 +175,24 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh + cn.kingyen https://oss.sonatype.org/ false - - - org.sonatype.plugins - nexus-staging-maven-plugin - - + + + + + + \ No newline at end of file From 69556aee3f5050716b1e81220dd446b572ceddda Mon Sep 17 00:00:00 2001 From: "KingYen." <1696918097@qq.com> Date: Fri, 18 Apr 2025 11:33:01 +0800 Subject: [PATCH 3/4] chore(workflow): format maven-publish.yml for improved readability --- .github/workflows/maven-publish.yml | 14 ++-- pom.xml | 121 ++++++++++++++++++++-------- 2 files changed, 96 insertions(+), 39 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 4d198e9..0ece630 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -17,12 +17,14 @@ jobs: with: java-version: '17' distribution: 'temurin' - server-id: ossrh + cache: maven + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - - - name: Publish package - run: mvn --batch-mode deploy + gpg-private-key: GPG_SECRET + gpg-passphrase: GPG_PASSWORD env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} \ No newline at end of file + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9070cec..e296f0e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,10 @@ cn.kingyen singleflight 1.0.0 + + A Java utility class for suppressing duplicate requests + + https://github.com/Wenrh2004/singleflight @@ -62,28 +66,33 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.2.1 - package - - jar-no-fork - + attach-sources + verify org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.4.0 - package - - jar - + attach-javadocs + verify + + private + true + UTF-8 + UTF-8 + UTF-8 + true + ${project.build.directory}/apidocs + org.apache.maven.plugins @@ -96,6 +105,13 @@ sign + + false + + --pinentry-mode + loopback + + @@ -123,35 +139,41 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.2.1 - package + attach-sources + verify - jar-no-fork + jar + + true + true + org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 - - private - true - UTF-8 - UTF-8 - UTF-8 - + 3.4.0 - compile + bundle-sources + package jar + + private + true + UTF-8 + UTF-8 + UTF-8 + org.apache.maven.plugins @@ -165,7 +187,7 @@ sign - + false --pinentry-mode loopback @@ -180,19 +202,52 @@ 0.7.0 true - cn.kingyen - https://oss.sonatype.org/ - false + central - - - - - - + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + verify + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.4.0 + + + attach-javadocs + verify + + + + private + true + UTF-8 + UTF-8 + UTF-8 + true + ${project.build.directory}/apidocs + + + + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 + true + + cn.kingyen + + + - \ No newline at end of file From 131e2e63974e46d3b033d8284204407327fd9d03 Mon Sep 17 00:00:00 2001 From: "KingYen." <1696918097@qq.com> Date: Fri, 18 Apr 2025 12:39:49 +0800 Subject: [PATCH 4/4] chore(workflow): format maven-publish.yml for improved readability --- .github/workflows/maven-publish.yml | 4 ++-- pom.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 0ece630..1562c11 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -21,10 +21,10 @@ jobs: server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-private-key: GPG_SECRET +# gpg-private-key: GPG_SECRET gpg-passphrase: GPG_PASSWORD env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} +# GPG_SECRET: ${{ secrets.GPG_SECRET }} GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} \ No newline at end of file diff --git a/pom.xml b/pom.xml index e296f0e..2503ffd 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,6 @@ sign - false --pinentry-mode loopback