Skip to content

Commit

Permalink
Upgrade to 4.0.0-alpha-12
Browse files Browse the repository at this point in the history
  • Loading branch information
@gnodet
gnodet committed Jan 16, 2024
1 parent 64c01df commit 5eaabea
Show file tree
Hide file tree
Showing 66 changed files with 523 additions and 289 deletions.
10 changes: 8 additions & 2 deletions maven-plugin-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
in order to include them the resulting JAR. It is also used to generate a generic help goal.</description>

<prerequisites>
<maven>${mavenVersion}</maven>
<maven>${maven3Version}</maven>
</prerequisites>

<properties>
Expand Down Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
<version>${mavenVersion}</version>
<version>${maven3Version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -137,6 +137,12 @@
<version>0.0.7</version>
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>

<!-- tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions maven-plugin-plugin/src/it/ant-basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>${pluginPluginVersion}</version>
<configuration>
<requiredMavenVersion>3.6.5</requiredMavenVersion>
<goalPrefix>antBasic</goalPrefix>
</configuration>
<dependencies>
Expand Down
1 change: 1 addition & 0 deletions maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<requiredMavenVersion>3.6.5</requiredMavenVersion>
<goalPrefix>antWithRefs</goalPrefix>
</configuration>
<dependencies>
Expand Down
1 change: 1 addition & 0 deletions maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>${pluginPluginVersion}</version>
<configuration>
<requiredMavenVersion>3.6.5</requiredMavenVersion>
<goalPrefix>antSimpleUsage</goalPrefix>
</configuration>
<dependencies>
Expand Down
3 changes: 3 additions & 0 deletions maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<requiredMavenVersion>3.6.5</requiredMavenVersion>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions maven-plugin-plugin/src/it/beanshell-simple/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>${pluginPluginVersion}</version>
<configuration>
<requiredMavenVersion>3.6.5</requiredMavenVersion>
<goalPrefix>beanshellBasic</goalPrefix>
</configuration>
<dependencies>
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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/help-package/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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin-plugin/src/it/java-basic/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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</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>@mavenVersion@</version>
<version>@maven3Version@</version>
</dependency>
</dependencies>

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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
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>@mavenVersion@</version>
<version>@maven3Version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit 5eaabea

Please sign in to comment.