From f2a39dfc6b1ed657d18edf2cfb0aa933dd838456a19025f5160b51768f97f0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 16:42:19 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main maven-shared-io revision cb3ca5434e054aab3a2f801b295503da --- .gitattributes | 23 ++ 0001-Fix-running-tests-with-Maven-3.3.9.patch | 38 +++ maven-shared-io-3.0.0-source-release.zip | 3 + maven-shared-io-build.xml | 236 ++++++++++++++++++ maven-shared-io.changes | 15 ++ maven-shared-io.spec | 95 +++++++ 6 files changed, 410 insertions(+) create mode 100644 .gitattributes create mode 100644 0001-Fix-running-tests-with-Maven-3.3.9.patch create mode 100644 maven-shared-io-3.0.0-source-release.zip create mode 100644 maven-shared-io-build.xml create mode 100644 maven-shared-io.changes create mode 100644 maven-shared-io.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/0001-Fix-running-tests-with-Maven-3.3.9.patch b/0001-Fix-running-tests-with-Maven-3.3.9.patch new file mode 100644 index 0000000..3c86351 --- /dev/null +++ b/0001-Fix-running-tests-with-Maven-3.3.9.patch @@ -0,0 +1,38 @@ +From 7ce11eec214f2a87a63cbb22525f3fdc8f5759ce Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 5 Jan 2016 08:28:31 +0100 +Subject: [PATCH] Fix running tests with Maven 3.3.9 + +--- + .../maven/shared/io/download/DefaultDownloadManagerTest.java | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java b/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java +index f67cb5c..c99631a 100644 +--- a/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java ++++ b/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java +@@ -38,6 +38,8 @@ import org.apache.maven.wagon.authorization.AuthorizationException; + import org.apache.maven.wagon.events.TransferListener; + import org.apache.maven.wagon.proxy.ProxyInfo; + import org.apache.maven.wagon.repository.Repository; ++import org.codehaus.plexus.ContainerConfiguration; ++import org.codehaus.plexus.PlexusConstants; + import org.codehaus.plexus.PlexusTestCase; + + import static org.easymock.EasyMock.*; +@@ -59,6 +61,12 @@ public class DefaultDownloadManagerTest + wagon = createMock( Wagon.class ); + } + ++ protected void customizeContainerConfiguration( ContainerConfiguration conf ) ++ { ++ conf.setAutoWiring( true ); ++ conf.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); ++ } ++ + public void testShouldConstructWithNoParamsAndHaveNonNullMessageHolder() + { + new DefaultDownloadManager(); +-- +2.5.0 + diff --git a/maven-shared-io-3.0.0-source-release.zip b/maven-shared-io-3.0.0-source-release.zip new file mode 100644 index 0000000..eb1f864 --- /dev/null +++ b/maven-shared-io-3.0.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4908e8bc610bad4a74ea4b09e0cf77f53af41b648a68d805400195f710a55e43 +size 72056 diff --git a/maven-shared-io-build.xml b/maven-shared-io-build.xml new file mode 100644 index 0000000..5a92100 --- /dev/null +++ b/maven-shared-io-build.xml @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =================================== WARNING =================================== + JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. + =============================================================================== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven-shared-io.changes b/maven-shared-io.changes new file mode 100644 index 0000000..24cdb06 --- /dev/null +++ b/maven-shared-io.changes @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Wed Sep 6 22:37:02 UTC 2023 - Fridrich Strba + +- Remove unnecessary dependency on xmvn tools and parent pom + +------------------------------------------------------------------- +Mon Mar 21 04:40:31 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + +------------------------------------------------------------------- +Mon Mar 25 07:48:30 UTC 2019 - Fridrich Strba + +- Initial packaging of maven-shared-io 3.0.0 +- Generate and customize the ant build.xml file diff --git a/maven-shared-io.spec b/maven-shared-io.spec new file mode 100644 index 0000000..6cafc73 --- /dev/null +++ b/maven-shared-io.spec @@ -0,0 +1,95 @@ +# +# spec file for package maven-shared-io +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: maven-shared-io +Version: 3.0.0 +Release: 0 +Summary: API for I/O support like logging, download or file scanning +License: Apache-2.0 +Group: Development/Libraries/Java +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 >= 6 +BuildRequires: maven-lib +BuildRequires: maven-shared-utils +BuildRequires: maven-wagon-provider-api +BuildRequires: plexus-containers-container-default +BuildRequires: plexus-utils +BuildRequires: unzip +BuildArch: noarch + +%description +API for I/O support like logging, download or file scanning. + +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Libraries/Java + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q +cp %{SOURCE1} build.xml +%patch0 -p1 + +%pom_add_dep org.codehaus.plexus:plexus-container-default::provided + +%build +mkdir -p lib +build-jar-repository -s lib \ + maven/maven-compat \ + maven/maven-core \ + maven/maven-artifact \ + maven/maven-plugin-api \ + maven-wagon/provider-api \ + maven-shared-utils/maven-shared-utils \ + plexus/utils \ + plexus-containers/plexus-container-default + +# Some of the tests cannot run outside maven +%{ant} \ + -Dtest.skip=true \ + jar javadoc + +%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 +%{_javadocdir}/%{name} +%license LICENSE NOTICE + +%changelog