This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new edd8cc8c66 upgrade exec-maven-plugin to 3.1.0.
new 542bf84239 Merge pull request #5111 from mbien/maven-exec-310
edd8cc8c66 is described below
commit edd8cc8c6679cc105d83a7339031497c17d0f9dd
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Wed Dec 14 22:37:51 2022 +0100
upgrade exec-maven-plugin to 3.1.0.
---
.../modules/maven/execute/defaultActionMappings.xml | 12 ++++++------
.../maven/api/customizer/ModelHandle2Test.java | 8 ++++----
.../maven/execute/MavenExecutionTestBase.java | 2 +-
.../modules/maven/execute/ModelRunConfigTest.java | 20 +-------------------
.../modules/maven/runjar/nbactions-template.xml | 6 +++---
.../spi/actions/ProvidedConfigurationsTest.java | 2 +-
6 files changed, 16 insertions(+), 34 deletions(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/execute/defaultActionMappings.xml
b/java/maven/src/org/netbeans/modules/maven/execute/defaultActionMappings.xml
index 6c1769cc24..a030ddf029 100644
---
a/java/maven/src/org/netbeans/modules/maven/execute/defaultActionMappings.xml
+++
b/java/maven/src/org/netbeans/modules/maven/execute/defaultActionMappings.xml
@@ -115,7 +115,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
<exec.vmArgs></exec.vmArgs>
@@ -132,7 +132,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
<exec.vmArgs>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
@@ -150,7 +150,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
<exec.vmArgs></exec.vmArgs>
@@ -168,7 +168,7 @@
</packagings>
<goals>
<goal>process-test-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
<exec.vmArgs>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
@@ -236,7 +236,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
<exec.vmArgs></exec.vmArgs>
@@ -253,7 +253,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
<exec.vmArgs></exec.vmArgs>
diff --git
a/java/maven/test/unit/src/org/netbeans/modules/maven/api/customizer/ModelHandle2Test.java
b/java/maven/test/unit/src/org/netbeans/modules/maven/api/customizer/ModelHandle2Test.java
index e0b1446436..d0d66a131a 100644
---
a/java/maven/test/unit/src/org/netbeans/modules/maven/api/customizer/ModelHandle2Test.java
+++
b/java/maven/test/unit/src/org/netbeans/modules/maven/api/customizer/ModelHandle2Test.java
@@ -162,7 +162,7 @@ public class ModelHandle2Test extends NbTestCase {
" </packagings>\n" +
" <goals>\n" +
" <goal>process-classes</goal>\n" +
-"
<goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>\n" +
+"
<goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>\n" +
" </goals>\n" +
" <properties>\n" +
" <exec.args>-classpath %classpath
${packageClassName}</exec.args>\n" +
@@ -177,7 +177,7 @@ public class ModelHandle2Test extends NbTestCase {
" </packagings>\n" +
" <goals>\n" +
" <goal>process-classes</goal>\n" +
-"
<goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>\n" +
+"
<goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>\n" +
" </goals>\n" +
" <properties>\n" +
"
<exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}
-classpath %classpath ${packageClassName}</exec.args>\n" +
@@ -199,7 +199,7 @@ public class ModelHandle2Test extends NbTestCase {
" </packagings>\n" +
" <goals>\n" +
" <goal>process-classes</goal>\n" +
-"
<goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>\n" +
+"
<goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>\n" +
" </goals>\n" +
" <properties>\n" +
"
<exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}
-classpath %classpath ${packageClassName}</exec.args>\n" +
@@ -223,7 +223,7 @@ public class ModelHandle2Test extends NbTestCase {
RunConfig run =
ActionToGoalUtils.createRunConfig("debug.single.main", (NbMavenProjectImpl)
project, project.getLookup());
assertEquals("Two goals: " + run.getGoals(), 2,
run.getGoals().size());
assertEquals("process-classes", run.getGoals().get(0));
- assertEquals("org.codehaus.mojo:exec-maven-plugin:3.0.0:exec",
run.getGoals().get(1));
+ assertEquals("org.codehaus.mojo:exec-maven-plugin:3.1.0:exec",
run.getGoals().get(1));
assertEquals("One profile activated in action: " +
run.getActivatedProfiles(), 1, run.getActivatedProfiles().size());
assertEquals("jetty", run.getActivatedProfiles().get(0));
}
diff --git
a/java/maven/test/unit/src/org/netbeans/modules/maven/execute/MavenExecutionTestBase.java
b/java/maven/test/unit/src/org/netbeans/modules/maven/execute/MavenExecutionTestBase.java
index 38666c342f..ecefcf38c8 100644
---
a/java/maven/test/unit/src/org/netbeans/modules/maven/execute/MavenExecutionTestBase.java
+++
b/java/maven/test/unit/src/org/netbeans/modules/maven/execute/MavenExecutionTestBase.java
@@ -183,7 +183,7 @@ public class MavenExecutionTestBase extends NbTestCase {
+ " <plugin>\n"
+ " <groupId>org.codehaus.mojo</groupId>\n"
+ "
<artifactId>exec-maven-plugin</artifactId>\n"
- + " <version>3.0.0</version>\n"
+ + " <version>3.1.0</version>\n"
+ " <configuration>\n"
+ argsString
+ " </configuration>\n"
diff --git
a/java/maven/test/unit/src/org/netbeans/modules/maven/execute/ModelRunConfigTest.java
b/java/maven/test/unit/src/org/netbeans/modules/maven/execute/ModelRunConfigTest.java
index fbb8c6e19f..612a6b57a0 100644
---
a/java/maven/test/unit/src/org/netbeans/modules/maven/execute/ModelRunConfigTest.java
+++
b/java/maven/test/unit/src/org/netbeans/modules/maven/execute/ModelRunConfigTest.java
@@ -20,32 +20,14 @@
package org.netbeans.modules.maven.execute;
import java.io.IOException;
-import org.netbeans.modules.maven.api.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.function.Function;
import static junit.framework.TestCase.assertEquals;
-import org.apache.maven.project.MavenProject;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.junit.NbTestCase;
-import org.netbeans.modules.maven.api.ModelUtils.Descriptor;
-import org.netbeans.modules.maven.api.ModelUtils.LibraryDescriptor;
import org.netbeans.modules.maven.api.customizer.ModelHandle2;
import org.netbeans.modules.maven.configurations.M2ConfigProvider;
-import org.netbeans.modules.maven.configurations.M2Configuration;
import org.netbeans.modules.maven.execute.ModelRunConfig;
import org.netbeans.modules.maven.execute.model.NetbeansActionMapping;
-import org.netbeans.modules.maven.model.ModelOperation;
-import org.netbeans.modules.maven.model.Utilities;
-import org.netbeans.modules.maven.model.pom.POMModel;
-import org.netbeans.modules.maven.model.pom.Repository;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.test.TestFileUtils;
@@ -260,7 +242,7 @@ public class ModelRunConfigTest extends NbTestCase {
+ " <plugin>\n"
+ " <groupId>org.codehaus.mojo</groupId>\n"
+ "
<artifactId>exec-maven-plugin</artifactId>\n"
- + " <version>3.0.0</version>\n"
+ + " <version>3.1.0</version>\n"
+ " <configuration>\n"
+ "
<executable>${java.home}/bin/java</executable>\n"
+ argsString
diff --git
a/java/maven/test/unit/src/org/netbeans/modules/maven/runjar/nbactions-template.xml
b/java/maven/test/unit/src/org/netbeans/modules/maven/runjar/nbactions-template.xml
index 79b91bbeb9..f3105025af 100644
---
a/java/maven/test/unit/src/org/netbeans/modules/maven/runjar/nbactions-template.xml
+++
b/java/maven/test/unit/src/org/netbeans/modules/maven/runjar/nbactions-template.xml
@@ -27,7 +27,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
&runProperties;
@@ -40,7 +40,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
&debugProperties;
@@ -53,7 +53,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
- <goal>org.codehaus.mojo:exec-maven-plugin:3.0.0:exec</goal>
+ <goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
</goals>
<properties>
&profileProperties;
diff --git
a/java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java
b/java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java
index 88438fef48..d15793e1be 100644
---
a/java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java
+++
b/java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java
@@ -144,7 +144,7 @@ public class ProvidedConfigurationsTest extends NbTestCase {
RunConfig cfg = ActionToGoalUtils.createRunConfig("run", pimpl,
Lookup.EMPTY);
assertEquals(Arrays.asList(
"process-classes",
- "org.codehaus.mojo:exec-maven-plugin:3.0.0:exec"),
cfg.getGoals());
+ "org.codehaus.mojo:exec-maven-plugin:3.1.0:exec"),
cfg.getGoals());
ProjectConfigurationProvider<MavenConfiguration> pcp =
p.getLookup().lookup(ProjectConfigurationProvider.class);
MavenConfiguration c = pcp.getConfigurations().stream().filter(x ->
"Micronaut: dev mode".equals(x.getDisplayName())).findAny().get();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
