Accepting request 1176981 from Java:packages

fix conflict/choice of providers

OBS-URL: https://build.opensuse.org/request/show/1176981
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-shared-io?expand=0&rev=6

maven-shared-io.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sun May 26 19:21:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Do not add PROVIDED dependency on plexus-container-default
+
+-------------------------------------------------------------------
+Thu May 16 05:18:49 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use sisu-plexus instead of plexus-containers-container-default
+
+-------------------------------------------------------------------
+Wed Feb 21 10:51:04 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Wed Sep  6 22:37:02 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Remove unnecessary dependency on xmvn tools and parent pom
+
 -------------------------------------------------------------------
 Mon Mar 21 04:40:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

maven-shared-io.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-shared-io
 #
-# Copyright (c) 2022 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
@@ -22,23 +22,20 @@ Release:        0
 Summary:        API for I/O support like logging, download or file scanning
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/shared/maven-shared-io
-Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+URL:            https://maven.apache.org/shared/maven-shared-io
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.xml
 # Rejected upstream: https://issues.apache.org/jira/browse/MSHARED-490
 Patch0:         0001-Fix-running-tests-with-Maven-3.3.9.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  maven-lib
 BuildRequires:  maven-shared-utils
 BuildRequires:  maven-wagon-provider-api
-BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
+BuildRequires:  sisu-plexus
 BuildRequires:  unzip
-BuildRequires:  xmvn-install
-BuildRequires:  xmvn-resolve
-BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
 BuildArch:      noarch
 
 %description
@@ -54,9 +51,7 @@ API documentation for %{name}.
 %prep
 %setup -q
 cp %{SOURCE1} build.xml
-%patch0 -p1
-
-%pom_add_dep org.codehaus.plexus:plexus-container-default::provided
+%patch -P 0 -p1
 
 %build
 mkdir -p lib
@@ -67,24 +62,32 @@ build-jar-repository -s lib \
   maven/maven-plugin-api \
   maven-wagon/provider-api \
   maven-shared-utils/maven-shared-utils \
-  plexus/utils \
-  plexus-containers/plexus-container-default
+  org.eclipse.sisu.plexus \
+  plexus/utils
 
 # Some of the tests cannot run outside maven
 %{ant} \
   -Dtest.skip=true \
   jar javadoc
 
-%mvn_artifact pom.xml target/%{name}-%{version}.jar
-
 %install
-%mvn_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}
+%{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}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
 %license LICENSE NOTICE
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
 %license LICENSE NOTICE
 
 %changelog