diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..c9364f124 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# code reformat after spotless enabled +bacaf1cc15b1dc5e13b52c7d82c0058464d9e676 \ No newline at end of file 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 bc6438825..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.20.0 + - 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 d1c9be116..6b7487da9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - - 4.0.0 org.codehaus.plexus plexus + 24-SNAPSHOT pom - 10 Plexus The Plexus project provides a full software stack for creating and executing software projects. - https://codehaus-plexus.github.io/ + https://codehaus-plexus.github.io/plexus-pom/ 2001 Codehaus Plexus @@ -34,8 +32,8 @@ limitations under the License. - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -120,216 +118,261 @@ limitations under the License. - Trygve Laugstøl trygvis + Trygve Laugstøl trygvis@codehaus.org Developer - Kenney Westerhof kenney + Kenney Westerhof kenney@codehaus.org Developer - Carlos Sanchez carlos + Carlos Sanchez carlos@codehaus.org Developer - Brett Porter brett + Brett Porter brett@codehaus.org Developer - John Casey jdcasey + John Casey jdcasey@codehaus.org Developer - Andrew Williams handyande + Andrew Williams andy@handyande.co.uk Developer - Rahul Thakur rahul + Rahul Thakur rahul.thakur.xdev@gmail.com Developer - Joakim Erdfelt joakime + Joakim Erdfelt joakim@erdfelt.com Developer - Olivier Lamy olamy + Olivier Lamy olamy@codehaus.org Developer - Hervé Boutemy hboutemy + Hervé Boutemy hboutemy@apache.org Developer - Oleg Gusakov oleg + Oleg Gusakov olegy@codehaus.org Developer - Vincent Siveton vsiveton + Vincent Siveton vsiveton@codehaus.org Developer - Kristian Rosenvold krosenvold + Kristian Rosenvold krosenvold@apache.org Developer - Andreas Gudian agudian + Andreas Gudian agudian@apache.org Developer - Karl Heinz Marbaise khmarbaise + Karl Heinz Marbaise khmarbaise@apache.org Developer - Michael Osipov michael-o + Michael Osipov 1983-01-06@gmx.net Developer - Gabriel Belingueres belingueres + Gabriel Belingueres belingueres@gmail.com Developer + + kwin + Konrad Windszus + kwin@apache.org + + Developer + + + + sjaranowski + Slawomir Jaranowski + sjaranowski@apache.org + + Developer + + + + slachiewicz + Sylwester Lachiewicz + slachiewicz@apache.org + ASF + + Developer + + + + gnodet + Guillaume Nodet + gnodet@apache.org + ASF + + Developer + + - - - Plexus User List - http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org - http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org - http://archive.plexus.codehaus.org/user - user@plexus.codehaus.org - + - Plexus Developer List - http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org - http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org - http://archive.plexus.codehaus.org/dev - dev@plexus.codehaus.org - - - Plexus Announce List - http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org - http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org - http://archive.plexus.codehaus.org/announce - - - Plexus Commit List - http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org - http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org - http://archive.plexus.codehaus.org/scm + Plexus and MojoHaus Development List + mojohaus-dev+subscribe@googlegroups.com + mojohaus-dev+unsubscribe@googlegroups.com + mojohaus-dev@googlegroups.com + https://groups.google.com/forum/#!forum/mojohaus-dev - scm:git:git@github.com:codehaus-plexus/plexus-pom.git - scm:git:git@github.com:codehaus-plexus/plexus-pom.git + scm:git:https://github.com/codehaus-plexus/plexus-pom.git + ${project.scm.connection} + master https://github.com/codehaus-plexus/plexus-pom/tree/${project.scm.tag}/ - plexus-10 + github https://github.com/codehaus-plexus/plexus-pom/issues + - 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} + github:gh-pages - scm:git:git@github.com:codehaus-plexus + ${project.scm.developerConnection} 8 - 1.${javaVersion} - 1.${javaVersion} + 3.6.3 + ${javaVersion} + ${javaVersion} + ${javaVersion} + ${javaVersion} + + none + true UTF-8 - https://oss.sonatype.org/content/repositories/plexus-snapshots - 2022-06-09T20:48:05Z + + sonatype-central-portal + Sonatype Central Snapshots + https://central.sonatype.com/repository/maven-snapshots + + 2025-08-17T17:02:51Z true + 3.0.0 + 3.15.1 + 2.1.0 + 3.5.4 + 5.13.4 + 0.7.5 + apply + 0.9.0.M4 + true + + + true + automatic + true + false + - org.codehaus.plexus - plexus-component-annotations - 2.1.1 - compile + org.junit + junit-bom + ${junit5Version} + pom + import @@ -337,89 +380,143 @@ limitations under the License. + + eu.maveniverse.maven.plugins + njord + ${njord.version} + org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.7.1 org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 + 3.6.0 config/maven_checks.xml - https://raw.github.com/codehaus-plexus/plexus-pom/master/src/main/resources/config/plexus-header.txt + + https://raw.githubusercontent.com/codehaus-plexus/plexus-pom/plexus-11/src/main/resources/config/plexus-header.txt - - - com.puppycrawl.tools - checkstyle - 9.3 - org.apache.maven.shared maven-shared-resources - 4 + 6 org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.5.0 org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 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 - 2.8.2 + 3.1.4 org.apache.maven.plugins maven-enforcer-plugin - 3.0.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 - 2.5.2 + 3.1.4 org.apache.maven.plugins maven-jar-plugin - 3.2.2 + 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.4.0 + 3.12.0 + + true + en + + true + org.apache.maven.plugins maven-jxr-plugin - 3.2.0 + 3.6.0 org.apache.maven.plugins maven-plugin-plugin - 3.6.4 + ${mavenPluginToolsVersion} + + + default-descriptor + process-classes + + ./apidocs/ + + + + generate-helpmojo + + helpmojo + + + + + + org.apache.maven.plugins + maven-plugin-report-plugin + ${mavenPluginToolsVersion} org.apache.maven.plugins maven-pmd-plugin - 3.17.0 + 3.27.0 ${maven.compiler.source} @@ -434,27 +531,26 @@ limitations under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 3.3.0 + 3.9.0 org.apache.maven.plugins maven-release-plugin - 3.0.0-M6 + 3.1.1 deploy - forked-path plexus-release org.apache.maven.plugins maven-resources-plugin - 3.2.0 + 3.3.1 org.apache.maven.plugins maven-scm-publish-plugin - 3.1.0 + 3.3.0 ${project.scm.developerConnection} @@ -464,52 +560,95 @@ limitations under the License. org.apache.maven.plugins maven-site-plugin - 3.12.0 + 3.21.0 - true + + true org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + ${mavenSurefireVersion} org.apache.maven.plugins maven-surefire-report-plugin - 2.22.2 + ${mavenSurefireVersion} - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 + 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 @@ -519,19 +658,32 @@ limitations under the License. org.apache.maven.plugins maven-enforcer-plugin + + + org.codehaus.mojo + extra-enforcer-rules + 1.10.0 + + - enforce-maven + enforce-maven-and-java-bytecode enforce - 3.0.5 - This project requires at least Maven 3.0.5 + ${minimalMavenBuildVersion} + This project requires at least Maven ${minimalMavenBuildVersion} - + + ${maven.compiler.target} + + + ${minimalJavaBuildVersion} + + @@ -544,10 +696,18 @@ limitations under the License. attach-descriptor + false + + + eu.maveniverse.maven.njord + extension + ${njord.version} + + @@ -593,30 +753,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 - findbugs-maven-plugin - org.codehaus.mojo taglist-maven-plugin + + true + org.apache.maven.plugins @@ -634,27 +797,30 @@ limitations under the License. org.apache.maven.plugins maven-javadoc-plugin - - true - - http://junit.sourceforge.net/javadoc/ - - default javadoc - test-javadoc + + 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-enforcer-plugin - - - org.codehaus.mojo - animal-sniffer-enforcer-rule - 1.21 - - - - - check-signatures - test - - enforce - - - - - - org.codehaus.mojo.signature - java1${javaVersion} - 1.0 - - - - - - + maven-checkstyle-plugin + + ${checkstyle.spotless.config} + + + format-check + + + env.CI + + + + check + + + + format + + + !env.CI + + + + apply + + diff --git a/renovate.json b/renovate.json deleted file mode 100644 index f45d8f110..000000000 --- a/renovate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": [ - "config:base" - ] -} 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..4570112ef --- /dev/null +++ b/src/site/markdown/index.md @@ -0,0 +1,27 @@ +# 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 + + sonatype-cp + njord:template:release-sca + + + + +``` + +Tokens can be obtained from https://central.sonatype.com/account + diff --git a/src/site/site.xml b/src/site/site.xml index 80437f88a..59edeea41 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,17 +1,16 @@ - - - Plexus - http://codehaus-plexus.github.io/ - /images/plexus-logo-trans.png + + + + Plexus org.apache.maven.skins maven-fluido-skin - 1.11.0 + ${mavenFluidoSkinVersion} ${project.scm.url} @@ -28,19 +27,19 @@ true - - http://codehaus-plexus.github.io/ + https://codehaus-plexus.github.io/ - + - + + @@ -51,27 +50,20 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - +