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-03-25 21:54:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mojo-parent (Old) and /work/SRC/openSUSE:Factory/.mojo-parent.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mojo-parent" Fri Mar 25 21:54:41 2022 rev:2 rq:964788 version:60 Changes: -------- --- /work/SRC/openSUSE:Factory/mojo-parent/mojo-parent.changes 2019-04-05 12:04:52.286600089 +0200 +++ /work/SRC/openSUSE:Factory/.mojo-parent.new.1900/mojo-parent.changes 2022-03-25 21:54:49.166286545 +0100 @@ -1,0 +2,6 @@ +Fri Mar 25 07:56:42 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 60 + * Compatible with newer plugins + +------------------------------------------------------------------- Old: ---- mojo-parent-40.tar.gz New: ---- mojo-parent-60.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mojo-parent.spec ++++++ --- /var/tmp/diff_new_pack.ar7H5u/_old 2022-03-25 21:54:49.858287203 +0100 +++ /var/tmp/diff_new_pack.ar7H5u/_new 2022-03-25 21:54:49.862287207 +0100 @@ -1,7 +1,7 @@ # # spec file for package mojo-parent # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: mojo-parent -Version: 40 +Version: 60 Release: 0 Summary: Codehaus MOJO parent project pom file License: Apache-2.0 Group: Development/Libraries/Java -URL: http://www.mojohaus.org/mojo-parent/ +URL: https://www.mojohaus.org/mojo-parent/ 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 @@ -33,8 +33,6 @@ %prep %setup -q -n %{name}-%{name}-%{version} -# Cobertura plugin is executed only during clean Maven phase. -%pom_remove_plugin :cobertura-maven-plugin # Not needed %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-site-plugin ++++++ mojo-parent-40.tar.gz -> mojo-parent-60.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-40/.github/dependabot.yml new/mojo-parent-mojo-parent-60/.github/dependabot.yml --- old/mojo-parent-mojo-parent-40/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/mojo-parent-mojo-parent-60/.github/dependabot.yml 2020-12-24 00:02:13.000000000 +0100 @@ -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/mojo-parent-mojo-parent-40/.github/release-drafter.yml new/mojo-parent-mojo-parent-60/.github/release-drafter.yml --- old/mojo-parent-mojo-parent-40/.github/release-drafter.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/mojo-parent-mojo-parent-60/.github/release-drafter.yml 2020-12-24 00:02:13.000000000 +0100 @@ -0,0 +1,2 @@ +_extends: .github +tag-template: mojo-parent-$NEXT_MINOR_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-40/.github/workflows/maven.yml new/mojo-parent-mojo-parent-60/.github/workflows/maven.yml --- old/mojo-parent-mojo-parent-40/.github/workflows/maven.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/mojo-parent-mojo-parent-60/.github/workflows/maven.yml 2020-12-24 00:02:13.000000000 +0100 @@ -0,0 +1,52 @@ +# 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: + + strategy: + matrix: + os: [ubuntu-latest] + java: [8] + fail-fast: false + + runs-on: ${{ matrix.os }} + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up cache for ~./m2/repository + uses: actions/cache@v2.1.3 + 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 }}- + + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + + - 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-40/.github/workflows/release-drafter.yml new/mojo-parent-mojo-parent-60/.github/workflows/release-drafter.yml --- old/mojo-parent-mojo-parent-40/.github/workflows/release-drafter.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/mojo-parent-mojo-parent-60/.github/workflows/release-drafter.yml 2020-12-24 00:02:13.000000000 +0100 @@ -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.12.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-40/.travis.yml new/mojo-parent-mojo-parent-60/.travis.yml --- old/mojo-parent-mojo-parent-40/.travis.yml 2016-07-01 15:26:02.000000000 +0200 +++ new/mojo-parent-mojo-parent-60/.travis.yml 2020-12-24 00:02:13.000000000 +0100 @@ -2,9 +2,11 @@ env: - MAVEN_VERSION=3.0.5 - MAVEN_VERSION=3.3.9 + - MAVEN_VERSION=3.5.4 + - MAVEN_VERSION=3.6.3 jdk: - - oraclejdk7 - - oraclejdk8 + - openjdk8 + - openjdk11 install: - "mvn -N io.takari:maven:wrapper -Dmaven=${MAVEN_VERSION}" - "./mvnw --show-version --errors --batch-mode validate dependency:go-offline" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-40/README.md new/mojo-parent-mojo-parent-60/README.md --- old/mojo-parent-mojo-parent-40/README.md 2016-07-01 15:26:02.000000000 +0200 +++ new/mojo-parent-mojo-parent-60/README.md 2020-12-24 00:02:13.000000000 +0100 @@ -1,8 +1,8 @@ # MojoHaus Parent -This is the parent pom for all [MojoHaus](http://www.mojohaus.org) Maven plugins and components. +This is the parent pom for all [MojoHaus](https://www.mojohaus.org) Maven plugins and components. -[](http://search.maven.org/#search%7Cga%7C1%7Cmojo-parent) +[](https://search.maven.org/search?q=g%3Aorg.codehaus.mojo+AND+a%3Amojo-parent) [](https://travis-ci.org/mojohaus/mojo-parent) ## Releasing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-40/pom.xml new/mojo-parent-mojo-parent-60/pom.xml --- old/mojo-parent-mojo-parent-40/pom.xml 2016-07-01 15:26:02.000000000 +0200 +++ new/mojo-parent-mojo-parent-60/pom.xml 2020-12-24 00:02:13.000000000 +0100 @@ -24,20 +24,20 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>mojo-parent</artifactId> - <version>40</version> + <version>60</version> <packaging>pom</packaging> <name>MojoHaus Parent</name> <description>Parent POM for all MojoHaus hosted Apache Maven plugins and components.</description> - <url>http://www.mojohaus.org/${project.artifactId}</url> + <url>https://www.mojohaus.org/${project.artifactId}</url> <organization> <name>MojoHaus</name> - <url>http://www.mojohaus.org</url> + <url>https://www.mojohaus.org</url> </organization> <licenses> <license> <name>The Apache Software 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> @@ -72,6 +72,13 @@ <organizationUrl>https://github.com/mojohaus</organizationUrl> </developer> <developer> + <id>hboutemy</id> + <name>Herv?? Boutemy</name> + <url>https://github.com/hboutemy</url> + <organization>MojoHaus</organization> + <organizationUrl>https://github.com/mojohaus</organizationUrl> + </developer> + <developer> <id>khmarbaise</id> <name>Karl-Heinz Marbaise</name> <url>https://github.com/khmarbaise</url> @@ -92,6 +99,20 @@ <organization>MojoHaus</organization> <organizationUrl>https://github.com/mojohaus</organizationUrl> </developer> + <developer> + <id>andham</id> + <name>Anders Hammar</name> + <url>https://github.com/andham</url> + <organization>MojoHaus</organization> + <organizationUrl>https://github.com/mojohaus</organizationUrl> + </developer> + <developer> + <id>olamy</id> + <name>Olivier Lamy</name> + <url>https://github.com/olamy</url> + <organization>MojoHaus</organization> + <organizationUrl>https://github.com/mojohaus</organizationUrl> + </developer> </developers> <mailingLists> @@ -103,55 +124,50 @@ <archive>https://groups.google.com/forum/#!forum/mojohaus-dev</archive> </mailingList> <mailingList> - <name>Maven Users List</name> - <subscribe>users-subscr...@maven.apache.org</subscribe> - <unsubscribe>users-unsubscr...@maven.apache.org</unsubscribe> - <post>us...@maven.apache.org</post> - <archive>http://mail-archives.apache.org/mod_mbox/maven-users/</archive> + <name>Maven User List</name> + <subscribe>mailto:users-subscr...@maven.apache.org</subscribe> + <unsubscribe>mailto:users-unsubscr...@maven.apache.org</unsubscribe> + <post>mailto:us...@maven.apache.org</post> + <archive>https://lists.apache.org/list.html?us...@maven.apache.org</archive> <otherArchives> + <otherArchive>https://mail-archives.apache.org/mod_mbox/maven-users</otherArchive> + <otherArchive>https://www.mail-archive.com/users@maven.apache.org/</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>http://markmail.org/list/org.codehaus.mojo.dev</archive> + <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>http://markmail.org/list/org.codehaus.mojo.user</archive> + <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> - <archive>http://markmail.org/list/org.codehaus.mojo.scm</archive> + <archive>https://markmail.org/list/org.codehaus.mojo.scm</archive> </mailingList> <mailingList> <name>Former (pre-2015-06) Announcements List</name> - <archive>http://markmail.org/list/org.codehaus.mojo.announce</archive> + <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> - <!-- This has NO effect on mojo-projects using this parent. - This just mean that you need maven 3.0 to build the mojo-parent - However some of the plugins defined herein have a a prerequisite of - Maven 3.0, so better use at least Maven 3.0.5 - --> - <prerequisites> - <maven>3.0</maven> - </prerequisites> <scm> <connection>scm:git:https://github.com/mojohaus/mojo-parent.git</connection> <developerConnection>scm:git:ssh://g...@github.com/mojohaus/mojo-parent.git</developerConnection> - <url>https://github.com/mojohaus/mojo-parent</url> - <tag>mojo-parent-40</tag> + <url>https://github.com/mojohaus/mojo-parent/tree/${project.scm.tag}</url> + <tag>mojo-parent-60</tag> </scm> <issueManagement> <system>github</system> @@ -164,11 +180,11 @@ <distributionManagement> <repository> <id>ossrh-staging</id> - <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url> + <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url> </repository> <snapshotRepository> <id>ossrh-snapshots</id> - <url>http://oss.sonatype.org/content/repositories/snapshots</url> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> </snapshotRepository> <site> <id>github</id> @@ -185,11 +201,12 @@ <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>2.10.4</maven-javadoc-plugin.version> - <maven-changes-plugin.version>2.11</maven-changes-plugin.version> + <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version> <localCheckout>true</localCheckout> - <maven-checkstyle-plugin.version>2.16</maven-checkstyle-plugin.version> + <!-- 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> </properties> <repositories> @@ -204,7 +221,7 @@ <checksumPolicy>fail</checksumPolicy> <enabled>true</enabled> </snapshots> - <url>http://oss.sonatype.org/content/repositories/snapshots</url> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> </repository> </repositories> @@ -218,14 +235,14 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.13.1</version> <scope>test</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.4</version> + <version>3.6.0</version> </dependency> </dependencies> </dependencyManagement> @@ -237,12 +254,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> + <version>3.0.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> + <version>3.3.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -263,12 +280,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>3.0.0</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>3.8.1</version> <configuration> <source>${mojo.java.target}</source> <target>${mojo.java.target}</target> @@ -276,19 +293,8 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <version>${maven-changes-plugin.version}</version> - <configuration> - <issueManagementSystems> - <issueManagementSystem>GitHub</issueManagementSystem> - </issueManagementSystems> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.1.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -303,7 +309,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-help-plugin</artifactId> - <version>2.2</version> + <version>3.2.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -318,22 +324,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <version>2.0.0</version> + <version>3.2.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> + <version>3.2.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> + <version>3.3.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <version>2.10.1</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -348,7 +354,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.4</version> + <version>3.6.0</version> <executions> <execution> <id>help-mojo</id> @@ -366,7 +372,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> + <version>3.0.0-M1</version> <configuration> <!-- do not deploy site but use instructions in README.md --> <mavenExecutorId>forked-path</mavenExecutorId> @@ -378,12 +384,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>3.0.1</version> + <version>3.2.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> + <version>3.0.0</version> <configuration> <pubScmUrl>${project.scm.developerConnection}</pubScmUrl> <scmBranch>gh-pages</scmBranch> @@ -402,7 +408,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.5.1</version> + <version>3.8.2</version> <configuration> <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin --> </configuration> @@ -410,12 +416,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.0.1</version> + <version>3.2.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.22.2</version> <configuration> <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile> </configuration> @@ -423,28 +429,23 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.19.1</version> + <version>2.22.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.19.1</version> + <version>2.22.2</version> </plugin> <!-- Codehaus plugins in alphabetical order --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.7</version> + <version>1.17</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>flatten-maven-plugin</artifactId> - <version>1.0.0-beta-5</version> + <version>1.2.5</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -457,9 +458,14 @@ <version>1.9</version> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>mrm-maven-plugin</artifactId> + <version>1.2.0</version> + </plugin> + <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> + <artifactId>plexus-component-metadata</artifactId> + <version>2.1.0</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -469,7 +475,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> - <version>2.2</version> + <version>2.8.1</version> </plugin> </plugins> </pluginManagement> @@ -517,12 +523,12 @@ <banRelease>true</banRelease> </requirePluginVersions> <requireMavenVersion> - <version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version> - <message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.</message> + <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> </requireMavenVersion> <requireProperty> <property>project.scm.developerConnection</property> - <!-- because Maven adds the artifactId to the the SCM-Url automatically for modules in a multimodule project, + <!-- 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://g...@github.com/.*\.git.*</regex> @@ -532,7 +538,7 @@ </requireProperty> <requireProperty> <property>project.scm.connection</property> - <!-- because Maven adds the artifactId to the the SCM-Url automatically for modules in a multimodule project, + <!-- 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:https://github.com/.*\.git.*</regex> @@ -542,7 +548,7 @@ </requireProperty> <requireProperty> <property>project.scm.url</property> - <!-- because Maven adds the artifactId to the the SCM-Url automatically for modules in a multimodule project, + <!-- because Maven adds the artifactId to the SCM-Url automatically for modules in a multimodule project, we need to allow stuff after .git. --> <regex>https://github.com/.*</regex> @@ -564,16 +570,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.4</version> - <configuration> - <requirements> - <!-- - NOTE: Maven 2.x does not interpolate properties of the form project.*|pom.* so the Maven Plugin Plugin - gets garbage when manually examining the config of the Maven Compiler Plugin. - --> - <jdk>${mojo.java.target}</jdk> - </requirements> - </configuration> </plugin> </plugins> </reporting> @@ -590,27 +586,6 @@ <name>!env.CONTINUOUS_INTEGRATION</name> </property> </activation> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <version>${maven-changes-plugin.version}</version> - <reportSets> - <reportSet> - <reports> - <report>github-report</report> - </reports> - </reportSet> - </reportSets> - <configuration> - <includeOpenIssues>false</includeOpenIssues> - <onlyMilestoneIssues>true</onlyMilestoneIssues> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - </configuration> - </plugin> - </plugins> - </reporting> </profile> <profile> <id>mojo-release</id> @@ -623,7 +598,7 @@ <dependency> <groupId>org.apache.apache.resources</groupId> <artifactId>apache-source-release-assembly-descriptor</artifactId> - <version>1.0.4</version> + <version>1.0.6</version> </dependency> </dependencies> <executions> @@ -727,26 +702,14 @@ <configuration> <quiet>true</quiet> <links> - <link>http://junit-team.github.io/junit/javadoc/latest/</link> + <link>https://junit.org/junit4/javadoc/latest/</link> </links> - <tagletArtifacts> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>3.4</version> - </tagletArtifact> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc</artifactId> - <version>1.5.5</version> - </tagletArtifact> - </tagletArtifacts> </configuration> <reportSets> <reportSet> <reports> - <report>javadoc</report> - <report>test-javadoc</report> + <report>javadoc-no-fork</report> + <report>test-javadoc-no-fork</report> </reports> </reportSet> </reportSets> @@ -759,7 +722,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.5</version> + <version>3.14.0</version> <configuration> <targetJdk>${mojo.java.target}</targetJdk> <excludeRoots> @@ -797,7 +760,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.19.1</version> + <version>2.22.2</version> <reportSets> <reportSet> <reports> @@ -809,71 +772,11 @@ <!-- Codehaus plugins in alphabetical order --> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.6</version> - <configuration> - <instrumentation> - <excludes> - <exclude>**/HelpMojo.class</exclude> - </excludes> - </instrumentation> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> <version>2.4</version> </plugin> </plugins> </reporting> </profile> - <profile> - <id>maven-3</id> - <activation> - <file> - <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) --> - <exists>${basedir}</exists> - </file> - </activation> - <build> - <plugins> - <!-- if releasing current pom with maven 3 site descriptor must be attached --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>attach-descriptor</id> - <goals> - <goal>attach-descriptor</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>codecoverage</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-40/src/site/markdown/index.md.vm new/mojo-parent-mojo-parent-60/src/site/markdown/index.md.vm --- old/mojo-parent-mojo-parent-40/src/site/markdown/index.md.vm 2016-07-01 15:26:02.000000000 +0200 +++ new/mojo-parent-mojo-parent-60/src/site/markdown/index.md.vm 2020-12-24 00:02:13.000000000 +0100 @@ -4,7 +4,8 @@ Changelog --------- -http://www.mojohaus.org/mojo-parent/github-report.html + +[GitHub report](https://github.com/mojohaus/mojo-parent/releases/tag/${project.scm.tag}) How to use the POM ------------------ @@ -32,16 +33,15 @@ Latest releases --------------- -... may be found at [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.mojo%22%20AND%20a%3A%22mojo-parent%22%20AND%20p%3A%22pom%22 -). +... may be found at [Maven Central](https://search.maven.org/search?q=g%3Aorg.codehaus.mojo%20AND%20a%3Amojo-parent%20AND%20p%3Apom). Deploy site to github --------------------- -To deploy a site to github using [maven-scm-publish-plugin](http://maven.apache.org/plugins/maven-scm-publish-plugin/): +To deploy a site to github using [maven-scm-publish-plugin](https://maven.apache.org/plugins/maven-scm-publish-plugin/): * Add a new branch `gh-pages` [manually](https://help.github.com/articles/creating-project-pages-manually). -* Add `src/site/resources/.nojekyll` [to add hidden files (e.g. for jacoco)](http://illegalstateexception.blogspot.de/2013/01/publishing-maven-site-having-jacoco.html) as well. +* Add `src/site/resources/.nojekyll` [to add hidden files (e.g. for jacoco)](https://illegalstateexception.blogspot.de/2013/01/publishing-maven-site-having-jacoco.html) as well. * Then after a release do: ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mojo-parent-mojo-parent-40/src/site/site.xml new/mojo-parent-mojo-parent-60/src/site/site.xml --- old/mojo-parent-mojo-parent-40/src/site/site.xml 2016-07-01 15:26:02.000000000 +0200 +++ new/mojo-parent-mojo-parent-60/src/site/site.xml 2020-12-24 00:02:13.000000000 +0100 @@ -16,11 +16,12 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/DECORATION/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd";> +<project xmlns="http://maven.apache.org/DECORATION/1.8.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd";> <bannerLeft> <name>MojoHaus</name> - <src>http://www.mojohaus.org/images/mojo_logo.png</src> - <href>http://www.mojohaus.org/</href> + <src>https://www.mojohaus.org/images/mojo_logo.png</src> + <href>https://www.mojohaus.org/</href> </bannerLeft> <publishDate format="yyyy-MM-dd" position="right" /> @@ -29,9 +30,11 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.5</version> + <version>1.9</version> </skin> + <edit>${project.scm.url}</edit> + <custom> <fluidoSkin> <googleSearch> @@ -42,7 +45,7 @@ <widget>thin-badge</widget> </ohloh> <gitHub> - <projectId>mojohaus/${this.artifactId}</projectId> + <projectId>mojohaus/${project.artifactId}</projectId> <ribbonOrientation>right</ribbonOrientation> <ribbonColor>gray</ribbonColor> </gitHub> @@ -51,10 +54,10 @@ <body> <links> - <item name="Maven" href="http://maven.apache.org/"/> + <item name="Maven" href="https://maven.apache.org/"/> </links> <breadcrumbs> - <item name="MojoHaus" href="http://www.mojohaus.org/"/> + <item name="MojoHaus" href="https://www.mojohaus.org/"/> <item name="${this.name}" href="${this.url}" /> </breadcrumbs> <menu ref="reports" inherit="bottom" />
