Skip to content

Migrate to Maven 4 API #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gnodet wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Migrate to Maven 4 API #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a49d4a
Port effective-pom, effective-settings, evaluate and system mojos
gnodet Jul 15, 2024
0910627
Upgrade to Maven 4.0.0-rc-3 and migrate ActiveProfilesMojo and AllPro…
gnodet Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
271 changes: 149 additions & 122 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>42</version>
<version>43</version>
<relativePath />
</parent>

<artifactId>maven-help-plugin</artifactId>
<version>3.4.2-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Apache Maven Help Plugin</name>
Expand Down Expand Up @@ -64,132 +64,68 @@
</distributionManagement>

<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.6.3</mavenVersion>
<resolverVersion>1.4.1</resolverVersion>
<javaVersion>17</javaVersion>
<mavenVersion>4.0.0-rc-3-SNAPSHOT</mavenVersion>

<guiceVersion>6.0.0</guiceVersion>
<sisuVersion>0.9.0.M2</sisuVersion>
<version.plexus-xml>4.0.3</version.plexus-xml>
<version.maven-plugin-tools>4.0.0-beta-1</version.maven-plugin-tools>
<project.build.outputTimestamp>2024-06-02T15:17:10Z</project.build.outputTimestamp>
</properties>

<dependencies>
<!-- maven core -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
<artifactId>maven-api-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<artifactId>maven-api-model</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<artifactId>maven-api-settings</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>${resolverVersion}</version>
<scope>provided</scope>
</dependency>

<!-- maven plugin tools -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-generators</artifactId>
<version>${version.maven-plugin-tools}</version>
<exclusions>
<!-- we only need one class HtmlToPlainTextConverter -->
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.velocity</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.jtidy</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>

<!-- shared -->
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>3.4.2</version>
<exclusions>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.maven.shared</groupId>-->
<!-- <artifactId>maven-shared-utils</artifactId>-->
<!-- <version>3.4.2</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>commons-io</groupId>-->
<!-- <artifactId>commons-io</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->

<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>3.1.1</version>
<exclusions>
<!-- we only need one interface MavenReport -->
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.maven.reporting</groupId>-->
<!-- <artifactId>maven-reporting-api</artifactId>-->
<!-- <version>3.1.1</version>-->
<!-- <exclusions>-->
<!-- &lt;!&ndash; we only need one interface MavenReport &ndash;&gt;-->
<!-- <exclusion>-->
<!-- <groupId>*</groupId>-->
<!-- <artifactId>*</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
<version>1.3</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.codehaus.plexus</groupId>-->
<!-- <artifactId>plexus-interactivity-api</artifactId>-->
<!-- <version>1.3</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
Expand All @@ -199,6 +135,17 @@
<artifactId>plexus-xml</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>7.0.0</version>
</dependency>

<!-- misc -->
<dependency>
<groupId>org.jdom</groupId>
Expand All @@ -208,7 +155,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.20</version>
<version>1.4.21</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -218,34 +165,44 @@

