From 960d1500211b0211528dd34d2c3baa3d44bfcff4 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 19 Oct 2021 09:49:56 +0200 Subject: [PATCH] Weed out ITs (#45) Update used Maven APIs to lowest supported, drop ancient 2.0 and alikes. --- maven-plugin-plugin/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 | 4 ++-- .../src/it/java-basic-annotations-jdkcurrent/pom.xml | 4 ++-- .../src/it/java-basic-annotations/pom.xml | 4 ++-- maven-plugin-plugin/src/it/java-basic/pom.xml | 4 ++-- maven-plugin-plugin/src/it/mplugin-191/pom.xml | 10 +++++----- maven-plugin-plugin/src/it/mplugin-223/pom.xml | 2 +- maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml | 2 +- .../src/it/mplugin-299_no-configuration/pom.xml | 2 +- .../src/it/mplugin-305_defaultMojoDependencies/pom.xml | 2 +- .../src/it/mplugin-305_emptyMojoDependencies/pom.xml | 2 +- .../src/it/mplugin-305_singleMojoDependencies/pom.xml | 2 +- .../src/it/mplugin-319_report-since/pom.xml | 2 +- maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml | 2 +- .../src/it/mplugin-363_help-reproducible/pom.xml | 2 +- maven-plugin-plugin/src/it/packaging-jar/pom.xml | 4 ++-- .../src/it/plugin-info-jdk-default-version/pom.xml | 2 +- maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml | 2 +- .../src/it/plugin-report-annotations/pom.xml | 4 ++-- maven-plugin-plugin/src/it/plugin-report/pom.xml | 4 ++-- maven-plugin-plugin/src/it/skip/pom.xml | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-) 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 ea2e7b428..2bbbc31ce 100644 --- a/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml +++ b/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ org.codehaus.plexus diff --git a/maven-plugin-plugin/src/it/help-basic/pom.xml b/maven-plugin-plugin/src/it/help-basic/pom.xml index 4a164bc71..2675d8ecb 100644 --- a/maven-plugin-plugin/src/it/help-basic/pom.xml +++ b/maven-plugin-plugin/src/it/help-basic/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ org.codehaus.plexus diff --git a/maven-plugin-plugin/src/it/help-package/pom.xml b/maven-plugin-plugin/src/it/help-package/pom.xml index 7735aee0c..f289a1f97 100644 --- a/maven-plugin-plugin/src/it/help-package/pom.xml +++ b/maven-plugin-plugin/src/it/help-package/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ org.codehaus.plexus 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 0531c7d25..63d0e04e0 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 @@ -46,12 +46,12 @@ under the License. org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven maven-core - 2.2.1 + @mavenVersion@ org.codehaus.plexus 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 53d92fb1a..d7c06603c 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 @@ -42,12 +42,12 @@ under the License. org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven maven-core - 2.2.1 + @mavenVersion@ org.codehaus.plexus 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 097785d2b..653a7c94e 100644 --- a/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml +++ b/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml @@ -42,12 +42,12 @@ under the License. org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven maven-core - 2.2.1 + @mavenVersion@ org.codehaus.plexus diff --git a/maven-plugin-plugin/src/it/java-basic/pom.xml b/maven-plugin-plugin/src/it/java-basic/pom.xml index 37a44a146..c570e414d 100644 --- a/maven-plugin-plugin/src/it/java-basic/pom.xml +++ b/maven-plugin-plugin/src/it/java-basic/pom.xml @@ -42,12 +42,12 @@ under the License. org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven maven-core - 2.2.1 + @mavenVersion@ diff --git a/maven-plugin-plugin/src/it/mplugin-191/pom.xml b/maven-plugin-plugin/src/it/mplugin-191/pom.xml index b6b63569b..29aa38e35 100644 --- a/maven-plugin-plugin/src/it/mplugin-191/pom.xml +++ b/maven-plugin-plugin/src/it/mplugin-191/pom.xml @@ -35,10 +35,10 @@ under the License. - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 org.apache.maven.plugins @@ -60,7 +60,7 @@ under the License. org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ diff --git a/maven-plugin-plugin/src/it/mplugin-223/pom.xml b/maven-plugin-plugin/src/it/mplugin-223/pom.xml index 927202586..761539118 100644 --- a/maven-plugin-plugin/src/it/mplugin-223/pom.xml +++ b/maven-plugin-plugin/src/it/mplugin-223/pom.xml @@ -37,7 +37,7 @@ org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven.plugin-tools 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 85b4259a9..c10c6e42e 100644 --- a/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml +++ b/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml @@ -31,7 +31,7 @@ org.apache.maven maven-plugin-api - 3.2.1 + @mavenVersion@ org.apache.maven.plugin-tools 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 cafacd434..dbb98d704 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 @@ -39,7 +39,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ org.codehaus.plexus 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 b77ad77a2..720fac519 100644 --- a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml +++ b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml @@ -36,7 +36,7 @@ org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven.plugin-tools 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 f5c309c2a..79d68851d 100644 --- a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml +++ b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml @@ -36,7 +36,7 @@ org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven.plugin-tools 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 db8fd5a54..e142cc62b 100644 --- a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml +++ b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml @@ -36,7 +36,7 @@ org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven.plugin-tools diff --git a/maven-plugin-plugin/src/it/mplugin-319_report-since/pom.xml b/maven-plugin-plugin/src/it/mplugin-319_report-since/pom.xml index 628999dfb..f7ad90a8f 100644 --- a/maven-plugin-plugin/src/it/mplugin-319_report-since/pom.xml +++ b/maven-plugin-plugin/src/it/mplugin-319_report-since/pom.xml @@ -36,7 +36,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ 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 8eae5c42f..b63f51c30 100644 --- a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml +++ b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ org.codehaus.plexus 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 63e4d4757..b72ecc0bf 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 @@ -39,7 +39,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ org.codehaus.plexus diff --git a/maven-plugin-plugin/src/it/packaging-jar/pom.xml b/maven-plugin-plugin/src/it/packaging-jar/pom.xml index ebaeba714..ec5702cea 100644 --- a/maven-plugin-plugin/src/it/packaging-jar/pom.xml +++ b/maven-plugin-plugin/src/it/packaging-jar/pom.xml @@ -41,12 +41,12 @@ under the License. org.apache.maven maven-plugin-api - 2.2.1 + @mavenVersion@ org.apache.maven maven-core - 2.2.1 + @mavenVersion@ org.codehaus.plexus diff --git a/maven-plugin-plugin/src/it/plugin-info-jdk-default-version/pom.xml b/maven-plugin-plugin/src/it/plugin-info-jdk-default-version/pom.xml index 2ac965012..8efba4230 100644 --- a/maven-plugin-plugin/src/it/plugin-info-jdk-default-version/pom.xml +++ b/maven-plugin-plugin/src/it/plugin-info-jdk-default-version/pom.xml @@ -36,7 +36,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ diff --git a/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml b/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml index a184f458d..d0a198ec0 100644 --- a/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml +++ b/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml @@ -36,7 +36,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ diff --git a/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml b/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml index 4893fe283..327bc101b 100644 --- a/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml +++ b/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml @@ -40,7 +40,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ org.apache.maven.plugin-tools @@ -51,7 +51,7 @@ under the License. org.apache.maven.reporting maven-reporting-impl - 2.0.5 + 3.0.0 org.apache.maven.reporting diff --git a/maven-plugin-plugin/src/it/plugin-report/pom.xml b/maven-plugin-plugin/src/it/plugin-report/pom.xml index cf7ac803b..e55b56e98 100644 --- a/maven-plugin-plugin/src/it/plugin-report/pom.xml +++ b/maven-plugin-plugin/src/it/plugin-report/pom.xml @@ -46,12 +46,12 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ org.apache.maven.reporting maven-reporting-impl - 2.0.5 + 3.0.0 org.apache.maven.reporting diff --git a/maven-plugin-plugin/src/it/skip/pom.xml b/maven-plugin-plugin/src/it/skip/pom.xml index c9aa73727..4e6e897d7 100644 --- a/maven-plugin-plugin/src/it/skip/pom.xml +++ b/maven-plugin-plugin/src/it/skip/pom.xml @@ -40,7 +40,7 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@