diff --git a/plexus-io-3.4.1.tar.gz b/plexus-io-3.4.1.tar.gz new file mode 100644 index 0000000..a3d458a --- /dev/null +++ b/plexus-io-3.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c71348dfcf16284895ecb4498a61e60b2955bf4b7db3c986c44ad220b136e77a +size 43042 diff --git a/plexus-io-build.xml b/plexus-io-build.xml new file mode 100644 index 0000000..a651249 --- /dev/null +++ b/plexus-io-build.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plexus-io.spec b/plexus-io.spec index 0f57069..5f3b7cc 100644 --- a/plexus-io.spec +++ b/plexus-io.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-io # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,8 @@ # -%bcond_with tests Name: plexus-io -Version: 3.2.0 +Version: 3.4.1 Release: 0 Summary: Plexus IO Components License: Apache-2.0 @@ -29,20 +28,13 @@ Source1: %{name}-build.xml Source2: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: ant BuildRequires: apache-commons-io +BuildRequires: atinject BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jsr-305 BuildRequires: plexus-utils >= 3.3.0 -Requires: mvn(commons-io:commons-io) -Requires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: sisu-inject BuildArch: noarch -%if %{with tests} -BuildRequires: ant-junit -BuildRequires: guava -BuildRequires: plexus-classworlds -BuildRequires: plexus-containers-container-default -BuildRequires: xbean -%endif %description Plexus IO is a set of plexus components, which are designed for use @@ -63,22 +55,11 @@ cp %{SOURCE2} . %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-enforcer-plugin -%pom_remove_parent - -%pom_xpath_inject "pom:project" "org.codehaus.plexus" - %build mkdir -p lib -build-jar-repository -s lib plexus/utils commons-io jsr-305 -%if %{with tests} -build-jar-repository -s lib plexus-containers/plexus-container-default plexus/classworlds -build-jar-repository -s lib guava/guava xbean/xbean-reflect -%endif +build-jar-repository -s lib atinject org.eclipse.sisu.inject plexus/utils commons-io jsr-305 %{ant} \ -%if %{without tests} - -Dtest.skip=true \ -%endif jar javadoc %install @@ -87,7 +68,7 @@ install -dm 0755 %{buildroot}%{_javadir}/plexus install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/io.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/io.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/io.pom %add_maven_depmap plexus/io.pom plexus/io.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}