You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/02/02 15:07:17 UTC
[maven-invoker] branch MSHARED-976 created (now 716d4f6)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-976
in repository https://gitbox.apache.org/repos/asf/maven-invoker.git.
at 716d4f6 [MSHARED-976] Assume Maven 3.1.1/migrate from Plexus to JSR-330
This branch includes the following new commits:
new 0f17932 (tests) Bump junit
new cc13a28 (doc) quick fixes to pom
new 716d4f6 [MSHARED-976] Assume Maven 3.1.1/migrate from Plexus to JSR-330
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-invoker] 01/03: (tests) Bump junit
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-976
in repository https://gitbox.apache.org/repos/asf/maven-invoker.git
commit 0f179326b07bc002bd1abf0d7cc07578eded19bc
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Dec 28 12:23:38 2020 +0100
(tests) Bump junit
---
src/test/resources/test-build-should-timeout/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/resources/test-build-should-timeout/pom.xml b/src/test/resources/test-build-should-timeout/pom.xml
index 1826d20..711ffd0 100644
--- a/src/test/resources/test-build-should-timeout/pom.xml
+++ b/src/test/resources/test-build-should-timeout/pom.xml
@@ -27,7 +27,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
[maven-invoker] 03/03: [MSHARED-976] Assume Maven 3.1.1/migrate
from Plexus to JSR-330
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-976
in repository https://gitbox.apache.org/repos/asf/maven-invoker.git
commit 716d4f6119be373a799d2698f1006410461efec6
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Feb 2 16:07:03 2021 +0100
[MSHARED-976] Assume Maven 3.1.1/migrate from Plexus to JSR-330
---
pom.xml | 15 +++++++++------
.../org/apache/maven/shared/invoker/DefaultInvoker.java | 8 +++++---
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 63832b1..097e515 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@ under the License.
<properties>
<javaVersion>7</javaVersion>
+ <mavenVersion>3.1.1</mavenVersion>
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
</properties>
@@ -78,8 +79,9 @@ under the License.
<version>3.2.1</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -109,13 +111,14 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
+ <version>0.3.4</version>
<executions>
<execution>
- <id>create-component-descriptor</id>
+ <id>generate-index</id>
<goals>
- <goal>generate-metadata</goal>
+ <goal>main-index</goal>
</goals>
</execution>
</executions>
diff --git a/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java b/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
index e58d131..be0f30c 100644
--- a/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
+++ b/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
@@ -25,18 +25,20 @@ import java.io.InputStream;
import org.apache.maven.shared.utils.cli.CommandLineException;
import org.apache.maven.shared.utils.cli.CommandLineUtils;
import org.apache.maven.shared.utils.cli.Commandline;
-import org.codehaus.plexus.component.annotations.Component;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
/**
* Class intended to be used by clients who wish to invoke a forked Maven process from their applications
*
* @author jdcasey
*/
-@Component( role = Invoker.class, hint = "default" )
+@Named
+@Singleton
public class DefaultInvoker
implements Invoker
{
-
public static final String ROLE_HINT = "default";
private static final InvokerLogger DEFAULT_LOGGER = new SystemOutLogger();
[maven-invoker] 02/03: (doc) quick fixes to pom
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-976
in repository https://gitbox.apache.org/repos/asf/maven-invoker.git
commit cc13a289fb74a951bd0e10a88eca6e6458a36b96
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Feb 2 16:05:25 2021 +0100
(doc) quick fixes to pom
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4c245ef..63832b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
<version>34</version>
- <relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
+ <relativePath/>
</parent>
@@ -44,7 +44,7 @@ under the License.
</scm>
<issueManagement>
<system>jira</system>
- <url>https://issues.apache.org/jira/browse/MSHARED/component/12326433</url>
+ <url>https://issues.apache.org/jira/issues/?jql=project%20%3D%20MSHARED%20AND%20component%20%3D%20maven-invoker</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>