SLFO-pool/maven-invoker
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main maven-invoker revision 78c7301077a4184b6dbce7c8d03b282d

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 14:50:11 +02:00
parent d09d3eb860
commit ae04b46bd2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-invoker.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 14:55:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 25 18:38:03 UTC 2022 - Fridrich Strba <fstrba@suse.com> Mon Apr 25 18:38:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>

8
maven-invoker.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-invoker # spec file for package maven-invoker
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -30,7 +30,7 @@ Patch1: %{name}-MSHARED-279.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: atinject BuildRequires: atinject
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: maven-shared-utils >= 3.3.3 BuildRequires: maven-shared-utils >= 3.3.3
BuildRequires: sisu-inject BuildRequires: sisu-inject
BuildRequires: unzip BuildRequires: unzip
@ -60,7 +60,7 @@ API documentation for %{name}.
%setup -q %setup -q
sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
cp %{SOURCE1} build.xml cp %{SOURCE1} build.xml
%patch1 -p1 %patch -P 1 -p1
%pom_change_dep javax.inject:javax.inject:1 org.eclipse.sisu:org.eclipse.sisu.inject %pom_change_dep javax.inject:javax.inject:1 org.eclipse.sisu:org.eclipse.sisu.inject
%pom_remove_parent . %pom_remove_parent .
@ -77,7 +77,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}