diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8a26df0..f6533f5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,8 +11,6 @@ jobs: env: MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=.github/settings.xml steps: - - run: git config --global user.name "${{ vars.KOKUWA_IO_BOT_NAME }}" - - run: git config --global user.email "${{ vars.KOKUWA_IO_BOT_EMAIL }}" - uses: actions/checkout@v4 with: token: ${{ secrets.GIT_ACTION_TOKEN }} @@ -21,11 +19,15 @@ jobs: distribution: temurin java-version: 17 cache: maven + server-id: sonatype-nexus + server-username: SERVER_USERNAME + server-password: SERVER_PASSWORD + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: GPG_PASSPHRASE - run: mvn $MAVEN_ARGS dependency:go-offline - run: mvn $MAVEN_ARGS deploy env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - - run: mvn $MAVEN_ARGS site-deploy - env: GIT_ACTION_TOKEN: ${{ secrets.GIT_ACTION_TOKEN }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 68b4fe5..052206e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -33,9 +33,4 @@ jobs: java-version: 17 cache: maven - run: mvn $MAVEN_ARGS dependency:go-offline - - run: mvn $MAVEN_ARGS verify - - run: mvn $MAVEN_ARGS site - - uses: actions/upload-artifact@v4 - if: always() - with: - path: target/site + - run: mvn $MAVEN_ARGS verify -Dgpg.skip diff --git a/pom.xml b/pom.xml index 3a3dd2c..37de73c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,13 +2,7 @@ 4.0.0 - - io.kokuwa.maven - maven-parent - 0.6.17 - - - + io.kokuwa.maven k3s-maven-plugin 2.0.0-SNAPSHOT maven-plugin @@ -34,7 +28,7 @@ sschnabe Stephan Schnabel https://github.com/sschnabe - stephan@grayc.de + stephan.schnabel@@posteo.de GrayC GmbH https://grayc.de Europe/Berlin @@ -45,7 +39,7 @@ - ${version.org.apache.maven.plugin} + ${version.org.apache.maven.plugin.api} @@ -62,6 +56,16 @@ github https://github.com/kokuwaio/k3s-maven-plugin/actions + + + sonatype-nexus + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + sonatype-nexus + https://oss.sonatype.org/content/repositories/snapshots/ + + @@ -69,6 +73,8 @@ + UTF-8 + 17 17 @@ -76,6 +82,23 @@ + 3.2.5 + 3.13.0 + 3.1.3 + 3.2.5 + 3.1.3 + 3.8.0 + 3.10.0 + 3.4.2 + 3.15.0 + 3.1.1 + 3.3.1 + 3.3.1 + 3.5.0 + 1.3.0 + 2.17.1 + 1.7.0 + 5.11.0 1.7.36 2.17.2 @@ -88,11 +111,13 @@ org.apache.maven maven-plugin-api + ${version.org.apache.maven.plugin.api} provided org.apache.maven.plugin-tools maven-plugin-annotations + ${version.org.apache.maven.plugins.plugin} provided @@ -122,30 +147,139 @@ ${version.org.slf4j} test - - org.eclipse.sisu - org.eclipse.sisu.plexus - test - + + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.org.apache.maven.plugins.compiler} + + -Xlint:all,-processing + true + true + true + + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.org.apache.maven.plugins.deploy} + + + org.apache.maven.plugins + maven-gpg-plugin + ${version.org.apache.maven.plugins.gpg} + + + org.apache.maven.plugins + maven-install-plugin + ${version.org.apache.maven.plugins.install} + + + org.apache.maven.plugins + maven-invoker-plugin + ${version.org.apache.maven.plugins.invoker} + + true + + + + org.apache.maven.plugins + maven-jar-plugin + ${version.org.apache.maven.plugins.jar} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.org.apache.maven.plugins.javadoc} + + + org.apache.maven.plugins + maven-release-plugin + ${version.org.apache.maven.plugins.release} + + --no-transfer-progress + @{prefix} prepare release @{releaseLabel} [no ci] + true + deploy,release + @{project.version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${version.org.apache.maven.plugins.resources} + + + org.apache.maven.plugins + maven-plugin-plugin + ${version.org.apache.maven.plugins.plugin} + + java-annotations + + + + org.apache.maven.plugins + maven-source-plugin + ${version.org.apache.maven.plugins.source} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.org.apache.maven.plugins.surefire} + + true + + + + org.codehaus.mojo + tidy-maven-plugin + ${version.org.codehaus.mojo.tidy} + + + org.codehaus.mojo + versions-maven-plugin + ${version.org.codehaus.mojo.versions} + + false + + .*-(alpha|beta|rc)-?[0-9]+ + + + + + + org.apache.maven + maven-plugin-api + + + regex + .* + + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${version.org.sonatype.plugins.nexus-staging} + + sonatype-nexus + https://oss.sonatype.org/ + true + + + + - - - org.apache.maven.plugins - maven-plugin-plugin - - - - helpmojo - - - - - org.apache.maven.plugins @@ -166,6 +300,146 @@ + + + org.apache.maven.plugins + maven-resources-plugin + + + default-resources + + + + + + org.apache.maven.plugins + maven-install-plugin + + + default-install + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + default-addPluginArtifactMetadata + + + + + + + + + check + + + !check.skip + + + + + + + + org.codehaus.mojo + tidy-maven-plugin + + + validate + + check + + + + + + + + + + deploy + + + env.CI + + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + + helpmojo + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + jar + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + sign + + + + + + + + + + release + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + + + + +