Upgrade parent to 68

README.md

@@ -4,4 +4,4 @@
 
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/mojohaus/extra-enforcer-rules.svg?label=License)](http://www.apache.org/licenses/)
 [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.mojo/extra-enforcer-rules.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.mojo/extra-enforcer-rules)
-![Build Status](https://github.com/mojohaus/extra-enforcer-rules/actions/workflows/maven.yml/badge.svg)
+[![GitHub CI](https://github.com/mojohaus/extra-enforcer-rules/actions/workflows/maven.yml/badge.svg)](https://github.com/mojohaus/extra-enforcer-rules/actions/workflows/maven.yml)

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.mojo</groupId>
     <artifactId>mojo-parent</artifactId>
-    <version>67</version>
+    <version>68</version>
   </parent>
 
   <artifactId>extra-enforcer-rules</artifactId>
@@ -15,50 +15,25 @@
   <description>
     Extra Enforcer Rules. These are extra rules for Apache Maven's Enforcer Plugin.
   </description>
+  <url>https://www.mojohaus.org/extra-enforcer-rules/</url>
 
   <inceptionYear>2011</inceptionYear>
 
   <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>
 
-  <issueManagement>
-    <system>GitHub</system>
-    <url>https://github.com/mojohaus/extra-enforcer-rules/issues</url>
-  </issueManagement>
-
   <scm>
     <connection>scm:git:https://github.com/mojohaus/extra-enforcer-rules.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mojohaus/extra-enforcer-rules.git</developerConnection>
-    <url>https://github.com/mojohaus/extra-enforcer-rules</url>
+    <url>https://github.com/mojohaus/extra-enforcer-rules/tree/master</url>
     <tag>HEAD</tag>
   </scm>
 
-  <ciManagement>
-    <system>Travis</system>
-    <url>https://travis-ci.org/mojohaus/extra-enforcer-rules</url>
-  </ciManagement>
-
-  <repositories>
-    <repository>
-      <id>ossrh-snapshots</id>
-      <layout>default</layout>
-      <name>ossrh-snapshots</name>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <checksumPolicy>fail</checksumPolicy>
-        <enabled>true</enabled>
-      </snapshots>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </repository>
-  </repositories>
-
   <developers>
     <developer>
       <name>Stephen Connolly</name>
@@ -79,10 +54,9 @@
   </developers>
 
   <properties>
-    <enforcerApiVersion>3.1.0</enforcerApiVersion>
-    <enforcerPluginVersion>3.0.0</enforcerPluginVersion>
+    <!-- override from parent pom, here we need more control -->
+    <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
     <maven.version>3.2.5</maven.version>
-    <scmpublish.content>target/staging/${project.artifactId}</scmpublish.content>
     <project.build.outputTimestamp>2021-12-15T17:24:42Z</project.build.outputTimestamp>
   </properties>
 
@@ -100,7 +74,7 @@
     <dependency>
       <groupId>org.apache.maven.enforcer</groupId>
       <artifactId>enforcer-api</artifactId>
-      <version>${enforcerApiVersion}</version>
+      <version>${maven-enforcer-plugin.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -146,7 +120,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcerPluginVersion}</version>
         <executions>
           <execution>
             <id>enforce-banned-dependencies</id>
@@ -174,7 +147,6 @@
         <configuration>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <showErrors>true</showErrors>
-          <streamLogs>true</streamLogs>
           <settingsFile>src/it/settings.xml</settingsFile>
           <preBuildHookScript>setup</preBuildHookScript>
           <postBuildHookScript>verify</postBuildHookScript>
@@ -186,7 +158,7 @@
             <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
           </properties>
           <filterProperties>
-            <enforcerPluginVersion>${enforcerPluginVersion}</enforcerPluginVersion>
+            <enforcerPluginVersion>${maven-enforcer-plugin.version}</enforcerPluginVersion>
           </filterProperties>
           <goals>
             <goal>clean</goal>

src/site/apt/banCircularDependencies.apt.vm

@@ -41,7 +41,7 @@ Ban Circular Dependencies
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcerApiVersion}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
+        <version>${maven-enforcer-plugin.version}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
         <executions>
           <execution>
             <id>enforce-ban-circular-dependencies</id>

src/site/apt/banDuplicateClasses.apt.vm

@@ -55,7 +55,7 @@ Ban Duplicate Classes
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcerApiVersion}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
+        <version>${maven-enforcer-plugin.version}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
         <executions>
           <execution>
             <id>enforce-ban-duplicate-classes</id>

src/site/apt/enforceBytecodeVersion.apt.vm

@@ -58,7 +58,7 @@ Note
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcerApiVersion}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
+        <version>${maven-enforcer-plugin.version}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
         <executions>
           <execution>
             <id>enforce-bytecode-version</id>

src/site/apt/requireContributorRoles.apt.vm

@@ -55,7 +55,7 @@ Require Contributor Roles
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcerApiVersion}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
+        <version>${maven-enforcer-plugin.version}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
         <executions>
           <execution>
             <id>enforce-require-roles</id>

src/site/apt/requireDeveloperRoles.apt.vm

@@ -55,7 +55,7 @@ Require Developer Roles
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcerApiVersion}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
+        <version>${maven-enforcer-plugin.version}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
         <executions>
           <execution>
             <id>enforce-require-roles</id>

src/site/apt/requireEncoding.apt.vm

@@ -55,7 +55,7 @@ Require Encoding
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcerApiVersion}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
+        <version>${maven-enforcer-plugin.version}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
         <executions>
           <execution>
             <id>require-utf-8</id>

src/site/apt/requirePropertyDiverges.apt.vm

@@ -84,7 +84,7 @@ Require Property Diverges
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcerApiVersion}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
+        <version>${maven-enforcer-plugin.version}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
         <executions>
           <execution>
             <id>enforce-require-property-diverges</id>

src/site/apt/usage.apt.vm

@@ -37,7 +37,7 @@ Usage
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.0</version>
+          <version>${maven-enforcer-plugin.version}</version> <!-- find the latest version at http://maven.apache.org/plugins/maven-enforcer-plugin/ -->
           <dependencies>
             <dependency>
               <groupId>${project.groupId}</groupId>

src/site/site.xml

@@ -17,18 +17,15 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project>
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.10.0</version>
-  </skin>
+<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">
   <body>
     <menu name="Overview">
       <item name="Introduction" href="index.html"/>
       <item name="Usage" href="usage.html"/>
       <item name="FAQ" href="faq.html"/>
     </menu>
+
     <menu name="Rules">
       <item name="Ban Duplicate Classes" href="banDuplicateClasses.html"/>
       <item name="Require Property Diverges" href="requirePropertyDiverges.html"/>

src/test/java/org/codehaus/mojo/extraenforcerrules/it/BanDuplicateClassesLogParser.java

@@ -34,7 +34,7 @@
 public class BanDuplicateClassesLogParser
 {
     private static final String DUPLICATE_START_LINE =
-        "[WARNING] Rule 0: org.apache.maven.plugins.enforcer.BanDuplicateClasses failed with message:";
+        "[ERROR] Rule 0: org.apache.maven.plugins.enforcer.BanDuplicateClasses failed with message:";
 
     private final File logFile;
 
@@ -104,4 +104,4 @@ private static Set<String> readDuplicateClasses( BufferedReader reader )
         }
         return classes;
     }
-}
+}