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

Sync from SUSE:SLFO:Main plexus-cli revision 8314aa8b030346f70923748ed6fed893

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 14:56:32 +02:00
parent a7ec69846b
commit fcd3ffd631
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plexus-cli.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun May 26 22:38:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use the org.eclipse.sisu:org.eclipse.sisu.plexus artifact to
avoid conflict/choise of providers
-------------------------------------------------------------------
Tue Feb 20 14:44:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 19 07:38:31 UTC 2022 - Fridrich Strba <fstrba@suse.com> Thu May 19 07:38:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>

19
plexus-cli.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package plexus-cli # spec file for package plexus-cli
# #
# 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
@ -32,14 +32,11 @@ Patch1: 0002-No-unchecked-operations.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-cli BuildRequires: apache-commons-cli
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils BuildRequires: plexus-utils
BuildRequires: sisu-plexus
BuildRequires: xz BuildRequires: xz
Requires: mvn(commons-cli:commons-cli)
Requires: mvn(org.codehaus.plexus:plexus-container-default)
Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
BuildRequires: ant-junit BuildRequires: ant-junit
@ -62,15 +59,15 @@ Javadoc for %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch -P 0 -p1
%patch1 -p1 %patch -P 1 -p1
cp -p %{SOURCE1} . cp -p %{SOURCE1} .
cp -p %{SOURCE100} build.xml cp -p %{SOURCE100} build.xml
%pom_remove_parent %pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
mkdir -p lib mkdir -p lib
build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds plexus-containers/plexus-container-default build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds org.eclipse.sisu.plexus
%if %{with tests} %if %{with tests}
build-jar-repository -s lib guava/guava build-jar-repository -s lib guava/guava
%endif %endif
@ -88,7 +85,7 @@ install -dm 0755 %{buildroot}%{_javadir}/plexus
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/cli.jar install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/cli.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/cli.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/cli.pom
%add_maven_depmap plexus/cli.pom plexus/cli.jar %add_maven_depmap plexus/cli.pom plexus/cli.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}