diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 1aba73812..652bd55d1 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,2 +1,5 @@ _extends: .github -tag-template: plexus-$NEXT_MINOR_VERSION +# plexus-pom uses a single version number +version-template: '$MAJOR' +name-template: '$NEXT_MAJOR_VERSION' +tag-template: 'plexus-$NEXT_MAJOR_VERSION' diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 797e3a50b..09feae474 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,26 +21,11 @@ on: [push, pull_request] jobs: build: - - strategy: - matrix: - os: [ubuntu-latest] - java: [8, 11, 17] - jdk: [temurin] - fail-fast: false - - runs-on: ${{ matrix.os }} - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: ${{ matrix.jdk }} - cache: 'maven' - - - name: Build with Maven - run: mvn install -e -B -V + name: Build it + uses: codehaus-plexus/.github/.github/workflows/maven.yml@master + + deploy: + name: Deploy + needs: build + uses: codehaus-plexus/.github/.github/workflows/maven-deploy.yml@master + secrets: inherit diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 4000f8c4f..4c09c8a70 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -7,6 +7,6 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index de172e9ec..50281e7c7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ target/ bin *.iml .idea - +.DS_Store diff --git a/README.md b/README.md index cbd21a612..fe3c96bdc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Plexus Parent POM -============ +================= [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus) diff --git a/pom.xml b/pom.xml index 0e461bb1a..2b6d8a20f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ limitations under the License. org.codehaus.plexus plexus - 11 + 25-SNAPSHOT pom Plexus @@ -32,7 +32,7 @@ limitations under the License. - Apache License, Version 2.0 + Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -278,6 +278,15 @@ limitations under the License. Developer + + gnodet + Guillaume Nodet + gnodet@apache.org + ASF + + Developer + + @@ -288,17 +297,13 @@ limitations under the License. mojohaus-dev@googlegroups.com https://groups.google.com/forum/#!forum/mojohaus-dev - - Former (pre-2015-06) Development List - https://markmail.org/list/org.codehaus.plexus.dev - scm:git:https://github.com/codehaus-plexus/plexus-pom.git ${project.scm.connection} - plexus-11 - https://github.com/codehaus-plexus/plexus-pom/tree/master/ + master + https://github.com/codehaus-plexus/plexus-pom/tree/${project.scm.tag}/ @@ -308,13 +313,13 @@ limitations under the License. - plexus-releases - Plexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + sonatype-central-portal + Sonatype Central Portal + https://repo.maven.apache.org/maven2 - plexus-snapshots - Plexus Snapshot Repository + ${plexusDistMgmtSnapshotsId} + ${plexusDistMgmtSnapshotsName} ${plexusDistMgmtSnapshotsUrl} @@ -326,25 +331,44 @@ limitations under the License. 8 - 1.${javaVersion} - 1.${javaVersion} + 3.6.3 + ${javaVersion} + ${javaVersion} + ${javaVersion} + ${javaVersion} + + none + true UTF-8 - https://oss.sonatype.org/content/repositories/plexus-snapshots - 2023-05-06T22:13:35Z + + sonatype-central-portal + Sonatype Central Snapshots + https://central.sonatype.com/repository/maven-snapshots + + 2025-10-11T11:22:53Z true - 3.8.2 - 1.11.2 - 5.9.3 + 3.0.0 + 3.15.1 + 2.1.0 + 3.5.4 + 5.13.4 + 0.7.5 + apply + 0.9.0.M4 + true + + + njord:template:release-sca + sonatype-cp + true + automatic + true + false + - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${mavenPluginToolsVersion} - provided - org.junit junit-bom @@ -358,79 +382,113 @@ limitations under the License. + + eu.maveniverse.maven.plugins + njord + ${njord.version} + org.apache.maven.plugins maven-assembly-plugin - 3.5.0 + 3.7.1 org.apache.maven.plugins maven-checkstyle-plugin - 3.2.2 + 3.6.0 config/maven_checks.xml - - https://github.com/codehaus-plexus/plexus-pom/blob/plexus-10/src/main/resources/config/plexus-header.txt + + https://raw.githubusercontent.com/codehaus-plexus/plexus-pom/plexus-11/src/main/resources/config/plexus-header.txt org.apache.maven.shared maven-shared-resources - 5 + 6 org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.5.0 org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.14.1 + + ${maven.compiler.proc} + ${maven.compiler.showDeprecation} + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.9.0 org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.4 org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.6.2 org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.8 + + true + org.apache.maven.plugins maven-install-plugin - 3.1.1 + 3.1.4 org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.2 + + + + true + true + + + + + + org.apache.maven.plugins + maven-invoker-plugin + 3.9.1 + + ${invoker.streamLogsOnFailures} + org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.12.0 true en - true + + true org.apache.maven.plugins maven-jxr-plugin - 3.3.0 + 3.6.0 org.apache.maven.plugins @@ -460,7 +518,7 @@ limitations under the License. org.apache.maven.plugins maven-pmd-plugin - 3.20.0 + 3.28.0 ${maven.compiler.source} @@ -475,15 +533,14 @@ limitations under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.3 + 3.9.0 org.apache.maven.plugins maven-release-plugin - 3.0.0 + 3.1.1 deploy - forked-path plexus-release @@ -495,7 +552,7 @@ limitations under the License. org.apache.maven.plugins maven-scm-publish-plugin - 3.2.1 + 3.3.0 ${project.scm.developerConnection} @@ -505,7 +562,7 @@ limitations under the License. org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.21.0 true @@ -514,39 +571,86 @@ limitations under the License. org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + ${mavenSurefireVersion} org.apache.maven.plugins maven-surefire-report-plugin - 3.0.0 + ${mavenSurefireVersion} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${mavenSurefireVersion} org.codehaus.mojo taglist-maven-plugin - 3.0.0 + 3.2.1 - org.codehaus.plexus - plexus-component-metadata - 2.1.1 + org.eclipse.sisu + sisu-maven-plugin + ${sisuMavenPluginVersion} - process-classes + generate-index - generate-metadata + main-index + test-index + + + + com.diffplug.spotless + spotless-maven-plugin + ${spotless-maven-plugin.version} + + + + + + + + javax,java,,\# + + + + PRESERVE + + + false + + true + true + + + + + **/*.md + + + target/** + + + + + true + + + - process-test-classes + spotless-check - generate-test-metadata + ${spotless.action} + process-sources @@ -560,7 +664,7 @@ limitations under the License. org.codehaus.mojo extra-enforcer-rules - 1.6.2 + 1.11.0 @@ -572,12 +676,15 @@ limitations under the License. - 3.2.5 - This project requires at least Maven 3.2.5 + ${minimalMavenBuildVersion} + This project requires at least Maven ${minimalMavenBuildVersion} ${maven.compiler.target} + + ${minimalJavaBuildVersion} + @@ -591,10 +698,18 @@ limitations under the License. attach-descriptor + false + + + eu.maveniverse.maven.njord + extension + ${njord.version} + + @@ -640,26 +755,33 @@ limitations under the License. org.apache.maven.plugins maven-surefire-report-plugin + + false + false + org.apache.maven.plugins - maven-checkstyle-plugin + maven-pmd-plugin + + true + default - checkstyle + cpd + pmd - - org.apache.maven.plugins - maven-pmd-plugin - org.codehaus.mojo taglist-maven-plugin + + true + org.apache.maven.plugins @@ -686,11 +808,21 @@ limitations under the License. + + org.apache.maven.plugins + maven-artifact-plugin + 3.6.1 + plexus-release + + 3.9.0 + + true + + config/maven_checks_nocodestyle.xml + + + + + + + com.diffplug.spotless + spotless-maven-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${checkstyle.spotless.config} + + + + + + + format-check + + + env.CI + + + + check + + + + format + + + !env.CI + + + + apply + + diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt deleted file mode 100644 index c09df94df..000000000 --- a/src/site/apt/index.apt +++ /dev/null @@ -1,11 +0,0 @@ - ----- - Plexus Parent POM - ----- - Hervé Boutemy - ----- - 2018-05-06 - ----- - -Plexus Parent POM - - Plexus Parent POM defines common {{{./plugin-management.html}plugins}}, reporting and release configuration. diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md new file mode 100644 index 000000000..d40ba7c63 --- /dev/null +++ b/src/site/markdown/index.md @@ -0,0 +1,23 @@ +# Plexus Parent POM + +Plexus Parent POM defines common [plugins](./plugin-management.html), reporting and release configuration. + +## Preparing the environment for publishing vie the Central Portal + +Release manager should include the following sections in your personal `settings.xml`: + +```xml + + + + sonatype-central-portal + jqhacker + SeCrEt + + + +``` + +Tokens can be obtained from https://central.sonatype.com/account + diff --git a/src/site/site.xml b/src/site/site.xml index ab7776e5c..59edeea41 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,11 +1,10 @@ - - - Plexus - https://codehaus-plexus.github.io/ - https://codehaus-plexus.github.io/images/plexus-logo-trans.png + + + + Plexus @@ -34,12 +33,13 @@ - + - + + @@ -50,27 +50,20 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - +