From ee9b35d19c382d4aa6119359e30c35546ba193a3 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 9 May 2023 22:38:39 +0200 Subject: [PATCH] [MPLUGIN-468] Upgrade plugins and components (in ITs) --- .../pom.xml | 6 +- .../pom.xml | 2 +- .../it/annotation-with-inheritance/pom.xml | 6 +- .../expected-help.txt | 4 +- .../invoker.properties | 6 +- .../pom.xml | 4 +- .../verify.groovy | 2 +- .../src/it/help-basic-jdk11/pom.xml | 2 +- maven-plugin-plugin/src/it/help-basic/pom.xml | 2 +- .../src/it/help-package/pom.xml | 2 +- .../it/java-basic-annotations-jdk8/pom.xml | 6 +- .../java-basic-annotations-jdkcurrent/pom.xml | 6 +- .../src/it/java-basic-annotations/pom.xml | 6 +- .../src/it/mplugin-223/pom.xml | 2 +- .../src/it/mplugin-272_java8/pom.xml | 2 +- .../it/mplugin-299_no-configuration/pom.xml | 2 +- .../pom.xml | 2 +- .../mplugin-305_emptyMojoDependencies/pom.xml | 2 +- .../pom.xml | 4 +- .../plugins/plugin/it/CustomSurefireMojo.java | 97 ++++++++++++++++--- .../verify.groovy | 2 +- .../src/it/mplugin-324_javadoc/pom.xml | 4 +- .../it/mplugin-363_help-reproducible/pom.xml | 4 +- .../mplugin-370-maven-deps-scope-bad/pom.xml | 2 +- .../mplugin-370-maven-deps-scope-good/pom.xml | 4 +- .../pom.xml | 6 +- .../pom.xml | 2 +- .../src/it/mplugin-390/pom.xml | 4 +- .../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 +- .../it/mplugin-394_report-encoding/pom.xml | 2 +- .../plugin-info-jdk-default-version/pom.xml | 2 +- .../src/it/plugin-info-jdk/pom.xml | 2 +- .../src/it/plugin-report-annotations/pom.xml | 4 +- .../pom.xml | 2 +- .../plugin-report-with-javadoc-links/pom.xml | 8 +- .../src/it/plugin-report/pom.xml | 4 +- pom.xml | 14 +-- 41 files changed, 160 insertions(+), 83 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 e5836c05d..c3d9fd3a4 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. Maven Integration Test :: annotation-with-inheritance-from-deps - 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. @@ -80,7 +80,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ 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 d2f6b8bc5..d47d1546a 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. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ 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 b00ab7d58..e8a0f5853 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. Maven Integration Test :: annotation-with-inheritance - 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. @@ -76,7 +76,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ 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 e7b0693d2..cfb758512 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 e7b0b4d63..8920e947d 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 97ae7060d..cb3004a7a 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. 4.0.0 org.apache.maven.its.plugin - help + help-deprecated-annotation-only 1.0-SNAPSHOT maven-plugin @@ -56,7 +56,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + @compilerPluginVersion@ 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 219231bd7..613385af8 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 65c209669..a8f72562e 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. org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + @compilerPluginVersion@ 11 11 diff --git a/maven-plugin-plugin/src/it/help-basic/pom.xml b/maven-plugin-plugin/src/it/help-basic/pom.xml index 73e4ce490..016730e1d 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. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ diff --git a/maven-plugin-plugin/src/it/help-package/pom.xml b/maven-plugin-plugin/src/it/help-package/pom.xml index 81f0376fc..d5314d9dc 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. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ 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 dda14a8a6..eae3d7e06 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. Maven Integration Test :: basic-java-annotations-jdk8 - 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. @@ -69,7 +69,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 3.1 + @compilerPluginVersion@ 1.8 1.8 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 ad2b97293..13db79f65 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. Maven Integration Test :: basic-java-annotations-jdk8 - 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. @@ -65,7 +65,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + @compilerPluginVersion@ ${java.specification.version} 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 19ee2b15f..a00a13819 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. Maven Integration Test :: basic-java-annotations - 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. @@ -70,7 +70,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ diff --git a/maven-plugin-plugin/src/it/mplugin-223/pom.xml b/maven-plugin-plugin/src/it/mplugin-223/pom.xml index 64e71c97b..35c9bca14 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 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ org.apache.maven.plugins 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 94414e3ba..236cb5df3 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 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + @compilerPluginVersion@ 1.8 1.8 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 671a83fc1..1d92deaa7 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. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ 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 770a78497..133264305 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 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ org.apache.maven.plugins 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 03a3a3da8..2e4bed7a9 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 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ org.apache.maven.plugins 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 456e475ac..b6c3a5fa4 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 @@ org.apache.maven.surefire maven-surefire-common - 2.19.1 + 3.1.0 @@ -57,7 +57,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ org.apache.maven.plugins 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 54765bcf7..37730040b 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 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 String getDebugForkedProcess() { 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 int getForkedProcessTimeoutInSeconds() { return 0; } + public File getMainBuildPath() { + return null; + } + public double getParallelTestsTimeoutForcedInSeconds() { return 0; } @@ -60,6 +77,10 @@ public String getReportFormat() { return null; } + public String getReportSchemaLocation() { + return null; + } + public File getReportsDirectory() { return null; } @@ -108,16 +129,32 @@ public boolean isUseSystemClassLoader() { 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 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 void setReportFormat(String arg0) {} 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 void setUseFile(boolean arg0) {} public void setUseManifestOnlyJar(boolean arg0) {} + public void setUseModulePath(boolean arg0) {} + public void setUseSystemClassLoader(boolean arg0) {} + public void setIncludes(List arg0) {} + @Override protected String[] getDefaultIncludes() { return null; } + @Override + public String[] getExcludeJUnit5Engines() { + return null; + } + + @Override + protected String[] getExcludedEnvironmentVariables() { + return null; + } + + @Override + public List getExcludes() { + return null; + } + @Override public File getExcludesFile() { return null; } + @Override + public int getForkedProcessExitTimeoutInSeconds() { + return 0; + } + + @Override + public String[] getIncludeJUnit5Engines() { + return null; + } + @Override public List getIncludes() { return null; @@ -179,11 +253,21 @@ public String getRunOrder() { 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 @@ protected boolean isSkipExecution() { return false; } - @Override - public void setIncludes(List arg0) {} - - @Override - public void setRunOrder(String arg0) {} - - @Override - public void setSuiteXmlFiles(File[] arg0) {} - @Override protected List 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 5105ea1be..583a19f67 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 1b283edbc..e356357f3 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. org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + @compilerPluginVersion@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + @javadocPluginVersion@ private 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 699119c5e..3a1542428 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. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ @@ -81,7 +81,7 @@ under the License. org.apache.maven.plugins maven-resources-plugin - 3.1.0 + 3.3.1 copy 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 7514a0b55..2798708ae 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. org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + @compilerPluginVersion@ 1.8 1.8 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 68fa7c535..88b49f4ac 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. org.apache.maven maven-jxr - 3.1.1 + 3.3.0 compile @@ -64,7 +64,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + @compilerPluginVersion@ 1.8 1.8 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 456b6f145..6d739ec71 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. Maven Integration Test :: annotation-with-inheritance-from-deps - 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. @@ -79,7 +79,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + @compilerPluginVersion@ 1.8 1.8 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 7ac218e91..e40e1f034 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. org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + @compilerPluginVersion@ 1.8 1.8 diff --git a/maven-plugin-plugin/src/it/mplugin-390/pom.xml b/maven-plugin-plugin/src/it/mplugin-390/pom.xml index 75ed4247f..0f7aa5bd3 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. org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + @compilerPluginVersion@ 1.8 1.8 @@ -86,7 +86,7 @@ under the License. org.apache.maven.plugins maven-antrun-plugin - 3.0.0 + 3.1.0 touch diff --git a/maven-plugin-plugin/src/it/packaging-jar/pom.xml b/maven-plugin-plugin/src/it/packaging-jar/pom.xml index 268956ed0..5b4b8c3f7 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. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ diff --git a/maven-plugin-plugin/src/it/v4api/pom.xml b/maven-plugin-plugin/src/it/v4api/pom.xml index 010d599a4..a763c68b9 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. org.apache.maven.plugins maven-compiler-plugin - 3.1 + @compilerPluginVersion@ 1.8 1.8 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 47ea4d515..b36696602 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 @@ org.apache.maven.plugins maven-help-plugin - 2.1.1 + 3.4.0 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 957ebff31..2dd1074c3 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. org.apache.maven.plugins maven-compiler-plugin - 3.1 + @compilerPluginVersion@ org.apache.maven.plugins @@ -70,7 +70,7 @@ under the License. - + true 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 f3e25ff7f..9fece222a 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. org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + @compilerPluginVersion@ org.apache.maven.plugins 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 265c1191f..2a813a356 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. org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + @compilerPluginVersion@ org.apache.maven.plugins 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 cf148d403..3dafd9415 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. org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + @compilerPluginVersion@ org.apache.maven.plugins 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 62ed497e7..83c6d7165 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. org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + @compilerPluginVersion@ org.apache.maven.plugins 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 d675726ee..3d740f1ec 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. 1.0-SNAPSHOT maven-plugin - MPLUGIN-105 + MPLUGIN-105 Test basic site generation to guard against regression. @@ -79,7 +79,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.4 + @compilerPluginVersion@ 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 6716685cc..0d77f3388 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. org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + @compilerPluginVersion@ org.apache.maven.plugins 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 ca0b9d6a0..cabb67cf9 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. 1.0-SNAPSHOT maven-plugin - MPLUGIN-417 + MPLUGIN-417 Test basic site generation containing javadoc links to internal and external javadoc sites. @@ -70,7 +70,7 @@ under the License. maven-reporting-impl @reportingImplVersion@ - + @@ -78,7 +78,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + @compilerPluginVersion@ ${maven.compiler.source} @@ -124,7 +124,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + @javadocPluginVersion@ org.internal 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 dd95249a0..864bb3de7 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. 1.0-SNAPSHOT maven-plugin - MPLUGIN-105 + MPLUGIN-105 Test basic site generation to guard against regression of MPLUGIN-105. @@ -74,7 +74,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + @compilerPluginVersion@ ${maven.compiler.source} diff --git a/pom.xml b/pom.xml index a74323915..6e7fb9ada 100644 --- a/pom.xml +++ b/pom.xml @@ -97,13 +97,15 @@ 1.7.36 1.10.13 plugin-tools-archives/plugin-tools-LATEST - 9.5 - 3.5.0 + 3.5.1 3.1.1 3.2.0 + 3.11.0 + 3.5.0 2023-04-18T16:00:57Z @@ -217,7 +219,7 @@ org.codehaus.plexus plexus-archiver - 4.6.3 + 4.7.1 org.codehaus.plexus @@ -251,7 +253,7 @@ org.jsoup jsoup - 1.15.4 + 1.16.1 org.ow2.asm @@ -296,7 +298,7 @@ org.junit junit-bom - 5.9.2 + 5.9.3 pom import