Skip to content

Commit

Permalink
[MPLUGIN-508] Build with Maven 4 only
Browse files Browse the repository at this point in the history 
# Conflicts:
#	pom.xml
  • Loading branch information
@gnodet
gnodet committed May 29, 2024
1 parent ce497e7 commit bdbd574
Show file tree
Hide file tree
Showing 39 changed files with 61 additions and 63 deletions.
5 changes: 2 additions & 3 deletions maven-plugin-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

<properties>
<it.debug>true</it.debug>
<javaVersion>8</javaVersion>
</properties>

<dependencies>
Expand Down Expand Up @@ -88,7 +87,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
<version>${maven3Version}</version>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -158,7 +157,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-di</artifactId>
<version>${maven4Version}</version>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/asm-failure/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/help-basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-223/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...n-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/mplugin-390/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/packaging-jar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/skip/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/v4api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-core</artifactId>
<version>@maven4Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@maven3Version@</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit bdbd574

Please sign in to comment.