You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/05/14 10:05:19 UTC
[maven-release] 01/01: Try build with Maven 4
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MRELEASE-1123-build-mvn4
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 1dc88e2ce6aa2ed9c3076d8c61a87941a68b7fae
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun May 14 12:04:33 2023 +0200
Try build with Maven 4
---
.github/workflows/maven-verify.yml | 2 ++
.../org/apache/maven/shared/release/config/ReleaseDescriptor.java | 2 +-
maven-release-manager/pom.xml | 2 +-
.../org/apache/maven/shared/release/exec/InvokerMavenExecutor.java | 7 ++++++-
.../maven/shared/release/phase/GenerateReleasePomsPhase.java | 5 +++--
maven-release-plugin/pom.xml | 1 +
maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml | 1 +
.../src/it/projects/branch/MRELEASE-694/verify.groovy | 2 ++
maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml | 1 +
.../src/it/projects/branch/MRELEASE-976/verify.groovy | 2 ++
maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml | 4 ++--
.../src/it/projects/prepare/MRELEASE-1053/verify.groovy | 2 ++
maven-release-plugin/src/it/projects/prepare/MRELEASE-1077/pom.xml | 2 +-
.../prepare/MRELEASE-161-dependencyManagement/verify.groovy | 3 +++
.../src/it/projects/prepare/MRELEASE-161/verify.groovy | 2 ++
.../src/it/projects/prepare/MRELEASE-571_M3/module1/pom.xml | 4 ++--
.../src/it/projects/prepare/MRELEASE-976/verify.groovy | 2 ++
.../src/it/projects/prepare/MRELEASE-985/verify.groovy | 2 ++
.../src/it/projects/prepare/namespace/verify.groovy | 2 ++
.../src/it/projects/prepare/version-policy/verify.groovy | 2 ++
.../src/it/projects/update-versions/MRELEASE-555/verify.groovy | 2 ++
.../src/it/projects/update-versions/MRELEASE-611/verify.groovy | 2 ++
.../src/it/projects/update-versions/MRELEASE-976/verify.groovy | 2 ++
.../java/org/apache/maven/plugins/release/BranchReleaseMojo.java | 4 ++--
.../java/org/apache/maven/plugins/release/PrepareReleaseMojo.java | 4 ++--
.../java/org/apache/maven/plugins/release/UpdateVersionsMojo.java | 4 ++--
26 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 4d67fdcf..6b3f50f4 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -25,3 +25,5 @@ jobs:
build:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
+ with:
+ maven-matrix: '[ "3.9.2", "4.0.0-alpha-5" ]'
\ No newline at end of file
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
index ed653c74..976a0f56 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -426,7 +426,7 @@ public interface ReleaseDescriptor {
/**
* Get the (optional) config for the VersionPolicy implementation used to calculate the project versions.
*
- * @return The parsed XML of the provided config (an instance of XmlPlexusConfiguration) or null.
+ * @return The parsed XML of the provided config (an instance of PlexusConfiguration) or null.
*/
Object getProjectVersionPolicyConfig();
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 2424b1a0..788446e8 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.4.1</version>
+ <version>3.4.2-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
index 7a60e629..5266e0f9 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
@@ -75,11 +75,16 @@ public class InvokerMavenExecutor extends AbstractMavenExecutor {
.setBaseDirectory(workingDirectory)
// fix for MRELEASE-1105
// .addShellEnvironment( "MAVEN_DEBUG_OPTS", "" )
- .setBatchMode(true)
+ .setBatchMode(!interactive)
.setJavaHome(releaseEnvironment.getJavaHome())
.setOutputHandler(getLogger()::info)
.setErrorHandler(getLogger()::error);
+ // for interactive mode we need some inputs stream
+ if (interactive) {
+ req.setInputStream(System.in);
+ }
+
if (pomFileName != null) {
req.setPomFileName(pomFileName);
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index af4dd462..1261b254 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -543,9 +543,10 @@ public class GenerateReleasePomsPhase extends AbstractReleasePomsPhase implement
}
releasePlugin.setExecutions(plugin.getExecutions());
releasePlugin.setDependencies(plugin.getDependencies());
- releasePlugin.setGoals(plugin.getGoals());
releasePlugin.setInherited(plugin.getInherited());
- releasePlugin.setConfiguration(plugin.getConfiguration());
+ if (plugin.getConfiguration() != null) {
+ releasePlugin.setConfiguration(plugin.getConfiguration());
+ }
releasePlugins.add(releasePlugin);
}
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 7fa64ef0..3cda4db1 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -209,6 +209,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>3.5.1</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml b/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml
index 1dbd1b2a..c3573b4b 100644
--- a/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml
+++ b/maven-release-plugin/src/it/projects/branch/MRELEASE-458/pom.xml
@@ -61,6 +61,7 @@
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
<configuration>
<updateWorkingCopyVersions>false</updateWorkingCopyVersions>
<updateBranchVersions>true</updateBranchVersions>
diff --git a/maven-release-plugin/src/it/projects/branch/MRELEASE-694/verify.groovy b/maven-release-plugin/src/it/projects/branch/MRELEASE-694/verify.groovy
index 8d7f901c..663166f1 100644
--- a/maven-release-plugin/src/it/projects/branch/MRELEASE-694/verify.groovy
+++ b/maven-release-plugin/src/it/projects/branch/MRELEASE-694/verify.groovy
@@ -18,6 +18,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
def projectBranch = new XmlSlurper().parse( new File( basedir, "pom.xml.branch" ) )
assert projectBranch.version.text() == "2.6.0-BRANCH-SNAPSHOT"
diff --git a/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml b/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml
index 4fe5757b..70af45ae 100644
--- a/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml
+++ b/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml
@@ -31,6 +31,7 @@
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
<configuration>
<suppressCommitBeforeBranch>true</suppressCommitBeforeBranch>
<branchName>branch-mrelease-745</branchName>
diff --git a/maven-release-plugin/src/it/projects/branch/MRELEASE-976/verify.groovy b/maven-release-plugin/src/it/projects/branch/MRELEASE-976/verify.groovy
index 04ff692a..b7de67c3 100644
--- a/maven-release-plugin/src/it/projects/branch/MRELEASE-976/verify.groovy
+++ b/maven-release-plugin/src/it/projects/branch/MRELEASE-976/verify.groovy
@@ -18,6 +18,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
def project = new XmlSlurper().parse( new File( basedir, "pom.xml" ) )
assert project.version.text() == "1.0-SNAPSHOT"
diff --git a/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml b/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml
index 77e304ea..3149cb96 100644
--- a/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml
+++ b/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml
@@ -66,7 +66,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.1.1</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>enforce</id>
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.1.1</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>enforce</id>
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/verify.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/verify.groovy
index f496ed48..e12d0e57 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
// check parent project
def project = new XmlSlurper().parse( new File( new File ( basedir, 'module-parent' ), 'pom.xml.next' ) )
assert project.version.text() == '1.1-SNAPSHOT'
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1077/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1077/pom.xml
index 807c401d..90142c5c 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1077/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1077/pom.xml
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<executions>
<execution>
<id>Show profiles</id>
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/verify.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/verify.groovy
index ec407136..f978353e 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/verify.groovy
@@ -18,6 +18,9 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
+
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/verify.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/verify.groovy
index 3718c548..13707099 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/verify.groovy
@@ -18,6 +18,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-571_M3/module1/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-571_M3/module1/pom.xml
index 902a69ae..60dd7444 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-571_M3/module1/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-571_M3/module1/pom.xml
@@ -40,7 +40,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
+ <version>3.3.0</version>
<executions>
<execution>
<goals>
@@ -64,7 +64,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
+ <version>3.3.0</version>
<executions>
<execution>
<goals>
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/verify.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/verify.groovy
index 1a947573..bd1a9e41 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/verify.groovy
@@ -18,6 +18,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
def project = new XmlSlurper().parse( new File( basedir, "pom.xml" ) )
assert project.version.text() == "1.0-SNAPSHOT"
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-985/verify.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-985/verify.groovy
index 4e05fc8f..bbd0de78 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-985/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-985/verify.groovy
@@ -18,6 +18,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
def project = new XmlSlurper().parse( new File( basedir, "pom.xml" ) )
assert project.version.text() == "1.0-SNAPSHOT"
assert project.parent.version.text() == "1-SNAPSHOT"
diff --git a/maven-release-plugin/src/it/projects/prepare/namespace/verify.groovy b/maven-release-plugin/src/it/projects/prepare/namespace/verify.groovy
index da22596b..b7aff067 100644
--- a/maven-release-plugin/src/it/projects/prepare/namespace/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/namespace/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
def project = new XmlSlurper().parse( new File( basedir, "pom.xml" ) )
assert project['@xsi:schemaLocation'] == "http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"
diff --git a/maven-release-plugin/src/it/projects/prepare/version-policy/verify.groovy b/maven-release-plugin/src/it/projects/prepare/version-policy/verify.groovy
index 9426c2a6..f80703a5 100644
--- a/maven-release-plugin/src/it/projects/prepare/version-policy/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/version-policy/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
diff --git a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-555/verify.groovy b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-555/verify.groovy
index e1d93037..e1a034c0 100644
--- a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-555/verify.groovy
+++ b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-555/verify.groovy
@@ -18,6 +18,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
diff --git a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-611/verify.groovy b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-611/verify.groovy
index 369c6254..46b1bd0d 100644
--- a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-611/verify.groovy
+++ b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-611/verify.groovy
@@ -18,6 +18,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
diff --git a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/verify.groovy b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/verify.groovy
index 350012e3..7691e43d 100644
--- a/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/verify.groovy
+++ b/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/verify.groovy
@@ -18,6 +18,8 @@
* under the License.
*/
+import groovy.xml.XmlSlurper
+
// verifies that the version is unchanged because of the custom policy: 1.0-SNAPSHOT -> 1.0 -> 1.0-SNAPSHOT
def project = new XmlSlurper().parse( new File( basedir, "pom.xml" ) )
assert project.version.text() == "1.0-SNAPSHOT"
diff --git a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
index b9d50628..db314c4b 100644
--- a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
+++ b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
@@ -29,7 +29,7 @@ import org.apache.maven.shared.release.ReleaseBranchRequest;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.codehaus.plexus.configuration.PlexusConfiguration;
/**
* Branch a project in SCM, using the same steps as the <code>release:prepare</code> goal, creating a branch instead of
@@ -204,7 +204,7 @@ public class BranchReleaseMojo extends AbstractScmReleaseMojo {
* @since 3.0.0
*/
@Parameter(property = "projectVersionPolicyConfig")
- private XmlPlexusConfiguration projectVersionPolicyConfig;
+ private PlexusConfiguration projectVersionPolicyConfig;
/**
* The role-hint for the {@link org.apache.maven.shared.release.policy.naming.NamingPolicy}
diff --git a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
index ff2bb8d8..58a4cc35 100644
--- a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
+++ b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
@@ -33,7 +33,7 @@ import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.ReleasePrepareRequest;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.codehaus.plexus.configuration.PlexusConfiguration;
/**
* Prepare for a release in SCM. Steps through several phases to ensure the POM is ready to be released and then
@@ -250,7 +250,7 @@ public class PrepareReleaseMojo extends AbstractScmReleaseMojo {
* @since 3.0.0
*/
@Parameter(property = "projectVersionPolicyConfig")
- private XmlPlexusConfiguration projectVersionPolicyConfig;
+ private PlexusConfiguration projectVersionPolicyConfig;
/**
* The role-hint for the {@link org.apache.maven.shared.release.policy.naming.NamingPolicy}
diff --git a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
index 253cf1b5..caf9acd9 100644
--- a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
+++ b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
@@ -28,7 +28,7 @@ import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.ReleaseUpdateVersionsRequest;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.codehaus.plexus.configuration.PlexusConfiguration;
/**
* Update the POM versions for a project. This performs the normal version updates of the <code>release:prepare</code>
@@ -97,7 +97,7 @@ public class UpdateVersionsMojo extends AbstractReleaseMojo {
* @since 3.0.0
*/
@Parameter(property = "projectVersionPolicyConfig")
- private XmlPlexusConfiguration projectVersionPolicyConfig;
+ private PlexusConfiguration projectVersionPolicyConfig;
@Override
public void execute() throws MojoExecutionException, MojoFailureException {