You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/05/09 22:03:18 UTC
[maven-plugin-tools] 02/08: [MPLUGIN-468] Upgrade plugins and components (in ITs)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch fixes
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 69391f92b1f0354c2a9ab05345b41c74606813db
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue May 9 22:38:39 2023 +0200
[MPLUGIN-468] Upgrade plugins and components (in ITs)
---
.../annotation-with-inheritance-from-deps/pom.xml | 6 +-
.../it/annotation-with-inheritance-reactor/pom.xml | 2 +-
.../src/it/annotation-with-inheritance/pom.xml | 6 +-
.../expected-help.txt | 4 +-
.../invoker.properties | 6 +-
.../help-basic-deprecated-annotation-only/pom.xml | 4 +-
.../verify.groovy | 2 +-
.../src/it/help-basic-jdk11/pom.xml | 2 +-
maven-plugin-plugin/src/it/help-basic/pom.xml | 2 +-
maven-plugin-plugin/src/it/help-package/pom.xml | 2 +-
.../src/it/java-basic-annotations-jdk8/pom.xml | 6 +-
.../it/java-basic-annotations-jdkcurrent/pom.xml | 6 +-
.../src/it/java-basic-annotations/pom.xml | 6 +-
maven-plugin-plugin/src/it/mplugin-223/pom.xml | 2 +-
.../src/it/mplugin-272_java8/pom.xml | 2 +-
.../src/it/mplugin-299_no-configuration/pom.xml | 2 +-
.../it/mplugin-305_defaultMojoDependencies/pom.xml | 2 +-
.../it/mplugin-305_emptyMojoDependencies/pom.xml | 2 +-
.../it/mplugin-305_singleMojoDependencies/pom.xml | 4 +-
.../plugins/plugin/it/CustomSurefireMojo.java | 97 +++++++++++++++++++---
.../verify.groovy | 2 +-
.../src/it/mplugin-324_javadoc/pom.xml | 4 +-
.../src/it/mplugin-363_help-reproducible/pom.xml | 4 +-
.../it/mplugin-370-maven-deps-scope-bad/pom.xml | 2 +-
.../it/mplugin-370-maven-deps-scope-good/pom.xml | 4 +-
.../pom.xml | 6 +-
.../pom.xml | 2 +-
maven-plugin-plugin/src/it/mplugin-390/pom.xml | 4 +-
maven-plugin-plugin/src/it/packaging-jar/pom.xml | 2 +-
maven-plugin-plugin/src/it/v4api/pom.xml | 2 +-
.../src/it/fix-maven-since-3.x/pom.xml | 2 +-
.../src/it/mplugin-191/pom.xml | 4 +-
.../src/it/mplugin-319_report-since/pom.xml | 2 +-
.../src/it/mplugin-394_report-encoding/pom.xml | 2 +-
.../src/it/plugin-info-jdk-default-version/pom.xml | 2 +-
.../src/it/plugin-info-jdk/pom.xml | 2 +-
.../src/it/plugin-report-annotations/pom.xml | 4 +-
.../it/plugin-report-requirements-history/pom.xml | 2 +-
.../it/plugin-report-with-javadoc-links/pom.xml | 8 +-
.../src/it/plugin-report/pom.xml | 4 +-
pom.xml | 12 +--
41 files changed, 159 insertions(+), 82 deletions(-)
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
index e5836c05..c3d9fd3a 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
@@ -29,8 +29,8 @@ under the License.
<name>Maven Integration Test :: annotation-with-inheritance-from-deps</name>
<description>
- Test plugin-plugin, which tests maven-plugin-tools-api and
- maven-plugin-tools-java. This will generate a plugin descriptor from
+ Test plugin-plugin, which tests maven-plugin-tools-api and
+ maven-plugin-tools-java. This will generate a plugin descriptor from
java-based mojo sources, install the plugin, and then use it.
</description>
@@ -80,7 +80,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
index d2f6b8bc..d47d1546 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
@@ -84,7 +84,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
index b00ab7d5..e8a0f585 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
@@ -29,8 +29,8 @@ under the License.
<name>Maven Integration Test :: annotation-with-inheritance</name>
<description>
- Test plugin-plugin, which tests maven-plugin-tools-api and
- maven-plugin-tools-java. This will generate a plugin descriptor from
+ Test plugin-plugin, which tests maven-plugin-tools-api and
+ maven-plugin-tools-java. This will generate a plugin descriptor from
java-based mojo sources, install the plugin, and then use it.
</description>
@@ -76,7 +76,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt
index e7b0693d..cfb75851 100644
--- a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt
+++ b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/expected-help.txt
@@ -1,7 +1,7 @@
-[INFO] help 1.0-SNAPSHOT
+[INFO] help-deprecated-annotation-only 1.0-SNAPSHOT
Tests generation and compilation of the help mojo.
-help:test
+help-deprecated-annotation-only:test
Deprecated. No reason given
MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some important
diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/invoker.properties b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/invoker.properties
index e7b0b4d6..8920e947 100644
--- a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/invoker.properties
+++ b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/invoker.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,4 +16,4 @@
# under the License.
invoker.goals.1 = clean install
-invoker.goals.2 = --log-file help.log org.apache.maven.its.plugin:help:1.0-SNAPSHOT:help
+invoker.goals.2 = --log-file help.log org.apache.maven.its.plugin:help-deprecated-annotation-only:1.0-SNAPSHOT:help
diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
index 97ae7060..cb3004a7 100644
--- a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
@@ -23,7 +23,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.plugin</groupId>
- <artifactId>help</artifactId>
+ <artifactId>help-deprecated-annotation-only</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
@@ -56,7 +56,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/verify.groovy b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/verify.groovy
index 219231bd..613385af 100644
--- a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/verify.groovy
+++ b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/verify.groovy
@@ -20,7 +20,7 @@
expected = new File( basedir, "expected-help.txt" ).text.trim().replace( "\r", "" )
log = new File( basedir, "help.log" ).text.replace( "\r", "" )
-log = log.substring( log.indexOf( "[INFO] help 1.0-SNAPSHOT" ) )
+log = log.substring( log.indexOf( "[INFO] help-deprecated-annotation-only 1.0-SNAPSHOT" ) )
log = log.substring( 0, log.indexOf( "[INFO]", 5 ) ).trim()
assert log == expected
diff --git a/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml b/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
index 65c20966..a8f72562 100644
--- a/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>11</source>
<target>11</target>
diff --git a/maven-plugin-plugin/src/it/help-basic/pom.xml b/maven-plugin-plugin/src/it/help-basic/pom.xml
index 73e4ce49..016730e1 100644
--- a/maven-plugin-plugin/src/it/help-basic/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/help-package/pom.xml b/maven-plugin-plugin/src/it/help-package/pom.xml
index 81f0376f..d5314d9d 100644
--- a/maven-plugin-plugin/src/it/help-package/pom.xml
+++ b/maven-plugin-plugin/src/it/help-package/pom.xml
@@ -50,7 +50,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
index dda14a8a..eae3d7e0 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
@@ -29,8 +29,8 @@ under the License.
<name>Maven Integration Test :: basic-java-annotations-jdk8</name>
<description>
- Test plugin-plugin, which tests maven-plugin-tools-api and
- maven-plugin-tools-java. This will generate a plugin descriptor from
+ Test plugin-plugin, which tests maven-plugin-tools-api and
+ maven-plugin-tools-java. This will generate a plugin descriptor from
java-based mojo sources, install the plugin, and then use it.
</description>
@@ -69,7 +69,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>1.8</source><!-- avoid ${maven.compiler.source} since value is not as expected -->
<target>1.8</target><!-- avoid ${maven.compiler.target} since value is not as expected -->
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
index ad2b9729..13db79f6 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
@@ -29,8 +29,8 @@ under the License.
<name>Maven Integration Test :: basic-java-annotations-jdk8</name>
<description>
- Test plugin-plugin, which tests maven-plugin-tools-api and
- maven-plugin-tools-java. This will generate a plugin descriptor from
+ Test plugin-plugin, which tests maven-plugin-tools-api and
+ maven-plugin-tools-java. This will generate a plugin descriptor from
java-based mojo sources, install the plugin, and then use it.
</description>
@@ -65,7 +65,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<release>${java.specification.version}</release>
</configuration>
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml b/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
index 19ee2b15..a00a1381 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
@@ -29,8 +29,8 @@ under the License.
<name>Maven Integration Test :: basic-java-annotations</name>
<description>
- Test plugin-plugin, which tests maven-plugin-tools-api and
- maven-plugin-tools-java. This will generate a plugin descriptor from
+ Test plugin-plugin, which tests maven-plugin-tools-api and
+ maven-plugin-tools-java. This will generate a plugin descriptor from
java-based mojo sources, install the plugin, and then use it.
</description>
@@ -70,7 +70,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/mplugin-223/pom.xml b/maven-plugin-plugin/src/it/mplugin-223/pom.xml
index 64e71c97..35c9bca1 100644
--- a/maven-plugin-plugin/src/it/mplugin-223/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-223/pom.xml
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml b/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
index 94414e3b..236cb5df 100644
--- a/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
index 671a83fc..1d92deaa 100644
--- a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
index 770a7849..13326430 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
index 03a3a3da..2e4bed7a 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
index 456e475a..b6c3a5fa 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>maven-surefire-common</artifactId>
- <version>2.19.1</version>
+ <version>3.1.0</version>
</dependency>
</dependencies>
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
index 54765bcf..37730040 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
@@ -23,7 +23,8 @@ import java.util.List;
import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.api.suite.RunResult;
+import org.apache.maven.surefire.extensions.ForkNodeFactory;
@Mojo(name = "custom-surefire")
public class CustomSurefireMojo extends AbstractSurefireMojo {
@@ -40,7 +41,19 @@ public class CustomSurefireMojo extends AbstractSurefireMojo {
return null;
}
- public Boolean getFailIfNoSpecifiedTests() {
+ public String getEnableProcessChecker() {
+ return null;
+ }
+
+ public String getEncoding() {
+ return null;
+ }
+
+ public boolean getFailIfNoSpecifiedTests() {
+ return false;
+ }
+
+ public ForkNodeFactory getForkNode() {
return null;
}
@@ -48,6 +61,10 @@ public class CustomSurefireMojo extends AbstractSurefireMojo {
return 0;
}
+ public File getMainBuildPath() {
+ return null;
+ }
+
public double getParallelTestsTimeoutForcedInSeconds() {
return 0;
}
@@ -60,6 +77,10 @@ public class CustomSurefireMojo extends AbstractSurefireMojo {
return null;
}
+ public String getReportSchemaLocation() {
+ return null;
+ }
+
public File getReportsDirectory() {
return null;
}
@@ -108,16 +129,32 @@ public class CustomSurefireMojo extends AbstractSurefireMojo {
return false;
}
+ public boolean useModulePath() {
+ return false;
+ }
+
public void setBasedir(File arg0) {}
public void setClassesDirectory(File arg0) {}
public void setDebugForkedProcess(String arg0) {}
+ public void setEncoding(String arg0) {}
+
+ public void setExcludes(List<String> arg0) {}
+
+ public void setExcludeJUnit5Engines(String[] arg0) {}
+
public void setFailIfNoSpecifiedTests(boolean arg0) {}
+ public void setForkedProcessExitTimeoutInSeconds(int arg0) {}
+
public void setForkedProcessTimeoutInSeconds(int arg0) {}
+ public void setIncludeJUnit5Engines(String[] arg0) {}
+
+ public void setMainBuildPath(File arg0) {}
+
public void setParallelTestsTimeoutForcedInSeconds(double arg0) {}
public void setParallelTestsTimeoutInSeconds(double arg0) {}
@@ -128,12 +165,20 @@ public class CustomSurefireMojo extends AbstractSurefireMojo {
public void setReportsDirectory(File arg0) {}
+ public void setRunOrder(String arg0) {}
+
+ public void setRunOrderRandomSeed(Long arg0) {}
+
public void setSkip(boolean arg0) {}
public void setSkipExec(boolean arg0) {}
public void setSkipTests(boolean arg0) {}
+ public void setSuiteXmlFiles(File[] arg0) {}
+
+ public void setSystemPropertiesFile(File arg0) {}
+
public void setTest(String arg0) {}
public void setTestClassesDirectory(File arg0) {}
@@ -142,18 +187,47 @@ public class CustomSurefireMojo extends AbstractSurefireMojo {
public void setUseManifestOnlyJar(boolean arg0) {}
+ public void setUseModulePath(boolean arg0) {}
+
public void setUseSystemClassLoader(boolean arg0) {}
+ public void setIncludes(List<String> arg0) {}
+
@Override
protected String[] getDefaultIncludes() {
return null;
}
+ @Override
+ public String[] getExcludeJUnit5Engines() {
+ return null;
+ }
+
+ @Override
+ protected String[] getExcludedEnvironmentVariables() {
+ return null;
+ }
+
+ @Override
+ public List<String> getExcludes() {
+ return null;
+ }
+
@Override
public File getExcludesFile() {
return null;
}
+ @Override
+ public int getForkedProcessExitTimeoutInSeconds() {
+ return 0;
+ }
+
+ @Override
+ public String[] getIncludeJUnit5Engines() {
+ return null;
+ }
+
@Override
public List<String> getIncludes() {
return null;
@@ -179,11 +253,21 @@ public class CustomSurefireMojo extends AbstractSurefireMojo {
return null;
}
+ @Override
+ public Long getRunOrderRandomSeed() {
+ return null;
+ }
+
@Override
public File[] getSuiteXmlFiles() {
return null;
}
+ @Override
+ public File getSystemPropertiesFile() {
+ return null;
+ }
+
@Override
protected void handleSummary(RunResult arg0, Exception arg1) {}
@@ -197,15 +281,6 @@ public class CustomSurefireMojo extends AbstractSurefireMojo {
return false;
}
- @Override
- public void setIncludes(List<String> arg0) {}
-
- @Override
- public void setRunOrder(String arg0) {}
-
- @Override
- public void setSuiteXmlFiles(File[] arg0) {}
-
@Override
protected List<File> suiteXmlFiles() {
return null;
diff --git a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy
index 5105ea1b..583a19f6 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy
+++ b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy
@@ -21,6 +21,6 @@ assert descriptorFile.isFile()
def pluginDescriptor = new XmlParser().parse( descriptorFile );
assert pluginDescriptor.mojos.mojo.size() == 1
-assert pluginDescriptor.mojos.mojo.parameters.parameter.size() == 50
+assert pluginDescriptor.mojos.mojo.parameters.parameter.size() == 51
return true;
diff --git a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
index 1b283edb..e356357f 100644
--- a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
@@ -56,12 +56,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.4.1</version>
+ <version>@javadocPluginVersion@</version>
<configuration>
<level>private</level>
</configuration>
diff --git a/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml b/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
index 699119c5..3a154242 100644
--- a/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
@@ -81,7 +81,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.3.1</version>
<executions>
<execution>
<id>copy</id>
diff --git a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
index 7514a0b5..2798708a 100644
--- a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
@@ -58,7 +58,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
index 68fa7c53..88b49f4a 100644
--- a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
@@ -41,7 +41,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-jxr</artifactId>
- <version>3.1.1</version>
+ <version>3.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -64,7 +64,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
index 456b6f14..6d739ec7 100644
--- a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
@@ -29,8 +29,8 @@ under the License.
<name>Maven Integration Test :: annotation-with-inheritance-from-deps</name>
<description>
- Test plugin-plugin, which tests maven-plugin-tools-api and
- maven-plugin-tools-java. This will generate a plugin descriptor from
+ Test plugin-plugin, which tests maven-plugin-tools-api and
+ maven-plugin-tools-java. This will generate a plugin descriptor from
java-based mojo sources, install the plugin, and then use it.
</description>
@@ -79,7 +79,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
index 7ac218e9..e40e1f03 100644
--- a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
@@ -73,7 +73,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/maven-plugin-plugin/src/it/mplugin-390/pom.xml b/maven-plugin-plugin/src/it/mplugin-390/pom.xml
index 75ed4247..0f7aa5bd 100644
--- a/maven-plugin-plugin/src/it/mplugin-390/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-390/pom.xml
@@ -73,7 +73,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -86,7 +86,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
<executions>
<execution>
<id>touch</id>
diff --git a/maven-plugin-plugin/src/it/packaging-jar/pom.xml b/maven-plugin-plugin/src/it/packaging-jar/pom.xml
index 268956ed..5b4b8c3f 100644
--- a/maven-plugin-plugin/src/it/packaging-jar/pom.xml
+++ b/maven-plugin-plugin/src/it/packaging-jar/pom.xml
@@ -58,7 +58,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/v4api/pom.xml b/maven-plugin-plugin/src/it/v4api/pom.xml
index 010d599a..a763c68b 100644
--- a/maven-plugin-plugin/src/it/v4api/pom.xml
+++ b/maven-plugin-plugin/src/it/v4api/pom.xml
@@ -51,7 +51,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<source>1.8</source><!-- avoid ${maven.compiler.source} since value is not as expected -->
<target>1.8</target><!-- avoid ${maven.compiler.target} since value is not as expected -->
diff --git a/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/pom.xml b/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/pom.xml
index 47ea4d51..b3669660 100644
--- a/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/pom.xml
+++ b/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/pom.xml
@@ -81,7 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.4.0</version>
</plugin>
</plugins>
</build>
diff --git a/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml b/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
index 957ebff3..2dd1074c 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
@@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -70,7 +70,7 @@ under the License.
</plugin>
</plugins>
</build>
-
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
diff --git a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
index f3e25ff7..9fece222 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml b/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
index 265c1191..2a813a35 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
@@ -59,7 +59,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
index cf148d40..3dafd941 100644
--- a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml b/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
index 62ed497e..83c6d716 100644
--- a/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
@@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
index d675726e..3d740f1e 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <name>MPLUGIN-105</name>
+ <name>MPLUGIN-105</name>
<description>
Test basic site generation to guard against regression.
</description>
@@ -79,7 +79,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
index 6716685c..0d77f338 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
@@ -58,7 +58,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
index ca0b9d6a..cabb67cf 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <name>MPLUGIN-417</name>
+ <name>MPLUGIN-417</name>
<description>
Test basic site generation containing javadoc links to internal and external javadoc sites.
</description>
@@ -70,7 +70,7 @@ under the License.
<artifactId>maven-reporting-impl</artifactId>
<version>@reportingImplVersion@</version>
</dependency>
-
+
</dependencies>
<build>
@@ -78,7 +78,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<!-- old maven-parent, so fix it like this. -->
<source>${maven.compiler.source}</source>
@@ -124,7 +124,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.4.1</version>
+ <version>@javadocPluginVersion@</version>
<configuration>
<excludePackageNames>org.internal</excludePackageNames>
</configuration>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
index dd95249a..864bb3de 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <name>MPLUGIN-105</name>
+ <name>MPLUGIN-105</name>
<description>
Test basic site generation to guard against regression of MPLUGIN-105.
</description>
@@ -74,7 +74,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>@compilerPluginVersion@</version>
<configuration>
<!-- old maven-parent, so fix it like this. -->
<source>${maven.compiler.source}</source>
diff --git a/pom.xml b/pom.xml
index a7432391..a497cb3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,13 +97,15 @@
<slf4jVersion>1.7.36</slf4jVersion>
<antVersion>1.10.13</antVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
- <!-- whenever the ASM version is updated also the
- maven-plugin-tools-annotations/src/main/java/o/a/m/tools/plugins/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor#CLASS_VERSION_TO_JAVA_STRING
+ <!-- whenever the ASM version is updated also the
+ maven-plugin-tools-annotations/src/main/java/o/a/m/tools/plugins/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor#CLASS_VERSION_TO_JAVA_STRING
needs to be updated as well -->
<asmVersion>9.5</asmVersion>
<plexusUtilsVersion>3.5.0</plexusUtilsVersion>
<reportingApiVersion>3.1.1</reportingApiVersion>
<reportingImplVersion>3.2.0</reportingImplVersion>
+ <compilerPluginVersion>3.11.0</compilerPluginVersion>
+ <javadocPluginVersion>3.5.0</javadocPluginVersion>
<project.build.outputTimestamp>2023-04-18T16:00:57Z</project.build.outputTimestamp>
</properties>
@@ -217,7 +219,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.6.3</version>
+ <version>4.7.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -251,7 +253,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.15.4</version>
+ <version>1.16.1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -296,7 +298,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
- <version>5.9.2</version>
+ <version>5.9.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>