Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plexus-pom for openSUSE:Factory checked in at 2023-09-06 19:00:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plexus-pom (Old) and /work/SRC/openSUSE:Factory/.plexus-pom.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-pom" Wed Sep 6 19:00:11 2023 rev:2 rq:1109293 version:14 Changes: -------- --- /work/SRC/openSUSE:Factory/plexus-pom/plexus-pom.changes 2019-02-28 21:38:38.517635684 +0100 +++ /work/SRC/openSUSE:Factory/.plexus-pom.new.1766/plexus-pom.changes 2023-09-06 19:04:48.425704852 +0200 @@ -1,0 +2,27 @@ +Wed Sep 6 14:57:40 UTC 2023 - Fridrich Strba <[email protected]> + +- Upgrade to version 14 + * Bug Fixes + + Remove maven-failsafe-report-plugin + + Set compiler.source and compiler.target to javaVersion + property without "1.x" prefix + + fix site descriptor (revert partially PR #161) + + fix site link + + Add a deploy build + + Add spotless plugin configuration + + Correct location of Checkstyle header + + javadoc notimestamp, to avoid noise in gh-pages + + Remove test-javadoc report and configuration improvements + + Require Maven 3.2.5+ + + Remove FindBugs from reporting + + Drop Dependency Management for plexus-component-annotations + (deprecated) + + Fix mailing list links + + Checkstyle license check - depend on file from released branch + + Refresh Maven site + + Fix link to ASF 2.0 license + + One time spotless apply + + Sync enforcer configuration setup with ASF + + Drop no longer needed configuration for checkstyle plugin + +------------------------------------------------------------------- Old: ---- plexus-5.1.tar.gz New: ---- plexus-14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plexus-pom.spec ++++++ --- /var/tmp/diff_new_pack.KOwcQt/_old 2023-09-06 19:04:49.505743353 +0200 +++ /var/tmp/diff_new_pack.KOwcQt/_new 2023-09-06 19:04:49.509743496 +0200 @@ -1,7 +1,7 @@ # # spec file for package plexus-pom # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: plexus-pom -Version: 5.1 +Version: 14 Release: 0 Summary: Root Plexus Projects POM License: Apache-2.0 @@ -25,7 +25,7 @@ URL: https://github.com/codehaus-plexus/plexus-pom Source0: https://github.com/codehaus-plexus/plexus-pom/archive/plexus-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -35,21 +35,20 @@ %prep %setup -q -n plexus-pom-plexus-%{version} -# * require: org.codehaus.plexus plexus-stylus-skin 1.0 -# org.apache.maven.wagon wagon-webdav-jackrabbit 1.0 -%pom_remove_plugin :maven-site-plugin -%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin -%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin -#Temporary? +%pom_remove_dep org.junit:junit-bom +%pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :taglist-maven-plugin +%pom_remove_plugin :spotless-maven-plugin + cp -p %{SOURCE1} LICENSE %build %install install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus.pom +%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus.pom %add_maven_depmap %{name}/plexus.pom %files -f .mfiles ++++++ plexus-5.1.tar.gz -> plexus-14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/.git-blame-ignore-revs new/plexus-pom-plexus-14/.git-blame-ignore-revs --- old/plexus-pom-plexus-5.1/.git-blame-ignore-revs 1970-01-01 01:00:00.000000000 +0100 +++ new/plexus-pom-plexus-14/.git-blame-ignore-revs 2023-07-23 11:58:10.000000000 +0200 @@ -0,0 +1,2 @@ +# code reformat after spotless enabled +bacaf1cc15b1dc5e13b52c7d82c0058464d9e676 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/.github/dependabot.yml new/plexus-pom-plexus-14/.github/dependabot.yml --- old/plexus-pom-plexus-5.1/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/plexus-pom-plexus-14/.github/dependabot.yml 2023-07-23 11:58:10.000000000 +0200 @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/.github/release-drafter.yml new/plexus-pom-plexus-14/.github/release-drafter.yml --- old/plexus-pom-plexus-5.1/.github/release-drafter.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/plexus-pom-plexus-14/.github/release-drafter.yml 2023-07-23 11:58:10.000000000 +0200 @@ -0,0 +1,2 @@ +_extends: .github +tag-template: plexus-$NEXT_MINOR_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/.github/workflows/maven.yml new/plexus-pom-plexus-14/.github/workflows/maven.yml --- old/plexus-pom-plexus-5.1/.github/workflows/maven.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/plexus-pom-plexus-14/.github/workflows/maven.yml 2023-07-23 11:58:10.000000000 +0200 @@ -0,0 +1,31 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +name: GitHub CI + +on: [push, pull_request] + +jobs: + build: + name: Build it + uses: codehaus-plexus/.github/.github/workflows/[email protected] + + deploy: + name: Deploy + needs: build + uses: codehaus-plexus/.github/.github/workflows/maven-deploy.yml@master + secrets: inherit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/.github/workflows/release-drafter.yml new/plexus-pom-plexus-14/.github/workflows/release-drafter.yml --- old/plexus-pom-plexus-5.1/.github/workflows/release-drafter.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/plexus-pom-plexus-14/.github/workflows/release-drafter.yml 2023-07-23 11:58:10.000000000 +0200 @@ -0,0 +1,12 @@ +name: Release Drafter +on: + push: + branches: + - master +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + - uses: release-drafter/release-drafter@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/.gitignore new/plexus-pom-plexus-14/.gitignore --- old/plexus-pom-plexus-5.1/.gitignore 2018-05-08 11:17:06.000000000 +0200 +++ new/plexus-pom-plexus-14/.gitignore 2023-07-23 11:58:10.000000000 +0200 @@ -5,4 +5,4 @@ bin *.iml .idea - +.DS_Store diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/README.md new/plexus-pom-plexus-14/README.md --- old/plexus-pom-plexus-5.1/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/plexus-pom-plexus-14/README.md 2023-07-23 11:58:10.000000000 +0200 @@ -0,0 +1,6 @@ +Plexus Parent POM +============ + +[](https://search.maven.org/artifact/org.codehaus.plexus/plexus) + +The current master is now at https://github.com/codehaus-plexus/plexus-pom diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/pom.xml new/plexus-pom-plexus-14/pom.xml --- old/plexus-pom-plexus-5.1/pom.xml 2018-05-08 11:17:06.000000000 +0200 +++ new/plexus-pom-plexus-14/pom.xml 2023-07-23 11:58:10.000000000 +0200 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- Copyright The Codehaus Foundation. @@ -15,27 +14,26 @@ See the License for the specific language governing permissions and limitations under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus</artifactId> + <version>14</version> <packaging>pom</packaging> - <version>5.1</version> <name>Plexus</name> <description>The Plexus project provides a full software stack for creating and executing software projects.</description> - <url>http://codehaus-plexus.github.io/</url> + <url>https://codehaus-plexus.github.io/plexus-pom/</url> <inceptionYear>2001</inceptionYear> <organization> <name>Codehaus Plexus</name> - <url>http://codehaus-plexus.github.io/</url> + <url>https://codehaus-plexus.github.io/</url> </organization> <licenses> <license> <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> </licenses> @@ -120,174 +118,203 @@ </roles> </developer> <developer> - <name>Trygve Laugstøl</name> <id>trygvis</id> + <name>Trygve Laugstøl</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Kenney Westerhof</name> <id>kenney</id> + <name>Kenney Westerhof</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Carlos Sanchez</name> <id>carlos</id> + <name>Carlos Sanchez</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Brett Porter</name> <id>brett</id> + <name>Brett Porter</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>John Casey</name> <id>jdcasey</id> + <name>John Casey</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Andrew Williams</name> <id>handyande</id> + <name>Andrew Williams</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Rahul Thakur</name> <id>rahul</id> + <name>Rahul Thakur</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Joakim Erdfelt</name> <id>joakime</id> + <name>Joakim Erdfelt</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Olivier Lamy</name> <id>olamy</id> + <name>Olivier Lamy</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Hervé Boutemy</name> <id>hboutemy</id> + <name>Hervé Boutemy</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Oleg Gusakov</name> <id>oleg</id> + <name>Oleg Gusakov</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Vincent Siveton</name> <id>vsiveton</id> + <name>Vincent Siveton</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Kristian Rosenvold</name> <id>krosenvold</id> + <name>Kristian Rosenvold</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Andreas Gudian</name> <id>agudian</id> + <name>Andreas Gudian</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Karl Heinz Marbaise</name> <id>khmarbaise</id> + <name>Karl Heinz Marbaise</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Michael Osipov</name> <id>michael-o</id> + <name>Michael Osipov</name> <email>[email protected]</email> <roles> <role>Developer</role> </roles> </developer> + <developer> + <id>belingueres</id> + <name>Gabriel Belingueres</name> + <email>[email protected]</email> + <roles> + <role>Developer</role> + </roles> + </developer> + <developer> + <id>kwin</id> + <name>Konrad Windszus</name> + <email>[email protected]</email> + <roles> + <role>Developer</role> + </roles> + </developer> + <developer> + <id>sjaranowski</id> + <name>Slawomir Jaranowski</name> + <email>[email protected]</email> + <roles> + <role>Developer</role> + </roles> + </developer> + <developer> + <id>slachiewicz</id> + <name>Sylwester Lachiewicz</name> + <email>[email protected]</email> + <organization>ASF</organization> + <roles> + <role>Developer</role> + </roles> + </developer> + <developer> + <id>gnodet</id> + <name>Guillaume Nodet</name> + <email>[email protected]</email> + <organization>ASF</organization> + <roles> + <role>Developer</role> + </roles> + </developer> </developers> - <mailingLists><!-- TODO decide what we do with mailing lists now --> - <mailingList> - <name>Plexus User List</name> - <subscribe>http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org</subscribe> - <unsubscribe>http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org</unsubscribe> - <archive>http://archive.plexus.codehaus.org/user</archive> - <post>[email protected]</post> - </mailingList> + <mailingLists> <mailingList> - <name>Plexus Developer List</name> - <subscribe>http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org</subscribe> - <unsubscribe>http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org</unsubscribe> - <archive>http://archive.plexus.codehaus.org/dev</archive> - <post>[email protected]</post> + <name>Plexus and MojoHaus Development List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>https://groups.google.com/forum/#!forum/mojohaus-dev</archive> </mailingList> <mailingList> - <name>Plexus Announce List</name> - <subscribe>http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org</subscribe> - <unsubscribe>http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org</unsubscribe> - <archive>http://archive.plexus.codehaus.org/announce</archive> - </mailingList> - <mailingList> - <name>Plexus Commit List</name> - <subscribe>http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org</subscribe> - <unsubscribe>http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org</unsubscribe> - <archive>http://archive.plexus.codehaus.org/scm</archive> + <name>Former (pre-2015-06) Development List</name> + <archive>https://markmail.org/list/org.codehaus.plexus.dev</archive> </mailingList> </mailingLists> <scm> - <connection>scm:git:[email protected]:codehaus-plexus/plexus-pom.git</connection> - <developerConnection>scm:git:[email protected]:codehaus-plexus/plexus-pom.git</developerConnection> - <url>http://github.com/codehaus-plexus/plexus-pom/tree/${project.scm.tag}/</url> - <tag>plexus-5.1</tag> + <connection>scm:git:https://github.com/codehaus-plexus/plexus-pom.git</connection> + <developerConnection>${project.scm.connection}</developerConnection> + <tag>plexus-14</tag> + <url>https://github.com/codehaus-plexus/plexus-pom/tree/${project.scm.tag}/</url> </scm> + <issueManagement> <system>github</system> - <url>http://github.com/codehaus-plexus/plexus-pom/issues</url> + <url>https://github.com/codehaus-plexus/plexus-pom/issues</url> </issueManagement> + <distributionManagement> <repository> <id>plexus-releases</id> @@ -299,115 +326,155 @@ <name>Plexus Snapshot Repository</name> <url>${plexusDistMgmtSnapshotsUrl}</url> </snapshotRepository> + <!-- site distribution management must be override in child projects --> <site> <id>github:gh-pages</id> - <url>scm:git:[email protected]:codehaus-plexus</url><!-- url used only for inheritance --> + <url>${project.scm.developerConnection}</url> </site> </distributionManagement> <properties> - <javaVersion>6</javaVersion> - <maven.compiler.source>1.${javaVersion}</maven.compiler.source> - <maven.compiler.target>1.${javaVersion}</maven.compiler.target> + <javaVersion>8</javaVersion> + <maven.compiler.source>${javaVersion}</maven.compiler.source> + <maven.compiler.target>${javaVersion}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <plexusDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/plexus-snapshots</plexusDistMgmtSnapshotsUrl> + <project.build.outputTimestamp>2023-07-23T09:58:05Z</project.build.outputTimestamp> + <gpg.useagent>true</gpg.useagent> + <spotless-maven-plugin.version>2.38.0</spotless-maven-plugin.version> + <mavenPluginToolsVersion>3.9.0</mavenPluginToolsVersion> + <mavenFluidoSkinVersion>1.11.2</mavenFluidoSkinVersion> + <mavenSurefireVersion>3.1.2</mavenSurefireVersion> + <junit5Version>5.9.3</junit5Version> + <spotless.action>check</spotless.action> + <sisuMavenPluginVersion>0.9.0.M2</sisuMavenPluginVersion> </properties> <dependencyManagement> <dependencies> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-annotations</artifactId> - <version>1.6</version> - <scope>compile</scope> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${mavenPluginToolsVersion}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> + <version>${junit5Version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> <pluginManagement> <plugins> <!-- set versions of common plugins for reproducibility, ordered alphabetically --> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>3.6.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>3.0.0</version> + <version>3.3.0</version> <configuration> <configLocation>config/maven_checks.xml</configLocation> - <headerLocation>https://raw.github.com/codehaus-plexus/plexus-pom/master/src/main/resources/config/plexus-header.txt</headerLocation> + <!-- version from release 11 referenced by branch --> + <headerLocation>https://raw.githubusercontent.com/codehaus-plexus/plexus-pom/plexus-11/src/main/resources/config/plexus-header.txt</headerLocation> </configuration> <dependencies> <!-- MCHECKSTYLE-327: the maven_checks.xml was moved to a shared project --> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-resources</artifactId> - <version>2</version> + <version>5</version> </dependency> </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>3.0.0</version> + <version>3.3.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>3.11.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> + <version>3.1.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.3.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.5.2</version> + <version>3.1.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> + <version>3.3.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> + <version>3.5.0</version> + <configuration> + <quiet>true</quiet> + <locale>en</locale> + <!-- avoid noise for svn/gitpubsub --> + <notimestamp>true</notimestamp> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> + <version>3.3.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.5.1</version> + <version>${mavenPluginToolsVersion}</version> + <executions> + <execution> + <id>default-descriptor</id> + <phase>process-classes</phase> + <configuration> + <internalJavadocBaseUrl>./apidocs/</internalJavadocBaseUrl> + </configuration> + </execution> + <execution> + <id>generate-helpmojo</id> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-report-plugin</artifactId> + <version>${mavenPluginToolsVersion}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.8</version> + <version>3.21.0</version> <configuration> <targetJdk>${maven.compiler.source}</targetJdk> <rulesets> @@ -422,28 +489,27 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.9</version> + <version>3.4.5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5.3</version> + <version>3.0.1</version> <configuration> <goals>deploy</goals> <mavenExecutorId>forked-path</mavenExecutorId> - <useReleaseProfile>false</useReleaseProfile> - <arguments>-Pplexus-release</arguments> + <releaseProfiles>plexus-release</releaseProfiles> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> + <version>3.3.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> - <version>3.0.0</version> + <version>3.2.1</version> <configuration> <!-- using scm.developerConnection instead of distributionManagement.site.url --> <pubScmUrl>${project.scm.developerConnection}</pubScmUrl> @@ -453,45 +519,55 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.7.1</version> + <version>3.12.1</version> <configuration> - <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin --> + <!-- don't deploy site with maven-site-plugin --> + <skipDeploy>true</skipDeploy> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.0.1</version> + <version>3.3.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.20</version> + <version>${mavenSurefireVersion}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.20</version> + <version>${mavenSurefireVersion}</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.7</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>${mavenSurefireVersion}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.4</version> + <artifactId>taglist-maven-plugin</artifactId> + <version>3.0.0</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> + <groupId>org.eclipse.sisu</groupId> + <artifactId>sisu-maven-plugin</artifactId> + <version>${sisuMavenPluginVersion}</version> + <executions> + <execution> + <id>generate-index</id> + <goals> + <goal>main-index</goal> + <goal>test-index</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> - <version>1.7.1</version> + <version>2.1.1</version> <executions> <execution> <id>process-classes</id> @@ -507,24 +583,70 @@ </execution> </executions> </plugin> + <plugin> + <groupId>com.diffplug.spotless</groupId> + <artifactId>spotless-maven-plugin</artifactId> + <version>${spotless-maven-plugin.version}</version> + <configuration> + <java> + <!-- orders of used formatters are important --> + <!-- eg. palantir override importOrder, so should be first --> + <palantirJavaFormat /> + <removeUnusedImports /> + <importOrder> + <order>javax,java,,\#</order> + </importOrder> + </java> + <pom> + <sortPom> + <expandEmptyElements>false</expandEmptyElements> + <!-- https://issues.apache.org/jira/browse/MRELEASE-1111 --> + <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement> + </sortPom> + </pom> + <upToDateChecking> + <enabled>true</enabled> + </upToDateChecking> + </configuration> + <executions> + <execution> + <id>spotless-check</id> + <goals> + <goal>${spotless.action}</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>extra-enforcer-rules</artifactId> + <version>1.7.0</version> + </dependency> + </dependencies> <executions> <execution> - <id>enforce-maven</id> + <id>enforce-maven-and-java-bytecode</id> <goals> <goal>enforce</goal> </goals> <configuration> <rules> <requireMavenVersion> - <version>3.0.5</version> - <message>This project requires at least Maven 3.0.5</message> + <version>3.2.5</version> + <message>This project requires at least Maven 3.2.5</message> </requireMavenVersion> - </rules> + <enforceBytecodeVersion> + <maxJdkVersion>${maven.compiler.target}</maxJdkVersion> + </enforceBytecodeVersion> + </rules> </configuration> </execution> </executions> @@ -555,15 +677,15 @@ <report>summary</report> <report>dependency-info</report> <report>modules</report> - <report>license</report> - <report>project-team</report> + <report>licenses</report> + <report>team</report> <report>scm</report> - <report>issue-tracking</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>mailing-lists</report> <report>dependency-management</report> <report>dependencies</report> <report>dependency-convergence</report> - <report>cim</report> + <report>ci-management</report> <report>plugin-management</report> <report>plugins</report> <report>distribution-management</report> @@ -589,26 +711,10 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <reportSets> - <reportSet> - <id>default</id> - <reports> - <report>checkstyle</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> </plugin> <plugin> @@ -627,26 +733,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <detectLinks>true</detectLinks> - <links> - <link>http://junit.sourceforge.net/javadoc/</link> - </links> - </configuration> <reportSets> <reportSet> <id>default</id> <reports> <report>javadoc</report> - <report>test-javadoc</report> </reports> </reportSet> </reportSets> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - </plugin> </plugins> </reporting> </profile> @@ -654,6 +749,35 @@ <id>plexus-release</id> <build> <plugins> + <!-- Create a source-release artifact that contains the fully buildable + project directory source structure. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.5</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptorRefs> + <descriptorRef>source-release</descriptorRef> + </descriptorRefs> + <tarLongFileMode>posix</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> @@ -696,5 +820,57 @@ </plugins> </build> </profile> + + <profile> + <id>java11+</id> + <activation> + <jdk>[11,)</jdk> + </activation> + + <properties> + <maven.compiler.release>${javaVersion}</maven.compiler.release> + <!-- configuration for checkstyle to use with spotless --> + <checkstyle.spotless.config>config/maven_checks_nocodestyle.xml</checkstyle.spotless.config> + </properties> + + <build> + <!--- newer versions of plugins requires JDK 11 --> + <plugins> + <plugin> + <groupId>com.diffplug.spotless</groupId> + <artifactId>spotless-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>${checkstyle.spotless.config}</configLocation> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>format-check</id> + <activation> + <property> + <name>!format</name> + </property> + </activation> + <properties> + <spotless.action>check</spotless.action> + </properties> + </profile> + <profile> + <id>format</id> + <activation> + <property> + <name>format</name> + </property> + </activation> + <properties> + <spotless.action>apply</spotless.action> + </properties> + </profile> </profiles> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-pom-plexus-5.1/src/site/site.xml new/plexus-pom-plexus-14/src/site/site.xml --- old/plexus-pom-plexus-5.1/src/site/site.xml 2018-05-08 11:17:06.000000000 +0200 +++ new/plexus-pom-plexus-14/src/site/site.xml 2023-07-23 11:58:10.000000000 +0200 @@ -4,24 +4,32 @@ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd";> <bannerLeft> <name>Plexus</name> - <href>http://codehaus-plexus.github.io/</href> - <src>/images/plexus-logo-trans.png</src> + <href>https://codehaus-plexus.github.io/</href> + <src>https://codehaus-plexus.github.io/images/plexus-logo-trans.png</src> </bannerLeft> <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.7</version> + <version>${mavenFluidoSkinVersion}</version> </skin> <edit>${project.scm.url}</edit> <custom> + <matomo> + <siteId>18</siteId> + <url>https://analytics.apache.org/</url> + <options> + <disableCookies/> + <trackPageView/> + <enableLinkTracking/> + </options> + </matomo> <fluidoSkin> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - <googlePlusOne /> <googleSearch> - <sitesearch>http://codehaus-plexus.github.io/</sitesearch> + <sitesearch>https://codehaus-plexus.github.io/</sitesearch> </googleSearch> </fluidoSkin> </custom> @@ -31,7 +39,8 @@ <body> <breadcrumbs> - <item name="Plexus" href="/"/> + <item name="Plexus" href="https://codehaus-plexus.github.io/"/> + <item name="Parent POM" href="https://codehaus-plexus.github.io/plexus-pom"/> </breadcrumbs> <menu name="Overview"> @@ -42,27 +51,28 @@ <menu ref="reports" inherit="bottom" /> <menu name="Plexus Projects" inherit="bottom"> - <item name="Modello" href="/modello/" /> - <item name="Plexus Classworlds" href="/plexus-classworlds/" /> + <item name="Modello" href="https://codehaus-plexus.github.io/modello/"; /> + <item name="Plexus Classworlds" href="https://codehaus-plexus.github.io/plexus-classworlds/"; /> <item name="Plexus Components"> - <item name="Plexus Archiver" href="/plexus-archiver/"/> - <item name="Plexus CLI" href="/plexus-cli/"/> - <item name="Plexus Compiler" href="/plexus-compiler/"/> - <item name="Plexus Digest" href="/plexus-digest/"/> - <item name="Plexus i18n" href="/plexus-i18n/"/> - <item name="Plexus Interactivity" href="/plexus-interactivity/"/> - <item name="Plexus Interpolation" href="/plexus-interpolation/"/> - <item name="Plexus IO" href="/plexus-io/"/> - <item name="Plexus Languages" href="/plexus-languages/"/> - <item name="Plexus Resources" href="/plexus-resources/"/> - <item name="Plexus Swizzle" href="/plexus-swizzle/"/> - <item name="Plexus Velocity" href="/plexus-velocity/"/> + <item name="Plexus Archiver" href="https://codehaus-plexus.github.io/plexus-archiver/"/> + <item name="Plexus CLI" href="https://codehaus-plexus.github.io/plexus-cli/"/> + <item name="Plexus Compiler" href="https://codehaus-plexus.github.io/plexus-compiler/"/> + <item name="Plexus Digest" href="https://codehaus-plexus.github.io/plexus-digest/"/> + <item name="Plexus i18n" href="https://codehaus-plexus.github.io/plexus-i18n/"/> + <item name="Plexus Interactivity" href="https://codehaus-plexus.github.io/plexus-interactivity/"/> + <item name="Plexus Interpolation" href="https://codehaus-plexus.github.io/plexus-interpolation/"/> + <item name="Plexus IO" href="https://codehaus-plexus.github.io/plexus-io/"/> + <item name="Plexus Languages" href="https://codehaus-plexus.github.io/plexus-languages/"/> + <item name="Plexus Resources" href="https://codehaus-plexus.github.io/plexus-resources/"/> + <item name="Plexus Swizzle" href="https://codehaus-plexus.github.io/plexus-swizzle/"/> + <item name="Plexus Velocity" href="https://codehaus-plexus.github.io/plexus-velocity/"/> </item> <item name="Plexus Parent POMs"> - <item name="Plexus" href="/plexus-pom/"/> - <item name="Plexus Components" href="/plexus-components/"/> + <item name="Plexus" href="https://codehaus-plexus.github.io/plexus-pom/"/> + <item name="Plexus Components" href="https://codehaus-plexus.github.io/plexus-components/"/> </item> - <item name="Plexus Utils" href="/plexus-utils/" /> + <item name="Plexus Utils" href="https://codehaus-plexus.github.io/plexus-utils/"; /> + <item name="Plexus XML" href="https://codehaus-plexus.github.io/plexus-xml/"; /> </menu> </body> </project>
