From dd744c98ec155649819292d3099540273e37727c Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 20 Jun 2022 00:39:37 +0200 Subject: [PATCH] Upgrade parent to 68 - upgrade parent - use configuration from parent --- README.md | 2 +- pom.xml | 44 ++++--------------- src/site/apt/banCircularDependencies.apt.vm | 2 +- src/site/apt/banDuplicateClasses.apt.vm | 2 +- src/site/apt/enforceBytecodeVersion.apt.vm | 2 +- src/site/apt/requireContributorRoles.apt.vm | 2 +- src/site/apt/requireDeveloperRoles.apt.vm | 2 +- src/site/apt/requireEncoding.apt.vm | 2 +- src/site/apt/requirePropertyDiverges.apt.vm | 2 +- src/site/apt/usage.apt.vm | 2 +- src/site/site.xml | 9 ++-- .../it/BanDuplicateClassesLogParser.java | 4 +- 12 files changed, 22 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 4c9e04e1..9b7fc0c6 100644 --- a/README.md +++ b/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) diff --git a/pom.xml b/pom.xml index 58c38834..eb0537a6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.codehaus.mojo mojo-parent - 67 + 68 extra-enforcer-rules @@ -15,50 +15,25 @@ Extra Enforcer Rules. These are extra rules for Apache Maven's Enforcer Plugin. + https://www.mojohaus.org/extra-enforcer-rules/ 2011 The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo - - GitHub - https://github.com/mojohaus/extra-enforcer-rules/issues - - scm:git:https://github.com/mojohaus/extra-enforcer-rules.git scm:git:ssh://git@github.com/mojohaus/extra-enforcer-rules.git - https://github.com/mojohaus/extra-enforcer-rules + https://github.com/mojohaus/extra-enforcer-rules/tree/master HEAD - - Travis - https://travis-ci.org/mojohaus/extra-enforcer-rules - - - - - ossrh-snapshots - default - ossrh-snapshots - - false - - - fail - true - - https://oss.sonatype.org/content/repositories/snapshots - - - Stephen Connolly @@ -79,10 +54,9 @@ - 3.1.0 - 3.0.0 + + 3.1.0 3.2.5 - target/staging/${project.artifactId} 2021-12-15T17:24:42Z @@ -100,7 +74,7 @@ org.apache.maven.enforcer enforcer-api - ${enforcerApiVersion} + ${maven-enforcer-plugin.version} org.apache.maven @@ -146,7 +120,6 @@ org.apache.maven.plugins maven-enforcer-plugin - ${enforcerPluginVersion} enforce-banned-dependencies @@ -174,7 +147,6 @@ ${project.build.directory}/it true - true src/it/settings.xml setup verify @@ -186,7 +158,7 @@ ${maven.compiler.target} - ${enforcerPluginVersion} + ${maven-enforcer-plugin.version} clean diff --git a/src/site/apt/banCircularDependencies.apt.vm b/src/site/apt/banCircularDependencies.apt.vm index 7f776841..88c5a3ab 100644 --- a/src/site/apt/banCircularDependencies.apt.vm +++ b/src/site/apt/banCircularDependencies.apt.vm @@ -41,7 +41,7 @@ Ban Circular Dependencies org.apache.maven.plugins maven-enforcer-plugin - ${enforcerApiVersion} + ${maven-enforcer-plugin.version} enforce-ban-circular-dependencies diff --git a/src/site/apt/banDuplicateClasses.apt.vm b/src/site/apt/banDuplicateClasses.apt.vm index 2319b01e..873384ac 100644 --- a/src/site/apt/banDuplicateClasses.apt.vm +++ b/src/site/apt/banDuplicateClasses.apt.vm @@ -55,7 +55,7 @@ Ban Duplicate Classes org.apache.maven.plugins maven-enforcer-plugin - ${enforcerApiVersion} + ${maven-enforcer-plugin.version} enforce-ban-duplicate-classes diff --git a/src/site/apt/enforceBytecodeVersion.apt.vm b/src/site/apt/enforceBytecodeVersion.apt.vm index d288404a..88281f42 100644 --- a/src/site/apt/enforceBytecodeVersion.apt.vm +++ b/src/site/apt/enforceBytecodeVersion.apt.vm @@ -58,7 +58,7 @@ Note org.apache.maven.plugins maven-enforcer-plugin - ${enforcerApiVersion} + ${maven-enforcer-plugin.version} enforce-bytecode-version diff --git a/src/site/apt/requireContributorRoles.apt.vm b/src/site/apt/requireContributorRoles.apt.vm index cda95fe6..88ba87f8 100644 --- a/src/site/apt/requireContributorRoles.apt.vm +++ b/src/site/apt/requireContributorRoles.apt.vm @@ -55,7 +55,7 @@ Require Contributor Roles org.apache.maven.plugins maven-enforcer-plugin - ${enforcerApiVersion} + ${maven-enforcer-plugin.version} enforce-require-roles diff --git a/src/site/apt/requireDeveloperRoles.apt.vm b/src/site/apt/requireDeveloperRoles.apt.vm index e00e2c85..df7c0e24 100644 --- a/src/site/apt/requireDeveloperRoles.apt.vm +++ b/src/site/apt/requireDeveloperRoles.apt.vm @@ -55,7 +55,7 @@ Require Developer Roles org.apache.maven.plugins maven-enforcer-plugin - ${enforcerApiVersion} + ${maven-enforcer-plugin.version} enforce-require-roles diff --git a/src/site/apt/requireEncoding.apt.vm b/src/site/apt/requireEncoding.apt.vm index d1d93f73..631df474 100644 --- a/src/site/apt/requireEncoding.apt.vm +++ b/src/site/apt/requireEncoding.apt.vm @@ -55,7 +55,7 @@ Require Encoding org.apache.maven.plugins maven-enforcer-plugin - ${enforcerApiVersion} + ${maven-enforcer-plugin.version} require-utf-8 diff --git a/src/site/apt/requirePropertyDiverges.apt.vm b/src/site/apt/requirePropertyDiverges.apt.vm index 2bb9d712..f6af0dfa 100644 --- a/src/site/apt/requirePropertyDiverges.apt.vm +++ b/src/site/apt/requirePropertyDiverges.apt.vm @@ -84,7 +84,7 @@ Require Property Diverges org.apache.maven.plugins maven-enforcer-plugin - ${enforcerApiVersion} + ${maven-enforcer-plugin.version} enforce-require-property-diverges diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm index 801b779d..5bc15fcb 100644 --- a/src/site/apt/usage.apt.vm +++ b/src/site/apt/usage.apt.vm @@ -37,7 +37,7 @@ Usage org.apache.maven.plugins maven-enforcer-plugin - 1.0 + ${maven-enforcer-plugin.version} ${project.groupId} diff --git a/src/site/site.xml b/src/site/site.xml index f2ec1eb6..364051aa 100644 --- a/src/site/site.xml +++ b/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. --> - - - org.apache.maven.skins - maven-fluido-skin - 1.10.0 - + + diff --git a/src/test/java/org/codehaus/mojo/extraenforcerrules/it/BanDuplicateClassesLogParser.java b/src/test/java/org/codehaus/mojo/extraenforcerrules/it/BanDuplicateClassesLogParser.java index fb12cdb1..710f78c6 100644 --- a/src/test/java/org/codehaus/mojo/extraenforcerrules/it/BanDuplicateClassesLogParser.java +++ b/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 readDuplicateClasses( BufferedReader reader ) } return classes; } -} \ No newline at end of file +}