From bd437ef434f149822c53b35633d10f4e5b83b80c3a3bd59069c52ed05e1f63b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 31 May 2024 14:49:53 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main maven-filtering revision
 bceb461eac5a914f39f8f8196d238b70

---
 maven-filtering-3.3.1-source-release.zip |  3 --
 maven-filtering-3.3.2-source-release.zip |  3 ++
 maven-filtering-build.xml                |  6 ++--
 maven-filtering.changes                  | 40 ++++++++++++++++++++++++
 maven-filtering.spec                     | 10 +++---
 5 files changed, 53 insertions(+), 9 deletions(-)
 delete mode 100644 maven-filtering-3.3.1-source-release.zip
 create mode 100644 maven-filtering-3.3.2-source-release.zip

diff --git a/maven-filtering-3.3.1-source-release.zip b/maven-filtering-3.3.1-source-release.zip
deleted file mode 100644
index 70dfaad..0000000
--- a/maven-filtering-3.3.1-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c080b49c40b963b0781438520319d0b41d46c63ddda5e6c5f7ee0cefb68f38d
-size 172597
diff --git a/maven-filtering-3.3.2-source-release.zip b/maven-filtering-3.3.2-source-release.zip
new file mode 100644
index 0000000..85d2a45
--- /dev/null
+++ b/maven-filtering-3.3.2-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab8a1ca83aeaf57360023ac6e7fcfff531b99dbc197181a22a9ea14982c0e828
+size 170969
diff --git a/maven-filtering-build.xml b/maven-filtering-build.xml
index 37c0673..3ee5ba8 100644
--- a/maven-filtering-build.xml
+++ b/maven-filtering-build.xml
@@ -10,13 +10,14 @@
 
   <property name="project.groupId" value="org.apache.maven.shared"/>
   <property name="project.artifactId" value="maven-filtering"/>
-  <property name="project.version" value="3.3.1"/>
+  <property name="project.version" value="3.3.2"/>
   <property name="project.name" value="Apache Maven Filtering"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
   <property name="spec.version" value="3.3"/>
 
-  <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}"/>
@@ -57,6 +58,7 @@
            encoding="UTF-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
diff --git a/maven-filtering.changes b/maven-filtering.changes
index bf95222..387f52f 100644
--- a/maven-filtering.changes
+++ b/maven-filtering.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Wed May  1 12:34:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Build against the plexus-build-api0 package containing sonatype
+  plexus build api
+
+-------------------------------------------------------------------
+Tue Apr  2 08:46:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 3.3.2
+  * Changes
+    + pick correct hamcrest dependency
+    + Prefer commons lang to plexus utils
+    + MSHARED-1214: move tag back to HEAD
+    + MSHARED-1216: Use caching output stream
+    + Bump org.codehaus.plexus:plexus-utils from 3.0.16 to 3.0.24
+      in /src/test/resources
+    + Fix typos and grammar
+    + Fix 'licenced' typo in PR template
+    + refactor IncrementalResourceFilteringTest
+    + MSHARED-1340: Require Maven 3.6.3+
+    + Bump commons-io:commons-io from 2.11.0 to 2.15.1
+    + Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.14.0
+    + MSHARED-1339: Bump
+      org.apache.maven.shared:maven-shared-components from 39 to 41
+    + MSHARED-1290: Fix PropertyUtils cycle detection results in
+      false positives
+    + MSHARED-1285: use an up-to-date scanner instead the newscanner
+    + Bump org.codehaus.plexus:plexus-testing from 1.2.0 to 1.3.0
+    + Bump org.codehaus.plexus:plexus-interpolation from 1.26
+      to 1.27
+    + Bump org.codehaus.plexus:plexus-utils from 3.5.1 to 4.0.0
+    + Bump release-drafter/release-drafter from 5 to 6
+    + Bump org.junit.jupiter:junit-jupiter-api from 5.10.1
+      to 5.10.2
+    + MSHARED-1351: Fix console message when origin is baseDir
+    + MSHARED-1050: Fix ConcurrentModificationException for
+      maven-filtering
+    + MSHARED-1330: Always overwrite files
+
 -------------------------------------------------------------------
 Wed Sep  6 13:00:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-filtering.spec b/maven-filtering.spec
index dba91e9..34b1adb 100644
--- a/maven-filtering.spec
+++ b/maven-filtering.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven-filtering
 #
-# 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
@@ -17,7 +17,7 @@
 
 
 Name:           maven-filtering
-Version:        3.3.1
+Version:        3.3.2
 Release:        0
 Summary:        Shared component providing resource filtering
 License:        Apache-2.0
@@ -27,11 +27,12 @@ Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  apache-commons-io
+BuildRequires:  apache-commons-lang3
 BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  maven-lib
-BuildRequires:  plexus-build-api
+BuildRequires:  plexus-build-api0
 BuildRequires:  plexus-interpolation
 BuildRequires:  plexus-utils
 BuildRequires:  sisu-inject
@@ -62,13 +63,14 @@ mkdir -p lib
 build-jar-repository -s lib \
     atinject \
     commons-io \
+    commons-lang3 \
     maven/maven-core \
     maven/maven-model \
     maven/maven-settings \
     org.eclipse.sisu.inject \
     plexus/utils \
     plexus/interpolation \
-    plexus/plexus-build-api \
+    plexus/plexus-build-api0 \
     slf4j/api
 
 %{ant} \