From 839b012555a5d387e271f9fefbe3426d7f09aaf4a1cfddd30f308c9eca7198a2 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 13 Jun 2024 10:24:39 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-shared-incremental?expand=0&rev=7

---
 maven-shared-incremental-build.xml | 103 +----------------------------
 maven-shared-incremental.spec      |   9 +--
 2 files changed, 8 insertions(+), 104 deletions(-)

diff --git a/maven-shared-incremental-build.xml b/maven-shared-incremental-build.xml
index 1f89bc5..e7d16c8 100644
--- a/maven-shared-incremental-build.xml
+++ b/maven-shared-incremental-build.xml
@@ -14,7 +14,8 @@
   <property name="project.name" value="Maven Incremental Build support utilities"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -28,10 +29,6 @@
   <property name="test.reports" value="${build.dir}/test-reports"/>
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
-  <property name="repo.local" value="${user.home}/.m2/repository"/>
-  <property name="settings.offline" value="false"/>
-  <property name="settings.interactiveMode" value="true"/>
-
   <!-- ====================================================================== -->
   <!-- Defining classpaths                                                    -->
   <!-- ====================================================================== -->
@@ -80,100 +77,6 @@
     </copy>
   </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                                                         -->
   <!-- ====================================================================== -->
@@ -207,7 +110,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-shared-incremental.spec b/maven-shared-incremental.spec
index a15fe6f..e60cd54 100644
--- a/maven-shared-incremental.spec
+++ b/maven-shared-incremental.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven-shared-incremental
 #
-# Copyright (c) 2023 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
@@ -30,8 +30,8 @@ BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  maven-lib
 BuildRequires:  maven-shared-utils
-BuildRequires:  plexus-component-api
 BuildRequires:  plexus-containers-component-annotations
+BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildArch:      noarch
 
@@ -50,6 +50,8 @@ This package provides %{summary}.
 %setup -q
 cp %{SOURCE1} build.xml
 
+%pom_change_dep :plexus-component-api org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
+
 %build
 mkdir -p lib
 build-jar-repository -s lib \
@@ -57,11 +59,10 @@ build-jar-repository -s lib \
   maven/maven-model \
   maven/maven-plugin-api \
   maven-shared-utils/maven-shared-utils \
-  plexus-component-api/plexus-component-api \
+  org.eclipse.sisu.plexus \
   plexus-containers/plexus-component-annotations
 
 %{ant} \
-  -Dtest.skip=true \
   jar javadoc
 
 %install

From f271d69b0998a7868fe4a4469369f0327b1723edecc1120e38a2c68f96efe3ad Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 13 Jun 2024 10:36:55 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-shared-incremental?expand=0&rev=8

---
 maven-shared-incremental-build.xml | 1 +
 maven-shared-incremental.changes   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/maven-shared-incremental-build.xml b/maven-shared-incremental-build.xml
index e7d16c8..df6c8da 100644
--- a/maven-shared-incremental-build.xml
+++ b/maven-shared-incremental-build.xml
@@ -63,6 +63,7 @@
            debug="true"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
diff --git a/maven-shared-incremental.changes b/maven-shared-incremental.changes
index 49c0cfb..2808b1f 100644
--- a/maven-shared-incremental.changes
+++ b/maven-shared-incremental.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 13 10:36:43 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use sisu-plexus instead of the old plexus-component-api
+
 -------------------------------------------------------------------
 Wed Sep  6 22:33:43 UTC 2023 - Fridrich Strba <fstrba@suse.com>