You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/03/24 06:10:47 UTC
[maven-surefire] branch master updated: [SUREFIRE-2038] Upgrade Maven Parent to 35
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 4d7ebc7 [SUREFIRE-2038] Upgrade Maven Parent to 35
4d7ebc7 is described below
commit 4d7ebc7917f4067a76409bdc791c711aa730c234
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu Mar 17 22:26:11 2022 +0100
[SUREFIRE-2038] Upgrade Maven Parent to 35
---
.github/workflows/maven-verify.yml | 2 +-
maven-surefire-common/pom.xml | 1 +
maven-surefire-plugin/pom.xml | 2 -
maven-surefire-report-plugin/pom.xml | 11 ---
pom.xml | 133 +++++++----------------------------
surefire-its/pom.xml | 25 -------
6 files changed, 26 insertions(+), 148 deletions(-)
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index d283b2a..c75e585 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 7d5c301..eed7aed 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -151,6 +151,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
+ <version>2.0.0</version>
<executions>
<execution>
<goals>
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 1078a01..570d81a 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -105,8 +105,6 @@
<goal>single</goal>
</goals>
<configuration>
- <attach>true</attach>
- <classifier>site-source</classifier>
<descriptors>
<descriptor>src/assembly/site-source.xml</descriptor>
</descriptors>
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 67707bc..53b0dca 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -179,17 +179,6 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>l10n-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <configuration>
- <locales>
- <locale>de</locale>
- <locale>sv</locale>
- </locales>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-changes-plugin</artifactId>
<configuration>
<skip>false</skip>
diff --git a/pom.xml b/pom.xml
index 40c562c..ab43bbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>34</version>
+ <version>35</version>
</parent>
<groupId>org.apache.maven.surefire</groupId>
@@ -96,7 +96,6 @@
<!-- maven-shared-utils:3.3.4 uses org.fusesource.jansi:jansi:2.2.0 -->
<mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
<powermockVersion>2.0.9</powermockVersion>
- <mavenPluginToolsVersion>3.6.2</mavenPluginToolsVersion>
<jacocoVersion>0.8.7</jacocoVersion>
<surefire-shared-utils.version>${project.version}</surefire-shared-utils.version>
<maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
@@ -371,48 +370,22 @@
<pluginManagement>
<plugins>
<plugin>
+ <!-- TODO remove with next parent -->
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version><!-- TODO remove when upgrading parent to 35 -->
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.16.0</version>
+ </plugin>
+ <plugin>
+ <!-- TODO remove with next parent -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>compile-generated</id>
- <phase>process-sources</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <includes>
- <include>HelpMojo.java</include>
- <include>**/HelpMojo.java</include>
- </includes>
- <compilerArgs>
- <!-- FIXME: maven-plugin-plugin therefore used -syntax or none due to HelpMojo -->
- <arg>-Xdoclint:none</arg>
- </compilerArgs>
- </configuration>
- </execution>
- <execution>
- <id>default-compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>HelpMojo.java</exclude>
- <exclude>**/HelpMojo.java</exclude>
- </excludes>
- <compilerArgs>
- <arg>-Xdoclint:all</arg>
- </compilerArgs>
- </configuration>
- </execution>
- </executions>
+ <!-- TODO version remove with next parent -->
+ <version>3.10.1</version>
<configuration>
<fork>true</fork>
<compilerArgs>
@@ -459,10 +432,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.2</version>
- </plugin>
- <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacocoVersion}</version>
@@ -489,18 +458,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.10.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.1</version>
- <configuration>
- <!-- TODO remove when upgrading parent to 35 - MPOM-280 -->
- <detectLinks>false</detectLinks>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -545,59 +502,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.8, )</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- <execution>
- <id>enforce-maven</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[3.1.0,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- <execution>
- <id>enforce-bytecode-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
- <excludes>
- <exclude>org.junit.platform:junit-platform-commons</exclude>
- <exclude>org.assertj:assertj-core</exclude>
- </excludes>
- </enforceBytecodeVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <fail>true</fail>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<executions>
@@ -676,8 +580,19 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>cpd</report>
+ <report>pmd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.12.1</version>
<configuration>
<!-- For JIRA-report -->
<columnNames>Type,Priority,Key,Summary,Resolution</columnNames>
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index e63e7da..11471de 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -100,31 +100,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration combine.self="append">
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
- <excludes>
- <exclude>net.sourceforge.htmlunit:*</exclude>
- <exclude>org.eclipse.jetty.websocket:*</exclude>
- <exclude>org.eclipse.jetty:*</exclude>
- <exclude>org.apache.commons:commons-text</exclude>
- </excludes>
- </enforceBytecodeVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-help-plugin</artifactId>
<executions>
<execution>