From 8eb7686a99c6daeb3862a03c6137a73a725629715589e4f49fb6a6c737bce54a Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 11 Jun 2024 16:06:04 +0000
Subject: [PATCH 1/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-file-management?expand=0&rev=16

---
 file-management-3.0.0-source-release.zip | 3 ---
 file-management-3.1.0-source-release.zip | 3 +++
 maven-file-management-build.xml          | 4 ++--
 maven-file-management.spec               | 8 ++++++--
 4 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 file-management-3.0.0-source-release.zip
 create mode 100644 file-management-3.1.0-source-release.zip

diff --git a/file-management-3.0.0-source-release.zip b/file-management-3.0.0-source-release.zip
deleted file mode 100644
index 8668da4..0000000
--- a/file-management-3.0.0-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aaa1026f9aa46ba2941a1271f7e79f070ea0d3aae528d437cf5d1d53b5f93a72
-size 55722
diff --git a/file-management-3.1.0-source-release.zip b/file-management-3.1.0-source-release.zip
new file mode 100644
index 0000000..5868093
--- /dev/null
+++ b/file-management-3.1.0-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34f48b425e82581a192672e1335d937e6c27a76b53f40e07ae4f0f05e0cb2701
+size 58226
diff --git a/maven-file-management-build.xml b/maven-file-management-build.xml
index cf389a6..b4edd45 100644
--- a/maven-file-management-build.xml
+++ b/maven-file-management-build.xml
@@ -8,14 +8,14 @@
 
   <property file="build.properties"/>
 
-  <property name="project.version" value="3.0.0"/>
+  <property name="project.version" value="3.1.0"/>
   <property name="project.groupId" value="org.apache.maven.shared"/>
   <property name="project.artifactId" value="file-management"/>
   <property name="project.name" value="Apache Maven File Management API"/>
 
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.0"/>
+  <property name="spec.version" value="3.1"/>
 
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
diff --git a/maven-file-management.spec b/maven-file-management.spec
index ce9875f..471087d 100644
--- a/maven-file-management.spec
+++ b/maven-file-management.spec
@@ -17,7 +17,7 @@
 
 
 Name:           maven-file-management
-Version:        3.0.0
+Version:        3.1.0
 Release:        0
 Summary:        Maven File Management API
 License:        Apache-2.0
@@ -26,6 +26,7 @@ URL:            https://maven.apache.org/shared/file-management
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/file-management/%{version}/file-management-%{version}-source-release.zip
 Source1:        %{name}-build.xml
 BuildRequires:  ant
+BuildRequires:  apache-commons-io
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  maven-lib
@@ -35,6 +36,7 @@ BuildRequires:  modello >= 2.0.0
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
 BuildRequires:  sisu-plexus
+BuildRequires:  slf4j
 BuildRequires:  unzip
 BuildArch:      noarch
 
@@ -57,12 +59,14 @@ cp %{SOURCE1} build.xml
 %build
 mkdir -p lib
 build-jar-repository -s lib \
+    commons-io \
     maven/maven-plugin-api \
     maven-shared-io/maven-shared-io \
     maven-shared-utils/maven-shared-utils \
     org.eclipse.sisu.plexus \
     plexus/utils \
-    plexus/xml
+    plexus/xml \
+    slf4j/api
 
 %{ant} \
     jar javadoc

From 187ec822fe1db7db59ac775ceeeff32108af19994ea3792849c015e21dd8a6f2 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 11 Jun 2024 16:09:17 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-file-management?expand=0&rev=17

---
 maven-file-management.spec | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/maven-file-management.spec b/maven-file-management.spec
index 471087d..c9c6497 100644
--- a/maven-file-management.spec
+++ b/maven-file-management.spec
@@ -30,12 +30,9 @@ BuildRequires:  apache-commons-io
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  maven-lib
-BuildRequires:  maven-shared-io
-BuildRequires:  maven-shared-utils
 BuildRequires:  modello >= 2.0.0
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
-BuildRequires:  sisu-plexus
 BuildRequires:  slf4j
 BuildRequires:  unzip
 BuildArch:      noarch
@@ -61,9 +58,6 @@ mkdir -p lib
 build-jar-repository -s lib \
     commons-io \
     maven/maven-plugin-api \
-    maven-shared-io/maven-shared-io \
-    maven-shared-utils/maven-shared-utils \
-    org.eclipse.sisu.plexus \
     plexus/utils \
     plexus/xml \
     slf4j/api

From c77e249062f94fbd5a574cf8f015c49808262aab4815649ec0dc236b8df9a25d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 12 Jun 2024 10:08:46 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-file-management?expand=0&rev=18

---
 maven-file-management-build.xml |  4 +++-
 maven-file-management.changes   | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/maven-file-management-build.xml b/maven-file-management-build.xml
index b4edd45..8a2b4c0 100644
--- a/maven-file-management-build.xml
+++ b/maven-file-management-build.xml
@@ -17,7 +17,8 @@
 
   <property name="spec.version" value="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}"/>
@@ -95,6 +96,7 @@
            encoding="UTF-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
diff --git a/maven-file-management.changes b/maven-file-management.changes
index 16b7539..085dfb0 100644
--- a/maven-file-management.changes
+++ b/maven-file-management.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Jun 12 10:00:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream version 3.1.0
+  * Changes:
+    + remove vestigial file
+    + deps: update JUnit
+    + ignore .checkstyle
+    + update plexus-utils
+    + Remove dependency on maven-shared-io
+    + Use try with resources
+    + Remove deprecated methods in favor of Apache Commons IO
+    + MSHARED-1090: Update module
+
 -------------------------------------------------------------------
 Thu May 16 05:20:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>