diff --git a/maven-invoker-3.0.1-source-release.zip b/maven-invoker-3.0.1-source-release.zip
new file mode 100644
index 0000000..fb2dfbe
--- /dev/null
+++ b/maven-invoker-3.0.1-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:067c02cf396a42388cb0804afcaf25225dd168526b2f283f2b4127de9002c33f
+size 85361
diff --git a/maven-invoker-build.xml b/maven-invoker-build.xml
index 26b4ade..8af5be7 100644
--- a/maven-invoker-build.xml
+++ b/maven-invoker-build.xml
@@ -10,7 +10,7 @@
-
+
@@ -34,6 +34,11 @@
+
+
+
+
+
@@ -66,25 +71,24 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+ description="Generate Plexus component.xml">
+
+
+
+
+
+
+
+
+
+
+
+
@@ -120,7 +124,7 @@
-
+
-
-- Upgrade to upstream version 3.1.0
- * Fixes build with maven-shared-utils 3.3.3
-
-------------------------------------------------------------------
Sun Mar 20 19:33:22 UTC 2022 - Fridrich Strba
diff --git a/maven-invoker.spec b/maven-invoker.spec
index f5433b2..5a44ff5 100644
--- a/maven-invoker.spec
+++ b/maven-invoker.spec
@@ -17,7 +17,7 @@
Name: maven-invoker
-Version: 3.1.0
+Version: 3.0.1
Release: 0
Summary: An API for firing a maven build in a clean environment
License: Apache-2.0
@@ -27,15 +27,18 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%
Source1: %{name}-build.xml
# Patch rejected upstream
Patch1: %{name}-MSHARED-279.patch
+Patch2: new-maven-shared-utils.patch
BuildRequires: ant
-BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: maven-shared-utils
-BuildRequires: sisu-inject
+BuildRequires: plexus-containers-component-annotations
+BuildRequires: plexus-metadata-generator
+BuildRequires: plexus-utils
BuildRequires: unzip
Requires: mvn(org.apache.maven.shared:maven-shared-utils)
-Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
+Requires: mvn(org.codehaus.plexus:plexus-component-annotations)
+Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch
%description
@@ -58,18 +61,18 @@ API documentation for %{name}.
%prep
%setup -q
-sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
cp %{SOURCE1} build.xml
%patch1 -p1
-%pom_change_dep javax.inject:javax.inject:1 org.eclipse.sisu:org.eclipse.sisu.inject
+%patch2 -p1
%pom_remove_parent .
%pom_xpath_inject pom:project "org.apache.maven.shared" .
%build
mkdir -p lib
-build-jar-repository -s lib maven-shared-utils org.eclipse.sisu.inject atinject
-%{ant} jar javadoc
+build-jar-repository -s lib plexus/utils plexus-containers/plexus-component-annotations maven-shared-utils/maven-shared-utils
+%{ant} \
+ jar javadoc
%install
# jar
diff --git a/new-maven-shared-utils.patch b/new-maven-shared-utils.patch
new file mode 100644
index 0000000..91e0152
--- /dev/null
+++ b/new-maven-shared-utils.patch
@@ -0,0 +1,26 @@
+diff -urEbwB maven-invoker-3.0.1/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java maven-invoker-3.0.1.new/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+--- maven-invoker-3.0.1/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java 2018-05-26 17:17:32.000000000 +0200
++++ maven-invoker-3.0.1.new/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java 2022-04-26 15:25:46.046464985 +0200
+@@ -30,6 +30,7 @@
+ import org.apache.maven.shared.invoker.InvocationRequest.ReactorFailureBehavior;
+ import org.apache.maven.shared.utils.Os;
+ import org.apache.maven.shared.utils.StringUtils;
++import org.apache.maven.shared.utils.cli.CommandLineException;
+ import org.apache.maven.shared.utils.cli.CommandLineUtils;
+ import org.apache.maven.shared.utils.cli.Commandline;
+
+@@ -259,8 +260,14 @@
+
+ if ( ( goals != null ) && !goals.isEmpty() )
+ {
++ try
++ {
+ cli.createArg().setLine( StringUtils.join( goals.iterator(), " " ) );
+ }
++ finally
++ {
++ }
++ }
+ }
+
+ protected void setProperties( InvocationRequest request, Commandline cli )