From c9f716004b9bde5182b8b74e5c0ef138c2640d1159af63125c1cd78940ad37bd Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 4 Sep 2023 18:53:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-archiver?expand=0&rev=8

---
 0001-Port-tests-to-Eclipse-Aether.patch |  15 ----
 maven-archiver-3.5.0-source-release.zip |   3 -
 maven-archiver-3.6.1-source-release.zip |   3 +
 maven-archiver-build.xml                | 110 +-----------------------
 maven-archiver.spec                     |  35 ++------
 5 files changed, 13 insertions(+), 153 deletions(-)
 delete mode 100644 0001-Port-tests-to-Eclipse-Aether.patch
 delete mode 100644 maven-archiver-3.5.0-source-release.zip
 create mode 100644 maven-archiver-3.6.1-source-release.zip

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 @@
 
   <property name="project.groupId" value="org.apache.maven"/>
   <property name="project.artifactId" value="maven-archiver"/>
-  <property name="project.version" value="3.5.0"/>
+  <property name="project.version" value="3.6.1"/>
   <property name="project.name" value="Apache Maven Archiver"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.5"/>
+  <property name="spec.version" value="3.6"/>
 
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
@@ -24,10 +24,7 @@
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
   <property name="build.resourceDir" value="src/main/resources"/>
-  <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
-  <property name="build.testDir" value="src/test/java"/>
-  <property name="build.testResourceDir" value="src/test/resources"/>
-  <property name="test.reports" value="${build.dir}/test-reports"/>
+
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
   <!-- ====================================================================== -->
@@ -39,11 +36,6 @@
       <include name="**/*.jar"/>
     </fileset>
   </path>
-  <path id="build.test.classpath">
-    <fileset dir="lib">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
 
   <!-- ====================================================================== -->
   <!-- Cleaning up target                                                     -->
@@ -75,100 +67,6 @@
     </javac>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests"
-          depends="compile"
-          description="Compile the test code"
-          unless="test.skip">
-    <mkdir dir="${build.testOutputDir}"/>
-    <javac destdir="${build.testOutputDir}"
-           nowarn="false"
-           debug="true"
-           optimize="false"
-           deprecation="true"
-           target="${compiler.target}"
-           verbose="false"
-           fork="false"
-           source="${compiler.source}">
-      <src>
-        <pathelement location="${build.testDir}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${build.testOutputDir}">
-      <fileset dir="${build.testResourceDir}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test"
-          depends="compile-tests, junit-missing"
-          unless="junit.skipped"
-          description="Run the test cases">
-    <mkdir dir="${test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-        <pathelement location="${build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${test.reports}" unless="test">
-        <fileset dir="${build.testDir}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${test.reports}" if="test">
-        <fileset dir="${build.testDir}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status"
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing"
-          depends="test-junit-status"
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
   <!-- ====================================================================== -->
   <!-- Javadoc target                                                         -->
   <!-- ====================================================================== -->
@@ -202,7 +100,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile,test" description="Package the application">
+  <target name="package" depends="compile" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 8226049..ad8c223 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
@@ -41,15 +40,6 @@ 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 +55,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,21 +68,7 @@ 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