Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SUREFIRE-2038] Upgrade Maven Parent to 35 #491

Merged
merged 1 commit into from Mar 24, 2022
Merged

[SUREFIRE-2038] Upgrade Maven Parent to 35 #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven-verify.yml
View file
Open in desktop
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions maven-surefire-common/pom.xml
View file
Open in desktop
Expand Up @@ -151,6 +151,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>2.0.0</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 0 additions & 2 deletions maven-surefire-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions maven-surefire-report-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -178,17 +178,6 @@
<id>reporting</id>
<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>
Expand Down
133 changes: 24 additions & 109 deletions pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slawekjaranowski
I do not know why you have removed this part. The main purpose was <arg>-Xdoclint:all</arg> and we bypass the issue with generated classes HelpMojo.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<arg>-Xdoclint:all</arg> still is in configuration line: 392

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HelpMojo now has correct javadocs - we needn't exclude for it

<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>
Expand Down Expand Up @@ -458,10 +431,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -544,59 +501,6 @@
</execution>
</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>
Expand Down Expand Up @@ -674,10 +578,21 @@
<id>reporting</id>
<reporting>
<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>
Expand Down
25 changes: 0 additions & 25 deletions surefire-its/pom.xml
View file
Open in desktop
Expand Up @@ -99,31 +99,6 @@
</resource>
</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>
Expand Down