diff --git a/maven-resources-plugin-3.2.0-source-release.zip b/maven-resources-plugin-3.2.0-source-release.zip
deleted file mode 100644
index 343aec4..0000000
--- a/maven-resources-plugin-3.2.0-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e28f0b5bd337376eb35397dba0cb9168d1839b42f22e565a0328097a8d5d0178
-size 945426
diff --git a/maven-resources-plugin-3.3.1-source-release.zip b/maven-resources-plugin-3.3.1-source-release.zip
new file mode 100644
index 0000000..f0529d1
--- /dev/null
+++ b/maven-resources-plugin-3.3.1-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84e8c90032551b79c392596cf7231ff6ce9403c5644d6433c51029ac506f944d
+size 945095
diff --git a/maven-resources-plugin-bootstrap-resources.patch b/maven-resources-plugin-bootstrap-resources.patch
index 7224b7f..7ef4afb 100644
--- a/maven-resources-plugin-bootstrap-resources.patch
+++ b/maven-resources-plugin-bootstrap-resources.patch
@@ -1,6 +1,6 @@
---- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
-+++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 2019-04-01 08:42:56.035739311 +0200
-@@ -0,0 +1,517 @@
+--- maven-resources-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
++++ maven-resources-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 2023-09-14 08:28:18.322786139 +0200
+@@ -0,0 +1,573 @@
+
+
+ ${project.name}
@@ -181,6 +181,62 @@
+
+
+
++ help
++ Display help information on maven-resources-plugin.
++Call mvn resources:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++ false
++ false
++ false
++ false
++ false
++ true
++ org.apache.maven.plugins.resources.HelpMojo
++ java
++ per-lookup
++ once-per-session
++ true
++
++
++ detail
++ boolean
++ false
++ true
++ Display help information on maven-resources-plugin.
++Call mvn resources:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++
++
++ goal
++ java.lang.String
++ false
++ true
++ Display help information on maven-resources-plugin.
++Call mvn resources:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++
++
++ indentSize
++ int
++ false
++ true
++ Display help information on maven-resources-plugin.
++Call mvn resources:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++
++
++ lineLength
++ int
++ false
++ true
++ Display help information on maven-resources-plugin.
++Call mvn resources:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++
++
++
++ ${detail}
++ ${goal}
++ ${indentSize}
++ ${lineLength}
++
++
++
+ resources
+ Copy resources for the main source code to the main output directory. Always uses the project.build.resources element to specify the resources to copy.
+ false
@@ -518,9 +574,9 @@
+
+
+
---- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
-+++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-04-01 08:42:45.083685375 +0200
-@@ -0,0 +1,866 @@
+--- maven-resources-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
++++ maven-resources-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/plugin.xml 2023-09-14 08:30:05.500192926 +0200
+@@ -0,0 +1,748 @@
+
+
+ ${project.name}
@@ -732,9 +788,69 @@
+ default
+ mavenResourcesFiltering
+
++
++ org.apache.maven.shared.filtering.MavenResourcesFiltering
++ mavenResourcesFilteringMap
++
+
+
+
++ help
++ Display help information on maven-resources-plugin.<br>
++Call <code>mvn resources:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++ false
++ false
++ false
++ false
++ false
++ true
++ org.apache.maven.plugins.resources.HelpMojo
++ java
++ per-lookup
++ once-per-session
++ true
++
++
++ detail
++ boolean
++ false
++ true
++ Display help information on maven-resources-plugin.<br>
++Call <code>mvn resources:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++
++
++ goal
++ java.lang.String
++ false
++ true
++ Display help information on maven-resources-plugin.<br>
++Call <code>mvn resources:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++
++
++ indentSize
++ int
++ false
++ true
++ Display help information on maven-resources-plugin.<br>
++Call <code>mvn resources:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++
++
++ lineLength
++ int
++ false
++ true
++ Display help information on maven-resources-plugin.<br>
++Call <code>mvn resources:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++
++
++
++ ${detail}
++ ${goal}
++ ${indentSize}
++ ${lineLength}
++
++
++
+ resources
+ Copy resources for the main source code to the main output directory. Always uses the project.build.resources element
+to specify the resources to copy.
@@ -939,6 +1055,10 @@
+ default
+ mavenResourcesFiltering
+
++
++ org.apache.maven.shared.filtering.MavenResourcesFiltering
++ mavenResourcesFilteringMap
++
+
+
+
@@ -1147,123 +1267,19 @@
+ default
+ mavenResourcesFiltering
+
++
++ org.apache.maven.shared.filtering.MavenResourcesFiltering
++ mavenResourcesFilteringMap
++
+
+
+
+
+
-+ org.apache.maven
-+ maven-plugin-api
-+ jar
-+ 3.1.0
-+
-+
-+ org.codehaus.plexus
-+ plexus-classworlds
-+ jar
-+ 2.6.0
-+
-+
-+ org.apache.maven
-+ maven-artifact
-+ jar
-+ 3.8.4
-+
-+
-+ org.apache.maven
-+ maven-core
-+ jar
-+ 3.1.0
-+
-+
-+ org.apache.maven
-+ maven-settings
-+ jar
-+ 3.8.4
-+
-+
-+ org.apache.maven.resolver
-+ maven-resolver-util
-+ jar
-+ 1.6.3
-+
-+
+ org.slf4j
+ slf4j-api
+ jar
-+ 1.7.32
-+
-+
-+ org.eclipse.sisu
-+ org.eclipse.sisu.inject
-+ jar
-+ 0.3.5
-+
-+
-+ javax.enterprise
-+ cdi-api
-+ jar
-+ 1.1
-+
-+
-+ org.jboss.spec.javax.interceptor
-+ jboss-interceptors-api_1.2_spec
-+ jar
-+ any
-+
-+
-+ jakarta.inject
-+ jakarta.inject-api
-+ jar
-+ 1.0
-+
-+
-+ com.google.inject
-+ guice
-+ jar
-+ 4.2.2
-+
-+
-+ aopalliance
-+ aopalliance
-+ jar
-+ any
-+
-+
-+ com.google.guava
-+ guava
-+ jar
-+ any
-+
-+
-+ com.google.code.findbugs
-+ jsr305
-+ jar
-+ any
-+
-+
-+ org.ow2.asm
-+ asm
-+ jar
-+ any
-+
-+
-+ cglib
-+ cglib
-+ jar
-+ any
-+
-+
-+ org.apache.maven
-+ maven-resolver-provider
-+ jar
-+ 3.8.4
-+
-+
-+ org.apache.maven.resolver
-+ maven-resolver-api
-+ jar
-+ 1.6.3
++ 1.7.36
+
+
+ javax.inject
@@ -1272,100 +1288,22 @@
+ 1
+
+
-+ org.apache.maven.resolver
-+ maven-resolver-impl
-+ jar
-+ 1.6.3
-+
-+
-+ org.apache.maven.resolver
-+ maven-resolver-named-locks
-+ jar
-+ 1.7.3
-+
-+
-+ javax.annotation
-+ javax.annotation-api
-+ jar
-+ 1.3.2
-+
-+
-+ org.apache.maven
-+ maven-repository-metadata
-+ jar
-+ 3.8.4
-+
-+
-+ org.apache.maven.resolver
-+ maven-resolver-spi
-+ jar
-+ 1.6.3
-+
-+
-+ org.apache.maven
-+ maven-model-builder
-+ jar
-+ 3.8.4
-+
-+
-+ org.apache.maven
-+ maven-builder-support
-+ jar
-+ 3.8.4
-+
-+
-+ org.apache.maven.shared
-+ maven-shared-utils
-+ jar
-+ 3.3.4
-+
-+
-+ org.apache.maven
-+ maven-settings-builder
-+ jar
-+ 3.8.4
-+
-+
-+ org.codehaus.plexus
-+ plexus-sec-dispatcher
-+ jar
-+ 2.0
-+
-+
-+ org.codehaus.plexus
-+ plexus-cipher
-+ jar
-+ 2.0
-+
-+
-+ org.apache.maven
-+ maven-model
-+ jar
-+ 3.1.0
-+
-+
-+ org.codehaus.plexus
-+ plexus-component-annotations
-+ jar
-+ 1.5.5
-+
-+
+ org.codehaus.plexus
+ plexus-interpolation
+ jar
+ 1.26
+
+
-+ org.eclipse.sisu
-+ org.eclipse.sisu.plexus
++ org.codehaus.plexus
++ plexus-utils
+ jar
-+ 0.0.0.M2a
++ 3.5.1
+
+
+ org.apache.maven.shared
+ maven-filtering
+ jar
-+ 3.2.0
++ 3.3.1
+
+
+ org.sonatype.plexus
@@ -1377,13 +1315,13 @@
+ commons-io
+ commons-io
+ jar
-+ 2.6
++ 2.11.0
+
+
+ org.apache.commons
+ commons-lang3
+ jar
-+ 3.8.1
++ 3.12.0
+
+
+
diff --git a/maven-resources-plugin-build.xml b/maven-resources-plugin-build.xml
index 874ce35..b5aa505 100644
--- a/maven-resources-plugin-build.xml
+++ b/maven-resources-plugin-build.xml
@@ -19,10 +19,10 @@
unit tests."/>
-
+
-
+
diff --git a/maven-resources-plugin.changes b/maven-resources-plugin.changes
index 68205c4..7161878 100644
--- a/maven-resources-plugin.changes
+++ b/maven-resources-plugin.changes
@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Wed Sep 20 06:06:31 UTC 2023 - Fridrich Strba
+
+- Upgrade to version 3.3.1
+ * Bug
+ + MRESOURCES-237: Resource plugin's handling of symbolic links
+ changed in 3.0.x, broke existing behavior
+ + MRESOURCES-265: Resource copying not using specified encoding
+ + MRESOURCES-268: java.nio.charset.MalformedInputException:
+ Input length = 1
+ + MRESOURCES-273: Filtering of Maven properties with long names
+ is not working after transition from 2.6 to 3.2.0
+ + MRESOURCES-275: valid location for directory parameter is
+ always required
+ + MRESOURCES-269: Symlinks cause copying resources to fail
+ + MRESOURCES-289: FileUtils.copyFile() fails with source file
+ having lastModified = 0
+ * New Feature
+ + MRESOURCES-250: Add ability to flatten folder structure into
+ target directory when copying resources
+ * Improvement
+ + MRESOURCES-288: make tests jar reproducible
+ + MRESOURCES-292: describe from and to in "Copying x
+ resources" info message
+ * Task
+ + MRESOURCES-295: Drop plexus legacy
+ + MRESOURCES-297: Update to parent POM 39, reformat sources
+ + MRESOURCES-277: Update plugin (requires Maven 3.2.5+)
+ + MRESOURCES-283: Require Java 8
+ * Dependency upgrade
+ + MRESOURCES-282: Upgrade maven-plugin parent to 36
+ + MRESOURCES-286: Upgrade Maven Filtering to 3.3.0
+ + MRESOURCES-294: Upgrade plexus-utils to 3.5.1
+ + MRESOURCES-296: Upgrade to maven-filtering 3.3.1
+- Modified patch:
+ * maven-resources-plugin-bootstrap-resources.patch
+ + regenerate in cycle
+
-------------------------------------------------------------------
Fri Jun 24 09:44:50 UTC 2022 - Fridrich Strba
diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec
index 62d79a5..5bb5b82 100644
--- a/maven-resources-plugin.spec
+++ b/maven-resources-plugin.spec
@@ -1,7 +1,7 @@
#
# spec file
#
-# 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
@@ -23,7 +23,7 @@
%bcond_with bootstrap
%endif
%global base_name maven-resources-plugin
-Version: 3.2.0
+Version: 3.3.1
Release: 0
Summary: Maven Resources Plugin
License: Apache-2.0
@@ -32,7 +32,6 @@ URL: https://maven.apache.org/plugins/maven-resources-plugin
Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
Source1: %{base_name}-build.xml
Patch0: %{base_name}-bootstrap-resources.patch
-BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
@@ -96,7 +95,6 @@ cp %{SOURCE1} build.xml
%if %{with bootstrap}
mkdir -p lib
build-jar-repository -s lib \
- commons-io \
commons-lang3 \
maven-filtering/maven-filtering \
maven/maven-core \