diff --git a/0001-Port-tests-to-Eclipse-Aether.patch b/0001-Port-tests-to-Eclipse-Aether.patch
deleted file mode 100644
index c8d72f8..0000000
--- a/0001-Port-tests-to-Eclipse-Aether.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-index 2f5965d..0b1d111 100644
---- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-@@ -41,8 +41,8 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
- import org.codehaus.plexus.archiver.jar.ManifestException;
- import org.junit.Ignore;
- import org.junit.Test;
--import org.sonatype.aether.RepositorySystemSession;
--import org.sonatype.aether.util.DefaultRepositorySystemSession;
-+import org.eclipse.aether.RepositorySystemSession;
-+import org.eclipse.aether.DefaultRepositorySystemSession;
-
- import java.io.File;
- import java.io.IOException;
diff --git a/maven-archiver-3.5.0-source-release.zip b/maven-archiver-3.5.0-source-release.zip
deleted file mode 100644
index c37a9ba..0000000
--- a/maven-archiver-3.5.0-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cd12342dfe51332257ed916bb83f5cb2d0a68cd97693fe6cd2b1521f1ec0488
-size 138877
diff --git a/maven-archiver-3.6.1-source-release.zip b/maven-archiver-3.6.1-source-release.zip
new file mode 100644
index 0000000..7ad5780
--- /dev/null
+++ b/maven-archiver-3.6.1-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dc30f57e209895c455c66d6a0c5d094d61ae036909b69096cfddd41e8cd2e3e
+size 136523
diff --git a/maven-archiver-build.xml b/maven-archiver-build.xml
index 0cb921c..ac85f8d 100644
--- a/maven-archiver-build.xml
+++ b/maven-archiver-build.xml
@@ -10,11 +10,11 @@
-
+
-
+
@@ -24,10 +24,7 @@
-
-
-
-
+
@@ -39,11 +36,6 @@
-
-
-
-
-
@@ -75,100 +67,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================================== WARNING ===================================
- JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.
- ===============================================================================
-
-
@@ -202,7 +100,7 @@
-
+
+
+- Upgrade to maven-archiver 3.6.1
+- Changes of 3.6.1
+ * New Feature
+ + MSHARED-1251: Deprecate the JAR Index feature (JDK-8302819)
+ * Task
+ + MSHARED-1293: Refresh download page
+ + MSHARED-1297: Prefer JDK features over plexus-utils, plexus-io
+- Changes of 3.6.0
+ * Task
+ + MSHARED-991: Require Java 8
+ + MSHARED-1081: Drop m-shared-utils from deps
+- Changes of 3.5.2
+ * Bug
+ + MSHARED-849: archiver sorts META-INF/MANIFEST.MF before
+ META-INF/ in ZIP header
+- Changes of 3.5.1
+ * Improvement
+ + MSHARED-879: make build Reproducible
+- Removed patch:
+ * 0001-Port-tests-to-Eclipse-Aether.patch
+ + not needed with this version
+
-------------------------------------------------------------------
Sun Mar 20 19:54:42 UTC 2022 - Fridrich Strba
@@ -7,6 +32,48 @@ Sun Mar 20 19:54:42 UTC 2022 - Fridrich Strba
Sun Nov 24 14:39:30 UTC 2019 - Fridrich Strba
- Upgrade to version 3.5.0
+- Changes of 3.5.0
+ * New Feature
+ + MSHARED-837: add an API to configure Reproducible Builds
+ with outputTimestamp
+ * Improvement
+ * MSHARED-833: make pom.properties entries order reproducible
+ * MSHARED-834: add an API to override Created-By manifest entry
+ value
+ * MSHARED-835: add an API to not define Build-Jdk-Spec default
+ manifest entry
+- Changes of 3.4.0
+ * Bug
+ + MSHARED-588: User supplied Class-Path entry does not go first
+ + MSHARED-782: Deprecated option classpathMavenRepositoryLayout
+ not marked as deprecated in the documentation
+ + MSHARED-783: Archiver documentation issue tracker 404
+ * New Feature
+ + MSHARED-787: Add optional buildEnvironment information to the
+ manifest
+ + MSHARED-798: Add addDefaultEntries option (true by default)
+ * Improvement
+ + MSHARED-362: Support removing default manifest entries with
+ Maven Archiver
+ + MSHARED-777: Remove deprecated main attributes from generated
+ manifest
+ + MSHARED-799: Change "Created-By" manifest entry value to be
+ reproducible
+ + MSHARED-800: Remove Maven version from pom.properties
+ * Wish
+ + MSHARED-661: Remove manifest entry "Built-By: " for
+ reproducible builds
+ + MSHARED-796] - use java.specification.version instead of
+ java.version in Build-Jdk manifest entry
+ * Task
+ + MSHARED-797: Move current Build-Jdk manifest entry to
+ Build-Jdk-Spec
+- Changes of 3.3.0
+ * Bug
+ + MSHARED-448: testRecreation failure with OpenJDK 8 on Linux
+ * Improvement
+ + MSHARED-773: Fail on invalid 'Automatic-Module-Name' in
+ MANIFEST
- Removed patch:
* 0002-MSHARED-448-Skip-failing-assertion.patch
+ not needed with this version
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 8226049..2790860 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -1,7 +1,7 @@
#
# spec file for package maven-archiver
#
-# Copyright (c) 2022 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
@@ -18,15 +18,14 @@
%bcond_with tests
Name: maven-archiver
-Version: 3.5.0
+Version: 3.6.1
Release: 0
Summary: Maven Archiver
License: Apache-2.0
Group: Development/Libraries/Java
-URL: http://maven.apache.org/shared/maven-archiver/
-Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
+URL: https://maven.apache.org/shared/maven-archiver/
+Source0: https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
-Patch0: 0001-Port-tests-to-Eclipse-Aether.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
@@ -37,19 +36,7 @@ BuildRequires: plexus-interpolation >= 1.25
BuildRequires: plexus-utils >= 3.3.0
BuildRequires: sisu-plexus
BuildRequires: unzip
-BuildRequires: xmvn-install
-BuildRequires: xmvn-resolve
-BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildArch: noarch
-%if %{with tests}
-BuildRequires: ant-junit
-BuildRequires: apache-commons-compress
-BuildRequires: apache-commons-io
-BuildRequires: assertj-core
-BuildRequires: maven-resolver-api
-BuildRequires: plexus-io
-BuildRequires: plexus-utils
-%endif
%description
The Maven Archiver is used by other Maven plugins
@@ -65,7 +52,8 @@ Javadoc for %{name}.
%prep
%setup -q
cp %{SOURCE1} build.xml
-%patch0 -p1
+
+%pom_xpath_remove pom:project/pom:parent/pom:relativePath
%build
mkdir -p lib
@@ -77,34 +65,28 @@ build-jar-repository -s lib \
plexus/interpolation \
plexus/archiver
-%if %{with tests}
- build-jar-repository -s lib \
- assertj-core/assertj-core \
- maven-resolver/maven-resolver-api \
- maven/maven-settings \
- plexus/io \
- commons-compress \
- commons-io \
- plexus/utils
-%endif
-
%{ant} \
-%if %{without tests}
- -Dtest.skip=true \
-%endif
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
%doc NOTICE
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
%license LICENSE
%doc NOTICE