Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mojo-parent for openSUSE:Factory checked in at 2022-12-06 14:23:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mojo-parent (Old) and /work/SRC/openSUSE:Factory/.mojo-parent.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mojo-parent" Tue Dec 6 14:23:00 2022 rev:3 rq:1040354 version:70 Changes: -------- --- /work/SRC/openSUSE:Factory/mojo-parent/mojo-parent.changes 2022-03-25 21:54:49.166286545 +0100 +++ /work/SRC/openSUSE:Factory/.mojo-parent.new.1835/mojo-parent.changes 2022-12-06 14:23:04.765475861 +0100 @@ -1,0 +2,19 @@ +Sun Dec 4 14:45:59 UTC 2022 - Dirk Müller <[email protected]> + +- update to 70: + * Improvement checkstyle configuration + * Add modello-maven-plugin to pluginManagement + * Remove Google search box due to privacy (#274) @slawekjaranowski + * Put version for mrm-maven-plugin in property (#273) @slawekjaranowski + * Add streamLogsOnFailures to m-invoker-p (#272) @slawekjaranowski + * Add property for maven-fluido-skin version (#268) @slawekjaranowski + * Setup Apache Matomo analytics (#259) @slawekjaranowski + * Downgrade Checkstyle to 9.3. 10.x requires Java 11(ecfb1d1) + * remove requirement to use ssh for github scm devCon + * Require Maven 3.2.5 (#215) @slachiewicz + * [#225] add SHA-512 hashes (#226) @bmarwell + * Extract plugin version as variable so child pom can override if needed (#84) @nhojpatrick + * remove issue-tracking as do not exists anymore (#148) @olamy + * remove cim report as it do not exists anymore (#147) @olamy + +------------------------------------------------------------------- Old: ---- mojo-parent-60.tar.gz New: ---- mojo-parent-70.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mojo-parent.spec ++++++ --- /var/tmp/diff_new_pack.rCt0vs/_old 2022-12-06 14:23:05.349480399 +0100 +++ /var/tmp/diff_new_pack.rCt0vs/_new 2022-12-06 14:23:05.357480467 +0100 @@ -17,7 +17,7 @@ Name: mojo-parent -Version: 60 +Version: 70 Release: 0 Summary: Codehaus MOJO parent project pom file License: Apache-2.0 @@ -26,6 +26,7 @@ Source0: https://github.com/mojohaus/mojo-parent/archive/%{name}-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: javapackages-local +Requires: mvn(org.junit:junit-bom:pom:) BuildArch: noarch %description @@ -48,6 +49,6 @@ %add_maven_depmap %{name}/%{name}.pom -a org.codehaus.mojo:mojo %files -f .mfiles -%doc LICENSE-2.0.txt +%license LICENSE-2.0.txt %changelog ++++++ mojo-parent-60.tar.gz -> mojo-parent-70.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/.github/dependabot.yml new/mojo-parent-mojo-parent-70/.github/dependabot.yml --- old/mojo-parent-mojo-parent-60/.github/dependabot.yml 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/.github/dependabot.yml 2022-08-15 14:35:42.000000000 +0200 @@ -4,6 +4,12 @@ directory: "/" schedule: interval: "daily" + ignore: + # Ignore Maven Core updates + - dependency-name: "org.apache.maven:*" + # Checkstyle >=10 requires Java 11+ + - dependency-name: "com.puppycrawl.tools:checkstyle" + versions: [">= 10.0"] - package-ecosystem: "github-actions" directory: "/" schedule: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/.github/release-drafter.yml new/mojo-parent-mojo-parent-70/.github/release-drafter.yml --- old/mojo-parent-mojo-parent-60/.github/release-drafter.yml 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/.github/release-drafter.yml 2022-08-15 14:35:42.000000000 +0200 @@ -1,2 +1,9 @@ _extends: .github -tag-template: mojo-parent-$NEXT_MINOR_VERSION +# mojo-parent uses a single version number, no semantic versioning +version-template: '$MAJOR' +name-template: '$NEXT_MAJOR_VERSION' +tag-template: 'mojo-parent-$NEXT_MAJOR_VERSION' +template: | + ## Changes + + $CHANGES \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/.github/workflows/maven.yml new/mojo-parent-mojo-parent-70/.github/workflows/maven.yml --- old/mojo-parent-mojo-parent-60/.github/workflows/maven.yml 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/.github/workflows/maven.yml 2022-08-15 14:35:42.000000000 +0200 @@ -22,31 +22,51 @@ jobs: build: - strategy: - matrix: - os: [ubuntu-latest] - java: [8] - fail-fast: false - - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - - name: Set up cache for ~./m2/repository - uses: actions/[email protected] + - name: Set up JDK + uses: actions/setup-java@v3 with: - path: ~/.m2/repository - key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }} - restore-keys: | - maven-${{ matrix.os }}-java${{ matrix.java }}- - maven-${{ matrix.os }}- + java-version: 8 + distribution: 'temurin' + cache: 'maven' + + - name: Build with Maven + run: mvn -e -B -V verify site + + deploy: + needs: build + + if: | + github.event_name == 'push' && + github.repository_owner == 'mojohaus' && + github.ref == 'refs/heads/master' && + !startsWith(github.event.head_commit.message , '[maven-release-plugin] prepare release') + + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: ${{ matrix.java }} + java-version: '8' + distribution: 'temurin' + cache: 'maven' + server-id: ossrh-snapshots + server-username: MAVEN_DEPLOY_UID + server-password: MAVEN_DEPLOY_PWD + + - name: Publish Snapshot + run: mvn -e -B -V deploy + env: + MAVEN_DEPLOY_UID: ${{ secrets.MAVEN_DEPLOY_UID }} + MAVEN_DEPLOY_PWD: ${{ secrets.MAVEN_DEPLOY_PWD }} + - - name: Build with Maven - run: mvn verify -e -B -V -P run-its javadoc:javadoc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/.github/workflows/release-drafter.yml new/mojo-parent-mojo-parent-70/.github/workflows/release-drafter.yml --- old/mojo-parent-mojo-parent-60/.github/workflows/release-drafter.yml 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/.github/workflows/release-drafter.yml 2022-08-15 14:35:42.000000000 +0200 @@ -3,10 +3,11 @@ push: branches: - master + workflow_dispatch: jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/[email protected] + - uses: release-drafter/[email protected] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/.travis.yml new/mojo-parent-mojo-parent-70/.travis.yml --- old/mojo-parent-mojo-parent-60/.travis.yml 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -language: java -env: - - MAVEN_VERSION=3.0.5 - - MAVEN_VERSION=3.3.9 - - MAVEN_VERSION=3.5.4 - - MAVEN_VERSION=3.6.3 -jdk: - - openjdk8 - - openjdk11 -install: - - "mvn -N io.takari:maven:wrapper -Dmaven=${MAVEN_VERSION}" - - "./mvnw --show-version --errors --batch-mode validate dependency:go-offline" -script: "./mvnw --show-version --errors --batch-mode clean verify site" -cache: - directories: - - $HOME/.m2 -branches: - except: - - gh-pages -notifications: - email: - - [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/README.md new/mojo-parent-mojo-parent-70/README.md --- old/mojo-parent-mojo-parent-60/README.md 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/README.md 2022-08-15 14:35:42.000000000 +0200 @@ -2,8 +2,8 @@ This is the parent pom for all [MojoHaus](https://www.mojohaus.org) Maven plugins and components. -[](https://search.maven.org/search?q=g%3Aorg.codehaus.mojo+AND+a%3Amojo-parent) -[](https://travis-ci.org/mojohaus/mojo-parent) +[](https://search.maven.org/artifact/org.codehaus.mojo/mojo-parent) +[](https://github.com/mojohaus/mojo-parent/actions/workflows/maven.yml) ## Releasing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/config-assembly.xml new/mojo-parent-mojo-parent-70/config-assembly.xml --- old/mojo-parent-mojo-parent-60/config-assembly.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/config-assembly.xml 2022-08-15 14:35:42.000000000 +0200 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 http://maven.apache.org/xsd/assembly-2.1.1.xsd";> + + <id>config</id> + + <formats> + <format>jar</format> + </formats> + + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>src/main/config</directory> + <outputDirectory>mojohaus/config</outputDirectory> + </fileSet> + </fileSets> +</assembly> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/pom.xml new/mojo-parent-mojo-parent-70/pom.xml --- old/mojo-parent-mojo-parent-60/pom.xml 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/pom.xml 2022-08-15 14:35:42.000000000 +0200 @@ -24,7 +24,7 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>mojo-parent</artifactId> - <version>60</version> + <version>70</version> <packaging>pom</packaging> <name>MojoHaus Parent</name> @@ -112,7 +112,14 @@ <url>https://github.com/olamy</url> <organization>MojoHaus</organization> <organizationUrl>https://github.com/mojohaus</organizationUrl> - </developer> + </developer> + <developer> + <id>sjaranowski</id> + <name>Slawomir Jaranowski</name> + <url>https://github.com/slawekjaranowski</url> + <organization>MojoHaus</organization> + <organizationUrl>https://github.com/mojohaus</organizationUrl> + </developer> </developers> <mailingLists> @@ -129,26 +136,14 @@ <unsubscribe>mailto:[email protected]</unsubscribe> <post>mailto:[email protected]</post> <archive>https://lists.apache.org/[email protected]</archive> - <otherArchives> - <otherArchive>https://mail-archives.apache.org/mod_mbox/maven-users</otherArchive> - <otherArchive>https://www.mail-archive.com/[email protected]/</otherArchive> - <otherArchive>http://maven.40175.n5.nabble.com/Maven-Users-f40176.html</otherArchive> - <otherArchive>https://maven-users.markmail.org/</otherArchive> - </otherArchives> </mailingList> <mailingList> <name>Former (pre-2015-06) Development List</name> <archive>https://markmail.org/list/org.codehaus.mojo.dev</archive> - <otherArchives> - <otherArchive>http://mojo.10943.n7.nabble.com/Developer-f3.html</otherArchive> - </otherArchives> </mailingList> <mailingList> <name>Former (pre-2015-06) User List</name> <archive>https://markmail.org/list/org.codehaus.mojo.user</archive> - <otherArchives> - <otherArchive>http://mojo.10943.n7.nabble.com/User-f34162.html</otherArchive> - </otherArchives> </mailingList> <mailingList> <name>Former (pre-2015-06) Commits List</name> @@ -157,25 +152,22 @@ <mailingList> <name>Former (pre-2015-06) Announcements List</name> <archive>https://markmail.org/list/org.codehaus.mojo.announce</archive> - <otherArchives> - <otherArchive>http://mojo.10943.n7.nabble.com/Announce-f38303.html</otherArchive> - </otherArchives> </mailingList> </mailingLists> <scm> <connection>scm:git:https://github.com/mojohaus/mojo-parent.git</connection> - <developerConnection>scm:git:ssh://[email protected]/mojohaus/mojo-parent.git</developerConnection> + <developerConnection>scm:git:https://github.com/mojohaus/mojo-parent.git</developerConnection> <url>https://github.com/mojohaus/mojo-parent/tree/${project.scm.tag}</url> - <tag>mojo-parent-60</tag> + <tag>mojo-parent-70</tag> </scm> <issueManagement> - <system>github</system> + <system>GitHub</system> <url>https://github.com/mojohaus/${project.artifactId}/issues</url> </issueManagement> <ciManagement> - <system>travis</system> - <url>https://travis-ci.org/mojohaus/${project.artifactId}</url> + <system>GitHub</system> + <url>https://github.com/mojohaus/${project.artifactId}/actions</url> </ciManagement> <distributionManagement> <repository> @@ -195,18 +187,58 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <mojo.javadoc.mavenVersion>${project.prerequisites.maven}</mojo.javadoc.mavenVersion> - <mojo.java.target>1.7</mojo.java.target> + <mojo.java.target>1.8</mojo.java.target> + <maven.compiler.source>${mojo.java.target}</maven.compiler.source> + <maven.compiler.target>${mojo.java.target}</maven.compiler.target> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- NOTE: We deliberately do not set maven.test.redirectTestOutputToFile here to workaround MNG-1992 --> <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> <!-- this property makes sure NetBeans 6.8+ picks up some formatting rules from checkstyle --> <netbeans.checkstyle.format>true</netbeans.checkstyle.format> - <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version> <localCheckout>true</localCheckout> - <!-- Need to stay on 3.0.0 until https://issues.apache.org/jira/browse/MSHARED-854 is fixed --> - <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version> - <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version> - <project.build.outputTimestamp>2020-12-23T23:02:09Z</project.build.outputTimestamp> + <animal-sniffer-maven-plugin.version>1.21</animal-sniffer-maven-plugin.version> + <flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version> + <l10n-maven-plugin.version>1.0.0</l10n-maven-plugin.version> + <license-maven-plugin.version>1.9</license-maven-plugin.version> + <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version> + <maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version> + <maven-changes-plugin.version>2.11</maven-changes-plugin.version> + <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version> + <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version> + <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> + <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version> + <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> + <maven-ear-plugin.version>3.2.0</maven-ear-plugin.version> + <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version> + <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version> + <maven-fluido-skin.version>1.11.1</maven-fluido-skin.version> + <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version> + <maven-help-plugin.version>3.2.0</maven-help-plugin.version> + <maven-install-plugin.version>3.0.1</maven-install-plugin.version> + <maven-invoker-plugin.version>3.3.0</maven-invoker-plugin.version> + <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version> + <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version> + <maven-jxr-plugin.version>3.2.0</maven-jxr-plugin.version> + <maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version> + <maven-project-info-reports-plugin.version>3.4.1</maven-project-info-reports-plugin.version> + <maven-pmd-plugin.version>3.17.0</maven-pmd-plugin.version> + <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version> + <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version> + <maven-scm-publish-plugin.version>3.1.0</maven-scm-publish-plugin.version> + <maven-site-plugin.version>3.12.1</maven-site-plugin.version> + <maven-source-plugin.version>3.2.1</maven-source-plugin.version> + <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version> + <maven-surefire-report-plugin.version>3.0.0-M7</maven-surefire-report-plugin.version> + <maven-war-plugin.version>3.3.2</maven-war-plugin.version> + <mrm-maven-plugin.version>1.4.1</mrm-maven-plugin.version> + <modello-maven-plugin.version>2.0.0</modello-maven-plugin.version> + <plexus-component-metadata.version>2.1.1</plexus-component-metadata.version> + <taglist-maven-plugin.version>3.0.0</taglist-maven-plugin.version> + <versions-maven-plugin.version>2.11.0</versions-maven-plugin.version> + <project.build.outputTimestamp>2022-08-15T12:35:38Z</project.build.outputTimestamp> + <scmpublish.content>${project.reporting.outputDirectory}</scmpublish.content><!-- mono-module doesn't require site:stage for scm-publish --> + <junit5.version>5.9.0</junit5.version> + <checkstyle.version>9.3</checkstyle.version><!-- 10.x requires Java 11 --> </properties> <repositories> @@ -230,19 +262,26 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.0</version> + <version>3.2.5</version><!-- Minimum required Maven Version --> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.13.1</version> + <version>4.13.2</version> <scope>test</scope> </dependency> <dependency> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> + <version>${junit5.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <!--must be same version of m-plugin-p --> - <version>3.6.0</version> + <version>${maven-plugin-plugin.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -254,92 +293,118 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>3.0.0</version> + <version>${maven-antrun-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>3.3.0</version> + <version>${maven-assembly-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${maven-checkstyle-plugin.version}</version> <configuration> + <sourceDirectories> + <sourceDirectory>src/main/java</sourceDirectory> + </sourceDirectories> + <testSourceDirectories> + <testSourceDirectory>src/test/java</testSourceDirectory> + </testSourceDirectories> + <includeTestSourceDirectory>true</includeTestSourceDirectory> <configLocation>config/maven_checks.xml</configLocation> - <headerLocation>config/maven-header.txt</headerLocation> + <!-- by default don't check headers --> + <headerLocation>mojohaus/config/checkstyle/empty-header.txt</headerLocation> </configuration> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> <dependencies> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-resources</artifactId> - <version>2</version> + <version>4</version> + </dependency> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>mojo-parent</artifactId> + <version>70</version> + <classifier>config</classifier> + </dependency> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>${checkstyle.version}</version> </dependency> </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>3.1.0</version> + <version>${maven-clean-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> - <configuration> - <source>${mojo.java.target}</source> - <target>${mojo.java.target}</target> - </configuration> + <version>${maven-compiler-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.2</version> + <version>${maven-dependency-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> + <version>${maven-deploy-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4</version> + <version>${maven-enforcer-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-help-plugin</artifactId> - <version>3.2.0</version> + <version>${maven-help-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> + <version>${maven-gpg-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.5.2</version> + <version>${maven-install-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <version>3.2.1</version> + <version>${maven-invoker-plugin.version}</version> + <configuration> + <streamLogsOnFailures>true</streamLogsOnFailures> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.2.0</version> + <version>${maven-jar-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.3.1</version> + <version>${maven-war-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <version>3.1.0</version> + <version>${maven-ear-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -349,12 +414,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> + <version>${maven-jxr-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.6.0</version> + <version>${maven-plugin-plugin.version}</version> <executions> <execution> <id>help-mojo</id> @@ -372,28 +437,26 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>3.0.0-M1</version> + <version>${maven-release-plugin.version}</version> <configuration> <!-- do not deploy site but use instructions in README.md --> - <mavenExecutorId>forked-path</mavenExecutorId> <goals>deploy</goals> - <useReleaseProfile>false</useReleaseProfile> <arguments>-Pmojo-release</arguments> + <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>3.2.0</version> + <version>${maven-resources-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> - <version>3.0.0</version> + <version>${maven-scm-publish-plugin.version}</version> <configuration> <pubScmUrl>${project.scm.developerConnection}</pubScmUrl> <scmBranch>gh-pages</scmBranch> - <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage --> </configuration> <executions> <execution> @@ -408,7 +471,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.8.2</version> + <version>${maven-site-plugin.version}</version> <configuration> <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin --> </configuration> @@ -416,12 +479,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.2.1</version> + <version>${maven-source-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.2</version> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile> </configuration> @@ -429,66 +492,63 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.22.2</version> + <version>${maven-failsafe-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.22.2</version> + <version>${maven-surefire-report-plugin.version}</version> </plugin> <!-- Codehaus plugins in alphabetical order --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.17</version> + <version>${animal-sniffer-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>flatten-maven-plugin</artifactId> - <version>1.2.5</version> + <version>${flatten-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>l10n-maven-plugin</artifactId> - <version>1.0-alpha-2</version> + <version>${l10n-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> - <version>1.9</version> + <version>${license-maven-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.codehaus.modello</groupId> + <artifactId>modello-maven-plugin</artifactId> + <version>${modello-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>mrm-maven-plugin</artifactId> - <version>1.2.0</version> + <version>${mrm-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> - <version>2.1.0</version> + <version>${plexus-component-metadata.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> + <version>${taglist-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> - <version>2.8.1</version> + <version>${versions-maven-plugin.version}</version> </plugin> </plugins> </pluginManagement> + <plugins> - <!-- - We need to define the invocation of the plugin here because - Maven does not pickup the dependencies of checkstyle during - run of `mvn site` otherwise, see #23. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> @@ -523,20 +583,10 @@ <banRelease>true</banRelease> </requirePluginVersions> <requireMavenVersion> - <version>3.0.5</version> - <message>You need at least Maven 3.0.5 to build MojoHaus projects. Maven 2.X is not supported anymore.</message> + <version>3.2.5</version> + <message>You need at least Maven 3.2.5 to build MojoHaus projects.</message> </requireMavenVersion> <requireProperty> - <property>project.scm.developerConnection</property> - <!-- because Maven adds the artifactId to the SCM-Url automatically for modules in a multimodule project, - we need to allow stuff after .git. - --> - <regex>scm:git:ssh://[email protected]/.*\.git.*</regex> - <regexMessage> - ssh (scm:git:ssh://[email protected]/.*\.git) is the preferred protocol for project.scm.developerConnection, current value: ${project.scm.developerConnection} - </regexMessage> - </requireProperty> - <requireProperty> <property>project.scm.connection</property> <!-- because Maven adds the artifactId to the SCM-Url automatically for modules in a multimodule project, we need to allow stuff after .git. @@ -561,33 +611,42 @@ </execution> </executions> </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <!-- Apache plugins in alphabetical order --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> + <artifactId>maven-site-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>attach-descriptor</id> + <goals> + <goal>attach-descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <descriptors> + <descriptor>config-assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> </plugin> </plugins> - </reporting> + </build> <profiles> <profile> - <!-- - On travis-ci, the API rate limit for github reports is sometimes exceeded, - so only render this when not run on travis. - --> - <id>mojo-enable-githubreport-when-not-on-travis</id> - <activation> - <property> - <name>!env.CONTINUOUS_INTEGRATION</name> - </property> - </activation> - </profile> - <profile> <id>mojo-release</id> <build> <plugins> @@ -613,7 +672,6 @@ <descriptorRefs> <descriptorRef>source-release</descriptorRef> </descriptorRefs> - <tarLongFileFormat>gnu</tarLongFileFormat> </configuration> </execution> </executions> @@ -652,6 +710,34 @@ </execution> </executions> </plugin> + <!-- calculate checksums of source release for Apache dist area --> + <plugin> + <groupId>net.nicoulaj.maven.plugins</groupId> + <artifactId>checksum-maven-plugin</artifactId> + <version>1.11</version> + <executions> + <execution> + <id>source-release-checksum</id> + <goals> + <goal>artifacts</goal> + </goals> + <!-- execute prior to maven-gpg-plugin:sign due to https://github.com/nicoulaj/checksum-maven-plugin/issues/112 --> + <phase>post-integration-test</phase> + <configuration> + <algorithms> + <algorithm>SHA-512</algorithm> + </algorithms> + <!-- https://maven.apache.org/apache-resource-bundles/#source-release-assembly-descriptor --> + <includeClassifiers>source-release</includeClassifiers> + <excludeMainArtifact>true</excludeMainArtifact> + <csvSummary>false</csvSummary> + <!-- attach SHA-512 checksum as well to upload to Maven Staging Repo, + as this eases uploading from stage to dist and doesn't do harm in Maven Central --> + <attachChecksums>true</attachChecksums> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> @@ -683,10 +769,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>${maven-checkstyle-plugin.version}</version> - <configuration> - <configLocation>config/maven_checks.xml</configLocation> - <headerLocation>config/maven-header.txt</headerLocation> - </configuration> <reportSets> <reportSet> <reports> @@ -717,12 +799,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> + <version>${maven-jxr-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.14.0</version> + <version>${maven-pmd-plugin.version}</version> <configuration> <targetJdk>${mojo.java.target}</targetJdk> <excludeRoots> @@ -740,18 +826,18 @@ <reportSets> <reportSet> <reports> - <report>cim</report> + <report>ci-management</report> <report>dependencies</report> <report>dependency-convergence</report> <report>dependency-info</report> <report>dependency-management</report> <report>index</report> - <report>issue-tracking</report> - <report>license</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>licenses</report> + <report>mailing-lists</report> <report>plugin-management</report> - <report>project-team</report> <report>scm</report> + <report>team</report> <report>summary</report> </reports> </reportSet> @@ -760,11 +846,14 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.22.2</version> + <version>${maven-surefire-report-plugin.version}</version> + <configuration> + <alwaysGenerateSurefireReport>false</alwaysGenerateSurefireReport> + </configuration> <reportSets> <reportSet> <reports> - <report>report</report> + <report>report-only</report> </reports> </reportSet> </reportSets> @@ -773,7 +862,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> + <version>${taglist-maven-plugin.version}</version> </plugin> </plugins> </reporting> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/src/main/config/checkstyle/asf20-header.txt new/mojo-parent-mojo-parent-70/src/main/config/checkstyle/asf20-header.txt --- old/mojo-parent-mojo-parent-60/src/main/config/checkstyle/asf20-header.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/src/main/config/checkstyle/asf20-header.txt 2022-08-15 14:35:42.000000000 +0200 @@ -0,0 +1,17 @@ +^package + +^/\*$ +^ \* Copyright +^ \*$ +^ \* Licensed 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$ +^ \*$ +^ \* https?://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.$ +^ \*/$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/src/main/config/checkstyle/mit-header.txt new/mojo-parent-mojo-parent-70/src/main/config/checkstyle/mit-header.txt --- old/mojo-parent-mojo-parent-60/src/main/config/checkstyle/mit-header.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/src/main/config/checkstyle/mit-header.txt 2022-08-15 14:35:42.000000000 +0200 @@ -0,0 +1,25 @@ +^package + +^/\*$ +^ \* The MIT License$ +^ \*$ +^ \* Copyright +^ \*$ +^ \* Permission is hereby granted, free of charge, to any person obtaining a copy of$ +^ \* this software and associated documentation files (the "Software"), to deal in$ +^ \* the Software without restriction, including without limitation the rights to$ +^ \* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies$ +^ \* of the Software, and to permit persons to whom the Software is furnished to do$ +^ \* so, subject to the following conditions:$ +^ \*$ +^ \* The above copyright notice and this permission notice shall be included in all$ +^ \* copies or substantial portions of the Software.$ +^ \*$ +^ \* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR$ +^ \* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,$ +^ \* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE$ +^ \* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER$ +^ \* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,$ +^ \* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE$ +^ \* SOFTWARE. +^ \*/$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/src/site/markdown/index.md.vm new/mojo-parent-mojo-parent-70/src/site/markdown/index.md.vm --- old/mojo-parent-mojo-parent-60/src/site/markdown/index.md.vm 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/src/site/markdown/index.md.vm 2022-08-15 14:35:42.000000000 +0200 @@ -1,6 +1,6 @@ Parent POM for all MojoHaus hosted Apache Maven plugins and components. -Latest Travis-Build: [](https://travis-ci.org/mojohaus/mojo-parent) +Latest build status: [](https://github.com/mojohaus/mojo-parent/actions/workflows/maven.yml) Changelog --------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-60/src/site/site.xml new/mojo-parent-mojo-parent-70/src/site/site.xml --- old/mojo-parent-mojo-parent-60/src/site/site.xml 2020-12-24 00:02:13.000000000 +0100 +++ new/mojo-parent-mojo-parent-70/src/site/site.xml 2022-08-15 14:35:42.000000000 +0200 @@ -30,20 +30,22 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.9</version> + <version>${maven-fluido-skin.version}</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> - <googleSearch> - <sitesearch>www.mojohaus.org</sitesearch> - </googleSearch> - <ohloh> - <projectId>5211</projectId> - <widget>thin-badge</widget> - </ohloh> <gitHub> <projectId>mojohaus/${project.artifactId}</projectId> <ribbonOrientation>right</ribbonOrientation> @@ -60,6 +62,7 @@ <item name="MojoHaus" href="https://www.mojohaus.org/"/> <item name="${this.name}" href="${this.url}" /> </breadcrumbs> + <menu ref="reports" inherit="bottom" /> </body> </project>
