commit d09d3eb8600aa4086d768247644734f3b86b1d0781ed6bfed197b8b53c29e5ab Author: Adrian Schröter Date: Fri May 3 16:38:13 2024 +0200 Sync from SUSE:SLFO:Main maven-invoker revision bf065591882757caca5cb3cc07d1cbdf diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text 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-MSHARED-279.patch b/maven-invoker-MSHARED-279.patch new file mode 100644 index 0000000..1faf608 --- /dev/null +++ b/maven-invoker-MSHARED-279.patch @@ -0,0 +1,26 @@ +From 97b2ceb3544c035459341278d45cef2e44c21c7b Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 13 Mar 2013 13:36:26 +0100 +Subject: [PATCH 2/2] Fix MSHARED-279 + +See: http://jira.codehaus.org/browse/MSHARED-279 +--- + .../java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java +index 35ab16b..082c988 100644 +--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java ++++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java +@@ -536,7 +536,7 @@ public class MavenCommandLineBuilder + if ( mavenHome == null ) + { + String mavenHomeProperty = System.getProperty( "maven.home" ); +- if ( mavenHomeProperty != null ) ++ if ( StringUtils.isNotEmpty( mavenHomeProperty ) ) + { + mavenHome = new File( mavenHomeProperty ); + if ( !mavenHome.isDirectory() ) +-- +1.8.1.4 + diff --git a/maven-invoker-build.xml b/maven-invoker-build.xml new file mode 100644 index 0000000..3a8f587 --- /dev/null +++ b/maven-invoker-build.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven-invoker.changes b/maven-invoker.changes new file mode 100644 index 0000000..e1cfacd --- /dev/null +++ b/maven-invoker.changes @@ -0,0 +1,40 @@ +------------------------------------------------------------------- +Mon Apr 25 18:38:03 UTC 2022 - Fridrich Strba + +- Upgrade to upstream version 3.1.0 + * Improvement: + + MSHARED-702 – Remove hard coded versions for + plexus-component-annotations/plexus-component-metadata + * Tasks: + + MSHARED-625 – Refactored to use ‘maven-shared-utils’ instead + of 'plexus-utils'. + + MSHARED-729 – Upgrade to JDK 7 minimum. + * Dependency upgrades: + + MSHARED-700 – Upgrade parent to 31 + + MSHARED-728 – Upgrade maven-shared-utils to 3.2.1 + * Fixes build with maven-shared-utils 3.3.3 + +------------------------------------------------------------------- +Sun Mar 20 19:33:22 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + +------------------------------------------------------------------- +Thu Nov 21 14:17:41 UTC 2019 - Fridrich Strba + +- Upgrade to upstream version 3.0.1 + * needed by xmvn-tools >= 3.1.0 +- Modified patch: + * maven-invoker-MSHARED-279.patch + + rediff to changed context + +------------------------------------------------------------------- +Mon Apr 1 23:01:37 UTC 2019 - Jan Engelhardt + +- Use noun phrase in summary. + +------------------------------------------------------------------- +Thu Mar 14 08:05:46 UTC 2019 - Fridrich Strba + +- Initial packaging of maven-invoker 2.2 +- Generate and customize ant build.xml file diff --git a/maven-invoker.spec b/maven-invoker.spec new file mode 100644 index 0000000..0d12494 --- /dev/null +++ b/maven-invoker.spec @@ -0,0 +1,94 @@ +# +# spec file for package maven-invoker +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: maven-invoker +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: 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 >= 3.3.3 +BuildRequires: sisu-inject +BuildRequires: unzip +Requires: mvn(org.apache.maven.shared:maven-shared-utils) +Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) +BuildArch: noarch + +%description +This API is concerned with firing a Maven build in a new JVM. It accomplishes +its task by building up a conventional Maven command line from options given in +the current request, along with those global options specified in the invoker +itself. Once it has the command line, the invoker will execute it, and capture +the resulting exit code or any exception thrown to signal a failure to execute. +Input/output control can be specified using an InputStream and up to two +InvocationOutputHandlers. + +This is a replacement package for maven-shared-invoker + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +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 maven-shared-utils org.eclipse.sisu.inject atinject +%{ant} jar javadoc + +%install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc +%license LICENSE NOTICE +%{_javadocdir}/%{name} + +%changelog