From 15e3cd26e4ae801a9fef3ce1fc923c16d70b4bb7c050d01162648709a76a76f6 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 4 Oct 2024 21:08:56 +0000
Subject: [PATCH 1/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-resources?expand=0&rev=14

---
 _service                                | 15 +++++++++
 plexus-resources-1.0-alpha-7-src.tar.xz |  3 --
 plexus-resources-1.3.0.tar.xz           |  3 ++
 plexus-resources-build.xml              | 44 +++++++++++--------------
 plexus-resources.spec                   | 21 +++++-------
 5 files changed, 46 insertions(+), 40 deletions(-)
 create mode 100644 _service
 delete mode 100644 plexus-resources-1.0-alpha-7-src.tar.xz
 create mode 100644 plexus-resources-1.3.0.tar.xz

diff --git a/_service b/_service
new file mode 100644
index 0000000..4d396d1
--- /dev/null
+++ b/_service
@@ -0,0 +1,15 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/codehaus-plexus/plexus-resources.git</param>
+		<param name="revision">plexus-resources-1.3.0</param>
+		<param name="match-tag">plexus-resources-*</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">plexus-resources-(.*)</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>
diff --git a/plexus-resources-1.0-alpha-7-src.tar.xz b/plexus-resources-1.0-alpha-7-src.tar.xz
deleted file mode 100644
index ec739d0..0000000
--- a/plexus-resources-1.0-alpha-7-src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37eef57ea8540416b6a161f60ccbabaf1642b8bef756aeac1aced11d440178c9
-size 9348
diff --git a/plexus-resources-1.3.0.tar.xz b/plexus-resources-1.3.0.tar.xz
new file mode 100644
index 0000000..486f58f
--- /dev/null
+++ b/plexus-resources-1.3.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1849ecd054d3f1d6323e9530803b11d4a9f65be82b27c3d0a8c40515676003a2
+size 13784
diff --git a/plexus-resources-build.xml b/plexus-resources-build.xml
index ac50036..12e21cf 100644
--- a/plexus-resources-build.xml
+++ b/plexus-resources-build.xml
@@ -10,7 +10,7 @@
 
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.artifactId" value="plexus-resources"/>
-  <property name="project.version" value="1.0-alpha-7"/>
+  <property name="project.version" value="1.3.0"/>
 
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
@@ -19,11 +19,7 @@
   <property name="build.dir" value="target"/>
   <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"/>
 
   <!-- ====================================================================== -->
@@ -67,30 +63,28 @@
       </src>
       <classpath refid="build.classpath"/>
     </javac>
-    <copy todir="${build.outputDir}">
-      <fileset dir="${build.resourceDir}"/>
-    </copy>
   </target>
 
   <!-- ====================================================================== -->
-  <!-- Target to generate Plexus component.xml                                -->
+  <!-- Sisu javax.inject.Named generation target                              -->
   <!-- ====================================================================== -->
 
-  <target name="generate-metadata"
+  <target name="sisu"
           depends="compile"
-          description="Generate Plexus component.xml">
-    <mkdir dir="${build.outputDir}/META-INF/plexus"/>
-    <exec executable="plexus-metadata-generator" failonerror="true">
-      <env key="CLASSPATH" value="${build.outputDir}"/>
-      <arg value="-s"/>
-      <arg value="${build.srcDir}"/>
-      <arg value="-c"/>
-      <arg value="${build.outputDir}"/>
-      <arg value="-m"/>
-      <arg value="${build.outputDir}/META-INF/plexus"/>
-      <arg value="-o"/>
-      <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
-    </exec>
+          description="Generate javax.inject.Name index">
+    <sequential>
+	  <java classname="org.eclipse.sisu.space.SisuIndex"
+	        failonerror="true"
+			fork="true">
+        <classpath>
+          <path refid="build.classpath"/>
+        </classpath>
+        <arg value="${build.outputDir}"/>
+      </java>
+      <move todir="${build.outputDir}/META-INF">
+        <fileset dir="META-INF"/>
+      </move>
+	</sequential>
   </target>
 
   <!-- ====================================================================== -->
@@ -127,7 +121,7 @@
   <!-- ====================================================================== -->
 
   <target name="package"
-          depends="generate-metadata"
+          depends="sisu"
           description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
diff --git a/plexus-resources.spec b/plexus-resources.spec
index e5a9057..7e02e9c 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -16,26 +16,24 @@
 #
 
 
-%global base_ver 1.0
-%global alpha_ver 7
-%global namedversion %{base_ver}-alpha-%{alpha_ver}
 Name:           plexus-resources
-Version:        %{base_ver}~a%{alpha_ver}
+Version:        1.3.0
 Release:        0
 Summary:        Plexus Resource Manager
 License:        MIT
 Group:          Development/Libraries/Java
 URL:            https://github.com/codehaus-plexus/plexus-resources
-# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-resources-1.0-alpha-7/
-# tar caf plexus-resources-1.0-alpha-7-src.tar.xz plexus-resources-1.0-alpha-7
-Source0:        %{name}-%{namedversion}-src.tar.xz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-build.xml
 BuildRequires:  ant
+BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
+BuildRequires:  plexus-xml
+BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
+BuildRequires:  slf4j
 BuildArch:      noarch
 
 %description
@@ -53,19 +51,18 @@ Group:          Documentation/HTML
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
+%setup -q
 cp %{SOURCE1} build.xml
-%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
 
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/utils org.eclipse.sisu.plexus
+build-jar-repository -s lib plexus/utils plexus/xml org.eclipse.sisu.plexus atinject org.eclipse.sisu.inject slf4j/api
 %{ant} jar javadoc
 
 %install
 # jar
 install -dm 0755 %{buildroot}%{_javadir}/plexus
-install -pm 0644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/plexus/resources.jar
+install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/resources.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
 %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/resources.pom
-- 
2.51.1


From d1cfefdb40f3c8401d6cb0f752717ee95d116a43f9e3b7424645ce2272f885af Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 8 Oct 2024 06:43:13 +0000
Subject: [PATCH 2/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-resources?expand=0&rev=15

---
 plexus-resources.changes | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plexus-resources.changes b/plexus-resources.changes
index 07fa8dd..977c57e 100644
--- a/plexus-resources.changes
+++ b/plexus-resources.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Oct  8 06:40:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 1.3
+  * Changes:
+    * Ignore mac os .DS_Store
+    * Update codebase to current Java level
+    * Restore public constructor to DefaultResourceManager
+- Fetch sources using source service
+
 -------------------------------------------------------------------
 Sun May 26 19:39:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
-- 
2.51.1


From 8d932738ad092af51b458a5e62914c8d9af63e6dd91744f965f8a875361dfd67 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 8 Oct 2024 06:47:08 +0000
Subject: [PATCH 3/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-resources?expand=0&rev=16

---
 plexus-resources.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plexus-resources.spec b/plexus-resources.spec
index 7e02e9c..f77ac5a 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -32,7 +32,6 @@ BuildRequires:  javapackages-local >= 6
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
 BuildRequires:  sisu-inject
-BuildRequires:  sisu-plexus
 BuildRequires:  slf4j
 BuildArch:      noarch
 
@@ -56,7 +55,7 @@ cp %{SOURCE1} build.xml
 
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/utils plexus/xml org.eclipse.sisu.plexus atinject org.eclipse.sisu.inject slf4j/api
+build-jar-repository -s lib atinject org.eclipse.sisu.inject plexus/utils plexus/xml slf4j/api
 %{ant} jar javadoc
 
 %install
-- 
2.51.1


From 162ebfd94cbb80a0c74dd94b05e1b2f443022bd44c53966c1d0dc78c9d38963b Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 2 Jun 2025 14:08:18 +0000
Subject: [PATCH 4/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-resources?expand=0&rev=18

---
 plexus-resources.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plexus-resources.spec b/plexus-resources.spec
index f77ac5a..ed0aa81 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-resources
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,7 @@ BuildRequires:  ant
 BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
+BuildRequires:  objectweb-asm
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
 BuildRequires:  sisu-inject
@@ -55,7 +56,13 @@ cp %{SOURCE1} build.xml
 
 %build
 mkdir -p lib
-build-jar-repository -s lib atinject org.eclipse.sisu.inject plexus/utils plexus/xml slf4j/api
+build-jar-repository -s lib \
+    atinject \
+    objectweb-asm/asm \
+    org.eclipse.sisu.inject \
+    plexus/utils \
+    plexus/xml \
+    slf4j/api
 %{ant} jar javadoc
 
 %install
-- 
2.51.1


From fa82b956309dd3bfb994458011e1e3c978607924e774830b8997c5462b6df40e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 3 Jun 2025 08:25:19 +0000
Subject: [PATCH 5/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-resources?expand=0&rev=19

---
 plexus-resources.changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plexus-resources.changes b/plexus-resources.changes
index 977c57e..bfbd77e 100644
--- a/plexus-resources.changes
+++ b/plexus-resources.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun  3 08:25:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on objectweb-asm to build with sisu 0.9.0.M4
+
 -------------------------------------------------------------------
 Tue Oct  8 06:40:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
-- 
2.51.1


From 2d735c06396af8a285001830414cd937b5cb0ba95d7ec14775d8cbe902300a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Tue, 7 Oct 2025 15:03:12 +0200
Subject: [PATCH 6/6] 1.3.1

---
 _service                      |  2 +-
 plexus-resources-1.3.0.tar.xz |  3 ---
 plexus-resources-1.3.1.tar.xz |  3 +++
 plexus-resources-build.xml    |  6 ++++--
 plexus-resources.changes      | 13 +++++++++++++
 plexus-resources.spec         |  2 +-
 6 files changed, 22 insertions(+), 7 deletions(-)
 delete mode 100644 plexus-resources-1.3.0.tar.xz
 create mode 100644 plexus-resources-1.3.1.tar.xz

diff --git a/_service b/_service
index 4d396d1..713add6 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/codehaus-plexus/plexus-resources.git</param>
-		<param name="revision">plexus-resources-1.3.0</param>
+		<param name="revision">plexus-resources-1.3.1</param>
 		<param name="match-tag">plexus-resources-*</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="versionrewrite-pattern">plexus-resources-(.*)</param>
diff --git a/plexus-resources-1.3.0.tar.xz b/plexus-resources-1.3.0.tar.xz
deleted file mode 100644
index 486f58f..0000000
--- a/plexus-resources-1.3.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1849ecd054d3f1d6323e9530803b11d4a9f65be82b27c3d0a8c40515676003a2
-size 13784
diff --git a/plexus-resources-1.3.1.tar.xz b/plexus-resources-1.3.1.tar.xz
new file mode 100644
index 0000000..1bb9a07
--- /dev/null
+++ b/plexus-resources-1.3.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2b30c63c84ae7a461201c0b11b727d0dd97ca56230a1871a60aa46b010f9f67
+size 13932
diff --git a/plexus-resources-build.xml b/plexus-resources-build.xml
index 12e21cf..0151ed7 100644
--- a/plexus-resources-build.xml
+++ b/plexus-resources-build.xml
@@ -10,9 +10,10 @@
 
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.artifactId" value="plexus-resources"/>
-  <property name="project.version" value="1.3.0"/>
+  <property name="project.version" value="1.3.1"/>
 
-  <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}"/>
@@ -54,6 +55,7 @@
            debug="true"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
diff --git a/plexus-resources.changes b/plexus-resources.changes
index bfbd77e..14646cb 100644
--- a/plexus-resources.changes
+++ b/plexus-resources.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Oct  7 12:59:23 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 1.3.1
+  * Maintenance
+    + Bump release-drafter/release-drafter from 5 to 6
+  * Dependency updates
+    + Bump org.codehaus.plexus:plexus-testing from 1.3.0 to 1.6.0
+    + Bump org.codehaus.plexus:plexus from 16 to 23
+    + Bump org.simplify4u:slf4j-mock from 2.3.0 to 2.4.0
+    + Bump org.codehaus.plexus:plexus-utils from 4.0.0 to 4.0.2
+    + Bump org.codehaus.plexus:plexus-xml from 3.0.0 to 3.0.1
+
 -------------------------------------------------------------------
 Tue Jun  3 08:25:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-resources.spec b/plexus-resources.spec
index ed0aa81..2675a8d 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -17,7 +17,7 @@
 
 
 Name:           plexus-resources
-Version:        1.3.0
+Version:        1.3.1
 Release:        0
 Summary:        Plexus Resource Manager
 License:        MIT
-- 
2.51.1