From 1985e9dfb16d18dffe5cbde152f5e2f20c6dd8d1496f4ac5d980f10857d1e502 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Apr 2022 18:38:48 +0000 Subject: [PATCH 1/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=10 --- maven-invoker-3.0.1-source-release.zip | 3 - maven-invoker-3.1.0-source-release.zip | 3 + maven-invoker-build.xml | 139 ++++--------------------- maven-invoker.changes | 6 ++ maven-invoker.spec | 34 ++---- 5 files changed, 38 insertions(+), 147 deletions(-) delete mode 100644 maven-invoker-3.0.1-source-release.zip create mode 100644 maven-invoker-3.1.0-source-release.zip diff --git a/maven-invoker-3.0.1-source-release.zip b/maven-invoker-3.0.1-source-release.zip deleted file mode 100644 index fb2dfbe..0000000 --- a/maven-invoker-3.0.1-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:067c02cf396a42388cb0804afcaf25225dd168526b2f283f2b4127de9002c33f -size 85361 diff --git a/maven-invoker-3.1.0-source-release.zip b/maven-invoker-3.1.0-source-release.zip new file mode 100644 index 0000000..ed565ed --- /dev/null +++ b/maven-invoker-3.1.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be08a9c7c88745e7ab50389ad50c9a14dbb03ec150d51622b531796ae221b757 +size 89480 diff --git a/maven-invoker-build.xml b/maven-invoker-build.xml index 9df7f09..26b4ade 100644 --- a/maven-invoker-build.xml +++ b/maven-invoker-build.xml @@ -10,7 +10,7 @@ - + @@ -22,10 +22,7 @@ - - - - + @@ -37,11 +34,6 @@ - - - - - @@ -74,118 +66,25 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== + description="Generate javax.inject.Name index"> + + + + + + + + + + + @@ -221,7 +120,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 48647a9..4c6cc29 100644 --- a/maven-invoker.spec +++ b/maven-invoker.spec @@ -16,36 +16,27 @@ # -%bcond_with tests Name: maven-invoker -Version: 3.0.1 +Version: 3.1.0 Release: 0 Summary: An API for firing a maven build in a clean environment License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org/shared/maven-invoker/ -Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip +URL: https://maven.apache.org/shared/maven-invoker/ +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: %{name}-build.xml # Patch rejected upstream Patch1: %{name}-MSHARED-279.patch BuildRequires: ant +BuildRequires: atinject BuildRequires: fdupes BuildRequires: javapackages-local BuildRequires: maven-shared-utils -BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-metadata-generator -BuildRequires: plexus-utils +BuildRequires: sisu-inject BuildRequires: unzip Requires: mvn(org.apache.maven.shared:maven-shared-utils) -Requires: mvn(org.codehaus.plexus:plexus-component-annotations) -Requires: mvn(org.codehaus.plexus:plexus-utils) +Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) BuildArch: noarch -%if %{with tests} -BuildRequires: ant-junit -BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin) -%endif %description This API is concerned with firing a Maven build in a new JVM. It accomplishes @@ -67,23 +58,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 %pom_remove_parent . %pom_xpath_inject pom:project "org.apache.maven.shared" . %build mkdir -p lib -build-jar-repository -s lib plexus/utils plexus-containers/plexus-component-annotations maven-shared-utils/maven-shared-utils -%if %{with tests} - export M2_HOME=%{_datadir}/xmvn -%endif -%{ant} \ -%if %{without tests} - -Dtest.skip=true \ -%endif - jar javadoc +build-jar-repository -s lib maven-shared-utils org.eclipse.sisu.inject atinject +%{ant} jar javadoc %install # jar From af1ea98403ea6f6f773b7fa1dc4403376822987163077cf2379896a16f4b8a28 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 08:35:09 +0000 Subject: [PATCH 2/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=11 --- maven-invoker.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maven-invoker.spec b/maven-invoker.spec index 4c6cc29..8ab0dde 100644 --- a/maven-invoker.spec +++ b/maven-invoker.spec @@ -34,8 +34,8 @@ BuildRequires: javapackages-local BuildRequires: maven-shared-utils BuildRequires: sisu-inject BuildRequires: unzip +Requires: mvn(javax.inject:javax.inject) Requires: mvn(org.apache.maven.shared:maven-shared-utils) -Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) BuildArch: noarch %description @@ -61,7 +61,6 @@ API documentation for %{name}. 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 %pom_remove_parent . %pom_xpath_inject pom:project "org.apache.maven.shared" . From 19b97988823fac120a20f979e036b63d4f712ad851482c9755beccc7e589405a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 10:29:41 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=12 --- maven-invoker.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven-invoker.spec b/maven-invoker.spec index 8ab0dde..f5433b2 100644 --- a/maven-invoker.spec +++ b/maven-invoker.spec @@ -34,8 +34,8 @@ BuildRequires: javapackages-local BuildRequires: maven-shared-utils BuildRequires: sisu-inject BuildRequires: unzip -Requires: mvn(javax.inject:javax.inject) Requires: mvn(org.apache.maven.shared:maven-shared-utils) +Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) BuildArch: noarch %description @@ -61,6 +61,7 @@ API documentation for %{name}. 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 %pom_remove_parent . %pom_xpath_inject pom:project "org.apache.maven.shared" . From 98b6423db2a68bfe2615548e8e6c8e761cfb06435c7e893657ebd229497f6f4c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 13:30:24 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=13 --- maven-invoker-3.0.1-source-release.zip | 3 ++ maven-invoker-build.xml | 40 ++++++++++++++------------ maven-invoker.changes | 6 ---- maven-invoker.spec | 19 ++++++------ new-maven-shared-utils.patch | 26 +++++++++++++++++ 5 files changed, 62 insertions(+), 32 deletions(-) create mode 100644 maven-invoker-3.0.1-source-release.zip create mode 100644 new-maven-shared-utils.patch 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 ) From a230652a6f94d665f95a14991e0d00aae9aaae7834b71f1b7cc68abee1e7e55c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 13:31:02 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=14 --- maven-invoker-3.1.0-source-release.zip | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 maven-invoker-3.1.0-source-release.zip diff --git a/maven-invoker-3.1.0-source-release.zip b/maven-invoker-3.1.0-source-release.zip deleted file mode 100644 index ed565ed..0000000 --- a/maven-invoker-3.1.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be08a9c7c88745e7ab50389ad50c9a14dbb03ec150d51622b531796ae221b757 -size 89480 From 94cfa74d75df86321e96be519ee3789fcfda181db0224ce2445a697e5b3cc834 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 13:48:59 +0000 Subject: [PATCH 6/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=15 --- new-maven-shared-utils.patch | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/new-maven-shared-utils.patch b/new-maven-shared-utils.patch index 91e0152..927215a 100644 --- a/new-maven-shared-utils.patch +++ b/new-maven-shared-utils.patch @@ -1,15 +1,6 @@ -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 @@ ++++ maven-invoker-3.0.1/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java 2022-04-26 15:25:46.046464985 +0200 +@@ -259,8 +259,14 @@ if ( ( goals != null ) && !goals.isEmpty() ) { From 01ba9241eb03bfc613ad23151ae0b313a9b7665a618a09f23723e4bbcbc11624 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 13:50:30 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=16 --- maven-invoker.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-invoker.spec b/maven-invoker.spec index 5a44ff5..6c45cdd 100644 --- a/maven-invoker.spec +++ b/maven-invoker.spec @@ -25,9 +25,9 @@ Group: Development/Libraries/Java URL: https://maven.apache.org/shared/maven-invoker/ Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: %{name}-build.xml +Patch0: new-maven-shared-utils.patch # Patch rejected upstream Patch1: %{name}-MSHARED-279.patch -Patch2: new-maven-shared-utils.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -62,8 +62,8 @@ API documentation for %{name}. %prep %setup -q cp %{SOURCE1} build.xml +%patch0 -p1 %patch1 -p1 -%patch2 -p1 %pom_remove_parent . %pom_xpath_inject pom:project "org.apache.maven.shared" . From 2abe2d9a973fd95b9815ad78646ea04dcdd144d457dd59042677def2e0df5fbe Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 14:06:08 +0000 Subject: [PATCH 8/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=17 --- new-maven-shared-utils.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new-maven-shared-utils.patch b/new-maven-shared-utils.patch index 927215a..cd96376 100644 --- a/new-maven-shared-utils.patch +++ b/new-maven-shared-utils.patch @@ -8,7 +8,7 @@ + { cli.createArg().setLine( StringUtils.join( goals.iterator(), " " ) ); } -+ finally ++ catch (Exception e) + { + } + } From 151a3c732d57b570b253f04d6e2744f946f65e39da028574697aeefba1b3ce89 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 16:56:07 +0000 Subject: [PATCH 9/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=18 --- maven-invoker-3.0.1-source-release.zip | 3 -- maven-invoker-3.1.0-source-release.zip | 3 ++ maven-invoker-build.xml | 62 ++++++++++++-------------- maven-invoker.changes | 6 +++ maven-invoker.spec | 21 ++++----- new-maven-shared-utils.patch | 17 ------- 6 files changed, 47 insertions(+), 65 deletions(-) delete mode 100644 maven-invoker-3.0.1-source-release.zip create mode 100644 maven-invoker-3.1.0-source-release.zip delete mode 100644 new-maven-shared-utils.patch diff --git a/maven-invoker-3.0.1-source-release.zip b/maven-invoker-3.0.1-source-release.zip deleted file mode 100644 index fb2dfbe..0000000 --- a/maven-invoker-3.0.1-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:067c02cf396a42388cb0804afcaf25225dd168526b2f283f2b4127de9002c33f -size 85361 diff --git a/maven-invoker-3.1.0-source-release.zip b/maven-invoker-3.1.0-source-release.zip new file mode 100644 index 0000000..ed565ed --- /dev/null +++ b/maven-invoker-3.1.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be08a9c7c88745e7ab50389ad50c9a14dbb03ec150d51622b531796ae221b757 +size 89480 diff --git a/maven-invoker-build.xml b/maven-invoker-build.xml index 8af5be7..3a8f587 100644 --- a/maven-invoker-build.xml +++ b/maven-invoker-build.xml @@ -10,7 +10,7 @@ - + @@ -34,11 +34,6 @@ - - - - - @@ -71,24 +66,25 @@ - + - - - - - - - - - - - - - + description="Generate javax.inject.Name index"> + + + + + + + + + + + @@ -124,24 +120,24 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/maven-invoker.changes b/maven-invoker.changes index eda22de..c587072 100644 --- a/maven-invoker.changes +++ b/maven-invoker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 25 18:38:03 UTC 2022 - Fridrich Strba + +- 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 6c45cdd..0d12494 100644 --- a/maven-invoker.spec +++ b/maven-invoker.spec @@ -17,7 +17,7 @@ Name: maven-invoker -Version: 3.0.1 +Version: 3.1.0 Release: 0 Summary: An API for firing a maven build in a clean environment License: Apache-2.0 @@ -25,20 +25,17 @@ Group: Development/Libraries/Java URL: https://maven.apache.org/shared/maven-invoker/ Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: %{name}-build.xml -Patch0: new-maven-shared-utils.patch # Patch rejected upstream Patch1: %{name}-MSHARED-279.patch BuildRequires: ant +BuildRequires: atinject BuildRequires: fdupes BuildRequires: javapackages-local -BuildRequires: maven-shared-utils -BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-metadata-generator -BuildRequires: plexus-utils +BuildRequires: maven-shared-utils >= 3.3.3 +BuildRequires: sisu-inject BuildRequires: unzip Requires: mvn(org.apache.maven.shared:maven-shared-utils) -Requires: mvn(org.codehaus.plexus:plexus-component-annotations) -Requires: mvn(org.codehaus.plexus:plexus-utils) +Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) BuildArch: noarch %description @@ -61,18 +58,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 -%patch0 -p1 %patch1 -p1 +%pom_change_dep javax.inject:javax.inject:1 org.eclipse.sisu:org.eclipse.sisu.inject %pom_remove_parent . %pom_xpath_inject pom:project "org.apache.maven.shared" . %build mkdir -p lib -build-jar-repository -s lib plexus/utils plexus-containers/plexus-component-annotations maven-shared-utils/maven-shared-utils -%{ant} \ - jar javadoc +build-jar-repository -s lib maven-shared-utils org.eclipse.sisu.inject atinject +%{ant} jar javadoc %install # jar diff --git a/new-maven-shared-utils.patch b/new-maven-shared-utils.patch deleted file mode 100644 index cd96376..0000000 --- a/new-maven-shared-utils.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java 2022-04-26 15:25:46.046464985 +0200 -@@ -259,8 +259,14 @@ - - if ( ( goals != null ) && !goals.isEmpty() ) - { -+ try -+ { - cli.createArg().setLine( StringUtils.join( goals.iterator(), " " ) ); - } -+ catch (Exception e) -+ { -+ } -+ } - } - - protected void setProperties( InvocationRequest request, Commandline cli )