<!-- test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.15.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.3.0</version>
<version>4.0.0-beta-4-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>${sisuVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guiceVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<!-- 5.x requires at least Java 11 -->
<version>4.11.0</version>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -261,6 +218,76 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- Extract sources from dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.1</version>
<executions>
<execution>
<id>unpack-maven-core-sources</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<classifier>sources</classifier>
<type>jar</type>
<outputDirectory>${project.build.directory}/generated-sources/maven-dependencies</outputDirectory>
<includes>**/PluginParameterExpressionEvaluatorV4.java</includes>
</artifactItem>
<artifactItem>
<groupId>org.apache.maven</groupId>
<artifactId>maven-impl</artifactId>
<version>${mavenVersion}</version>
<classifier>sources</classifier>
<type>jar</type>
<outputDirectory>${project.build.directory}/generated-sources/maven-dependencies</outputDirectory>
<includes>**/SettingsUtilsV4.java,
org/apache/maven/impl/model/reflection/*.java</includes>
</artifactItem>
<artifactItem>
<groupId>org.apache.maven</groupId>
<artifactId>maven-support</artifactId>
<version>${mavenVersion}</version>
<classifier>sources</classifier>
<type>jar</type>
<outputDirectory>${project.build.directory}/generated-sources/maven-dependencies</outputDirectory>
<includes>**/SettingsTransformer.java,**/SettingsMerger.java</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<!-- Add the extracted sources to build path -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>add-source</id>
<goals>
<goal>add-source</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/maven-dependencies</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/evaluate-artifact-with-expression-with-output/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>3.5.0</version>
<executions>
<execution>
<id>enforce-currentproject</id>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/evaluate-artifact-with-expression-with-output/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.

expression = project.name
expression = project.model.name
output = result.txt
artifact = org.apache.maven.plugins:maven-help-plugin
2 changes: 1 addition & 1 deletion src/it/projects/evaluate-with-expression-with-output/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.

expression = project.name
expression = project.model.name
output = result.txt
2 changes: 1 addition & 1 deletion src/it/projects/evaluate/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

expression = project.description
expression = project.model.description
0 ...ojects/active-profiles/invoker.properties → ...igrate/active-profiles/invoker.properties
View file
Open in desktop
File renamed without changes.
0 src/it/projects/active-profiles/pom.xml → src/it/to-migrate/active-profiles/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...it/projects/active-profiles/verify.groovy → .../to-migrate/active-profiles/verify.groovy
View file
Open in desktop
File renamed without changes.
0 ...e-profiles_multimodule/invoker.properties → ...e-profiles_multimodule/invoker.properties
View file
Open in desktop
File renamed without changes.
0 ...ctive-profiles_multimodule/module/pom.xml → ...ctive-profiles_multimodule/module/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...jects/active-profiles_multimodule/pom.xml → ...grate/active-profiles_multimodule/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...active-profiles_multimodule/verify.groovy → ...active-profiles_multimodule/verify.groovy
View file
Open in desktop
File renamed without changes.
0 ...cts/all-profiles-parent-pom/child/pom.xml → ...ate/all-profiles-parent-pom/child/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...ll-profiles-parent-pom/invoker.properties → ...ll-profiles-parent-pom/invoker.properties
View file
Open in desktop
File renamed without changes.
0 .../projects/all-profiles-parent-pom/pom.xml → ...o-migrate/all-profiles-parent-pom/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...cts/all-profiles-parent-pom/verify.groovy → ...ate/all-profiles-parent-pom/verify.groovy
View file
Open in desktop
File renamed without changes.
0 .../projects/all-profiles/invoker.properties → ...o-migrate/all-profiles/invoker.properties
View file
Open in desktop
File renamed without changes.
0 src/it/projects/all-profiles/pom.xml → src/it/to-migrate/all-profiles/pom.xml
View file
Open in desktop
File renamed without changes.
0 src/it/projects/all-profiles/verify.groovy → src/it/to-migrate/all-profiles/verify.groovy
View file
Open in desktop
File renamed without changes.
0 ...s/describe-cmd-invalid/invoker.properties → ...e/describe-cmd-invalid/invoker.properties
View file
Open in desktop
File renamed without changes.
0 src/it/projects/describe-cmd-invalid/pom.xml → ...t/to-migrate/describe-cmd-invalid/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...ects/describe-cmd-invalid/test.properties → ...rate/describe-cmd-invalid/test.properties
View file
Open in desktop
File renamed without changes.
0 ...-cmd-with-goal-invalid/invoker.properties → ...-cmd-with-goal-invalid/invoker.properties
View file
Open in desktop
File renamed without changes.
0 ...ts/describe-cmd-with-goal-invalid/pom.xml → ...te/describe-cmd-with-goal-invalid/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...ibe-cmd-with-goal-invalid/test.properties → ...ibe-cmd-with-goal-invalid/test.properties
View file
Open in desktop
File renamed without changes.
0 ...e-cmd-with-goal-report/invoker.properties → ...e-cmd-with-goal-report/invoker.properties
View file
Open in desktop
File renamed without changes.
0 ...cts/describe-cmd-with-goal-report/pom.xml → ...ate/describe-cmd-with-goal-report/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...scribe-cmd-with-goal-report/verify.groovy → ...scribe-cmd-with-goal-report/verify.groovy
View file
Open in desktop
File renamed without changes.
0 ...describe-cmd-with-goal/invoker.properties → ...describe-cmd-with-goal/invoker.properties
View file
Open in desktop
File renamed without changes.
0 ...t/projects/describe-cmd-with-goal/pom.xml → ...to-migrate/describe-cmd-with-goal/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...ts/describe-cmd-with-goal/test.properties → ...te/describe-cmd-with-goal/test.properties
View file
Open in desktop
File renamed without changes.
0 ...ects/describe-cmd-with-goal/verify.groovy → ...rate/describe-cmd-with-goal/verify.groovy
View file
Open in desktop
File renamed without changes.
0 .../projects/describe-cmd/invoker.properties → ...o-migrate/describe-cmd/invoker.properties
View file
Open in desktop
File renamed without changes.
0 src/it/projects/describe-cmd/pom.xml → src/it/to-migrate/describe-cmd/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...jects/describe-cmd/test-deploy.properties → ...grate/describe-cmd/test-deploy.properties
View file
Open in desktop
File renamed without changes.
0 ...rojects/describe-cmd/test-site.properties → ...migrate/describe-cmd/test-site.properties
View file
Open in desktop
File renamed without changes.
0 src/it/projects/describe-cmd/verify.groovy → src/it/to-migrate/describe-cmd/verify.groovy
View file
Open in desktop
File renamed without changes.
0 ...t/projects/describe-ga/invoker.properties → ...to-migrate/describe-ga/invoker.properties
View file
Open in desktop
File renamed without changes.
0 src/it/projects/describe-ga/pom.xml → src/it/to-migrate/describe-ga/pom.xml
View file
Open in desktop
File renamed without changes.
0 src/it/projects/describe-ga/test.properties → ...it/to-migrate/describe-ga/test.properties
View file
Open in desktop
File renamed without changes.
0 .../projects/describe-gav/invoker.properties → ...o-migrate/describe-gav/invoker.properties
View file
Open in desktop
File renamed without changes.
0 src/it/projects/describe-gav/pom.xml → src/it/to-migrate/describe-gav/pom.xml
View file
Open in desktop
File renamed without changes.
0 src/it/projects/describe-gav/test.properties → ...t/to-migrate/describe-gav/test.properties
View file
Open in desktop
File renamed without changes.
0 ...n-in-plugin-management/invoker.properties → ...n-in-plugin-management/invoker.properties
View file
Open in desktop
File renamed without changes.
0 ...cribe-plugin-in-plugin-management/pom.xml → ...cribe-plugin-in-plugin-management/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...ugin-in-plugin-management/test.properties → ...ugin-in-plugin-management/test.properties
View file
Open in desktop
File renamed without changes.
0 ...plugin-in-plugin-management/verify.groovy → ...plugin-in-plugin-management/verify.groovy
View file
Open in desktop
File renamed without changes.
0 ...be-plugin-without-name/invoker.properties → ...be-plugin-without-name/invoker.properties
View file
Open in desktop
File renamed without changes.
0 ...ects/describe-plugin-without-name/pom.xml → ...rate/describe-plugin-without-name/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...cribe-plugin-without-name/test.properties → ...cribe-plugin-without-name/test.properties
View file
Open in desktop
File renamed without changes.
0 ...escribe-plugin-without-name/verify.groovy → ...escribe-plugin-without-name/verify.groovy
View file
Open in desktop
File renamed without changes.
0 ...refix-and-invalid-mojo/invoker.properties → ...refix-and-invalid-mojo/invoker.properties
View file
Open in desktop
File renamed without changes.
0 .../describe-prefix-and-invalid-mojo/pom.xml → .../describe-prefix-and-invalid-mojo/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...e-prefix-and-invalid-mojo/test.properties → ...e-prefix-and-invalid-mojo/test.properties
View file
Open in desktop
File renamed without changes.
0 ...ibe-prefix-and-invalid-mojo/verify.groovy → ...ibe-prefix-and-invalid-mojo/verify.groovy
View file
Open in desktop
File renamed without changes.
0 ...scribe-prefix-and-mojo/invoker.properties → ...scribe-prefix-and-mojo/invoker.properties
View file
Open in desktop
File renamed without changes.
0 ...projects/describe-prefix-and-mojo/pom.xml → ...-migrate/describe-prefix-and-mojo/pom.xml
View file
Open in desktop
File renamed without changes.
0 .../describe-prefix-and-mojo/test.properties → .../describe-prefix-and-mojo/test.properties
View file
Open in desktop
File renamed without changes.
0 ...ojects/describe-prefix/invoker.properties → ...igrate/describe-prefix/invoker.properties
View file
Open in desktop
File renamed without changes.
0 src/it/projects/describe-prefix/pom.xml → src/it/to-migrate/describe-prefix/pom.xml
View file
Open in desktop
File renamed without changes.
0 .../projects/describe-prefix/test.properties → ...o-migrate/describe-prefix/test.properties
View file
Open in desktop
File renamed without changes.
Loading