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

Sync from SUSE:SLFO:Main maven-shared-utils revision 2bcce54c2d2f9cde69aa33ecbc2b8f90

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 14:52:28 +02:00
parent 3934c1b5c6
commit 873c6aa5b9
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
maven-shared-utils.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun May 26 22:42:50 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use the org.eclipse.sisu:org.eclipse.sisu.plexus artifact in
order to avoid conflict/choise of providers
-------------------------------------------------------------------
Wed Feb 21 15:14:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Wed May 3 11:24:22 UTC 2023 - Fridrich Strba <fstrba@suse.com>

18
maven-shared-utils.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package maven-shared-utils
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,13 +32,12 @@ BuildRequires: ant
BuildRequires: apache-commons-io
BuildRequires: fdupes
BuildRequires: jansi
BuildRequires: javapackages-local
BuildRequires: javapackages-local >= 6
BuildRequires: jsr-305
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
BuildRequires: sisu-plexus
BuildRequires: unzip
Requires: mvn(commons-io:commons-io)
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
@ -66,17 +65,14 @@ API documentation for %{name}.
%setup -q
cp %{SOURCE1} build.xml
%patch0 -p1
%patch -P 0 -p1
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
%pom_remove_parent .
%pom_xpath_inject pom:project "<groupId>org.apache.maven.shared</groupId>" .
%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
%build
mkdir -p lib
build-jar-repository -s lib commons-io jansi/jansi jsr305 \
plexus/classworlds plexus-containers/plexus-container-default plexus/utils
org.eclipse.sisu.plexus plexus/classworlds plexus/utils
%if %{with tests}
build-jar-repository -s lib commons-lang3 maven/maven-artifact maven/maven-core \
maven/maven-model maven-plugin-testing/maven-plugin-testing-harness \
@ -95,7 +91,7 @@ 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
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}