diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index d283b2ae04..c75e585e23 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -28,7 +28,7 @@ jobs: with: jdk-matrix: '[ "8", "11", "17", "18-ea" ]' ff-jdk: '18-ea' - ff-goal: 'clean install site site:stage -nsu' + ff-goal: 'clean install site site:stage -P reporting -nsu' ff-site-goal: '-v' verify-goal: 'clean install -nsu -P run-its' verify-fail-fast: false diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 7d5c301367..eed7aeda98 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -151,6 +151,7 @@ org.codehaus.plexus plexus-component-metadata + 2.0.0 diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 1078a01025..570d81af09 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -105,8 +105,6 @@ single - true - site-source src/assembly/site-source.xml diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 67707bc4a8..53b0dca0e3 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -178,17 +178,6 @@ reporting - - org.codehaus.mojo - l10n-maven-plugin - 1.0-alpha-2 - - - de - sv - - - maven-changes-plugin diff --git a/pom.xml b/pom.xml index 40c562c890..ab43bbdef5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ maven-parent org.apache.maven - 34 + 35 org.apache.maven.surefire @@ -96,7 +96,6 @@ 3.3.4 2.0.9 - 3.6.2 0.8.7 ${project.version} scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git @@ -371,48 +370,22 @@ + org.apache.maven.plugins - maven-shade-plugin - 3.2.4 + maven-pmd-plugin + 3.16.0 + + + + org.codehaus.mojo + taglist-maven-plugin + 3.0.0 org.apache.maven.plugins maven-compiler-plugin - - - compile-generated - process-sources - - compile - - - - HelpMojo.java - **/HelpMojo.java - - - - -Xdoclint:none - - - - - default-compile - compile - - compile - - - - HelpMojo.java - **/HelpMojo.java - - - -Xdoclint:all - - - - + + 3.10.1 true @@ -458,10 +431,6 @@ - - maven-invoker-plugin - 3.2.2 - org.jacoco jacoco-maven-plugin @@ -489,18 +458,6 @@ - - maven-site-plugin - 3.10.0 - - - maven-javadoc-plugin - 3.3.1 - - - false - - @@ -544,59 +501,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - enforce-java - - enforce - - - - - [1.8, ) - - - - - - enforce-maven - - enforce - - - - - [3.1.0,) - - - - - - enforce-bytecode-version - - enforce - - - - - ${maven.compiler.target} - - org.junit.platform:junit-platform-commons - org.assertj:assertj-core - - - - - - - - true - - org.codehaus.mojo animal-sniffer-maven-plugin @@ -674,10 +578,21 @@ reporting + + org.apache.maven.plugins + maven-pmd-plugin + + + + cpd + pmd + + + + org.apache.maven.plugins maven-changes-plugin - 2.12.1 Type,Priority,Key,Summary,Resolution diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index e63e7dada2..11471de7ad 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -99,31 +99,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-bytecode-version - - enforce - - - - - ${maven.compiler.target} - - net.sourceforge.htmlunit:* - org.eclipse.jetty.websocket:* - org.eclipse.jetty:* - org.apache.commons:commons-text - - - - - - - maven-help-plugin