Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-resources-plugin for
openSUSE:Factory checked in at 2025-12-01 11:13:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-resources-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-resources-plugin.new.14147 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-resources-plugin"
Mon Dec 1 11:13:42 2025 rev:9 rq:1320569 version:3.4.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-resources-plugin/maven-resources-plugin.changes
2024-02-21 17:57:54.118526494 +0100
+++
/work/SRC/openSUSE:Factory/.maven-resources-plugin.new.14147/maven-resources-plugin.changes
2025-12-01 11:14:10.484673928 +0100
@@ -1,0 +2,45 @@
+Sat Nov 29 05:06:50 UTC 2025 - Fridrich Strba <[email protected]>
+
+- Upgrade to version 3.4.0
+ * New features and improvements
+ + Enable GitHub Issues
+ * Documentation updates
+ + MNGSITE-529: Rename "Goals" to "Plugin Documentation"
+ + MRESOURCES-299: Be more accurate on using filtering element
+ + Don't bother with very old versions
+ * Maintenance
+ + Migrate site to Doxia 2
+ + PlexusFileUtils Refaster recipes
+ + Add PR Automation action
+ + Improve release-drafter configuration
+ + Add dependency to slf4j-simple for test scope
+ + Use try with resources in integration test
+ + reduce dependency scope of plexus-utils and commons-io
+ * Dependency updates
+ + Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.20.0
+ + Bump org.apache.maven.resolver:maven-resolver-api from 1.6.3
+ to 1.9.24
+ + Bump Maven to 3.9.11 while keep prerequisites on 3.6.3
+ + MRESOURCES-304: Bump org.codehaus.plexus:plexus-interpolation
+ from 1.26 to 1.27
+ + Bump org.codehaus.plexus:plexus-interpolation from 1.27 to
+ 1.29
+ + Bump m-invoker-p to 3.9.1
+ + Bump org.apache.maven.plugins:maven-plugins from 39 to 45
+ + Bump org.apache.maven.plugin-testing:maven-plugin-testing-harness
+ from 3.3.0 to 3.4.0
+ + MRESOURCES-302: Bump commons-io:commons-io from 2.11.0 to
+ 2.16.0
+ + Bump commons-io:commons-io from 2.16.0 to 2.20.0
+ + MRESOURCES-303: Bump org.apache.maven.shared:maven-filtering
+ from 3.3.1 to 3.3.2
+ + Bump org.apache.maven.shared:maven-filtering from 3.3.2 to
+ 3.4.0
+ + MRESOURCES-305: Bump org.codehaus.plexus:plexus-utils from
+ 3.5.1 to 4.0.0
+ + Bump apache/maven-gh-actions-shared from 3 to 4
+- Modified patch:
+ * maven-resources-plugin-bootstrap-resources.patch
+ + regenerate to the new version
+
+-------------------------------------------------------------------
@@ -55 +100 @@
- + [MRESOURCES-171] - ISO8859-1 properties files get changed into
+ + MRESOURCES-171: ISO8859-1 properties files get changed into
@@ -57,3 +102,3 @@
- + [MRESOURCES-210] - copy-resources erases file permissions
- + [MRESOURCES-236] - Copying of files with permissions broken
- + [MRESOURCES-257] - property from list element in pom model
+ + MRESOURCES-210: copy-resources erases file permissions
+ + MRESOURCES-236: Copying of files with permissions broken
+ + MRESOURCES-257: property from list element in pom model
@@ -61,4 +106,4 @@
- + [MRESOURCES-251] - Upgrade plexus-interpolation 1.26
- + [MRESOURCES-252] - Add m2e lifecycle Metadata to plugin
- + [MRESOURCES-256] - make build Reproducible
- + [MRESOURCES-258] - Only overwrite filtered resources when
+ + MRESOURCES-251: Upgrade plexus-interpolation 1.26
+ + MRESOURCES-252: Add m2e lifecycle Metadata to plugin
+ + MRESOURCES-256: make build Reproducible
+ + MRESOURCES-258: Only overwrite filtered resources when
@@ -67,4 +112,4 @@
- + [MRESOURCES-249] - Upgrade maven-plugins parent to version 32
- + [MRESOURCES-255] - Upgrade plexus-utils 3.3.0
- + [MRESOURCES-261] - Make Maven 3.1.0 the minimum version
- + [MRESOURCES-263] - Update to maven-filtering 3.2.0
+ + MRESOURCES-249: Upgrade maven-plugins parent to version 32
+ + MRESOURCES-255: Upgrade plexus-utils 3.3.0
+ + MRESOURCES-261: Make Maven 3.1.0 the minimum version
+ + MRESOURCES-263: Update to maven-filtering 3.2.0
Old:
----
maven-resources-plugin-3.3.1-source-release.zip
New:
----
_scmsync.obsinfo
build.specials.obscpio
maven-resources-plugin-3.4.0-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-resources-plugin.spec ++++++
--- /var/tmp/diff_new_pack.oqupA0/_old 2025-12-01 11:14:11.024696788 +0100
+++ /var/tmp/diff_new_pack.oqupA0/_new 2025-12-01 11:14:11.024696788 +0100
@@ -23,7 +23,7 @@
%bcond_with bootstrap
%endif
%global base_name maven-resources-plugin
-Version: 3.3.1
+Version: 3.4.0
Release: 0
Summary: Maven Resources Plugin
License: Apache-2.0
@@ -32,6 +32,7 @@
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: atinject
BuildRequires: apache-commons-lang3
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
@@ -95,6 +96,7 @@
%if %{with bootstrap}
mkdir -p lib
build-jar-repository -s lib \
+ atinject \
commons-lang3 \
maven-filtering/maven-filtering \
maven/maven-core \
++++++ _scmsync.obsinfo ++++++
mtime: 1764394420
commit: 1cff0709eb9a19308d161ff605ff309b91f89fbd255ef80831997ae8f46f77ed
url: https://src.opensuse.org/java-packages/maven-resources-plugin.git
revision: 1cff0709eb9a19308d161ff605ff309b91f89fbd255ef80831997ae8f46f77ed
projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj
++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore 2025-11-29 06:34:14.000000000 +0100
@@ -0,0 +1 @@
+.osc
++++++ maven-resources-plugin-3.3.1-source-release.zip ->
maven-resources-plugin-3.4.0-source-release.zip ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/.asf.yaml
new/maven-resources-plugin-3.4.0/.asf.yaml
--- old/maven-resources-plugin-3.3.1/.asf.yaml 2023-03-21 12:01:00.000000000
+0100
+++ new/maven-resources-plugin-3.4.0/.asf.yaml 1970-01-01 01:00:00.000000000
+0100
@@ -1,26 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# see https://s.apache.org/asfyaml
-github:
- description: "Apache Maven Resources Plugin"
- homepage: https://maven.apache.org/plugins/maven-resources-plugin/
- labels:
- - java
- - build-management
- - maven-plugins
- - maven-resources-plugin
- - maven
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/.git-blame-ignore-revs
new/maven-resources-plugin-3.4.0/.git-blame-ignore-revs
--- old/maven-resources-plugin-3.3.1/.git-blame-ignore-revs 1970-01-01
01:00:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/.git-blame-ignore-revs 2025-11-22
21:31:06.000000000 +0100
@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Change maven code style (parent 39)
+f7a6f229db49673ddd21ff521027b9af49f69bb8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/.github/dependabot.yml
new/maven-resources-plugin-3.4.0/.github/dependabot.yml
--- old/maven-resources-plugin-3.3.1/.github/dependabot.yml 2023-03-21
12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/.github/dependabot.yml 1970-01-01
01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-version: 2
-updates:
-- package-ecosystem: maven
- directory: "/"
- schedule:
- interval: daily
- time: '04:00'
- open-pull-requests-limit: 10
- ignore:
- # Ignore Maven Core updates
- - dependency-name: "org.apache.maven:*"
-- package-ecosystem: "github-actions"
- directory: "/"
- schedule:
- interval: "daily"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/.github/pull_request_template.md
new/maven-resources-plugin-3.4.0/.github/pull_request_template.md
--- old/maven-resources-plugin-3.3.1/.github/pull_request_template.md
2023-03-21 12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/.github/pull_request_template.md
1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-Following this checklist to help us incorporate your
-contribution quickly and easily:
-
- - [ ] Make sure there is a [JIRA
issue](https://issues.apache.org/jira/browse/MRESOURCES) filed
- for the change (usually before you start working on it). Trivial
changes like typos do not
- require a JIRA issue. Your pull request should address just this
issue, without
- pulling in other changes.
- - [ ] Each commit in the pull request should have a meaningful subject line
and body.
- - [ ] Format the pull request title like `[MRESOURCES-XXX] - Fixes bug in
ApproximateQuantiles`,
- where you replace `MRESOURCES-XXX` with the appropriate JIRA issue.
Best practice
- is to use the JIRA issue title in the pull request title and in the
first line of the
- commit message.
- - [ ] Write a pull request description that is detailed enough to understand
what the pull request does, how, and why.
- - [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough
check will
- be performed on your pull request automatically.
- - [ ] You have run the integration tests successfully (`mvn -Prun-its clean
verify`).
-
-If your pull request is about ~20 lines of code you don't need to sign an
-[Individual Contributor License
Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure
-please ask on the developers list.
-
-To make clear that you license your contribution under
-the [Apache License Version 2.0, January
2004](http://www.apache.org/licenses/LICENSE-2.0)
-you have to acknowledge this by using the following check-box.
-
- - [ ] I hereby declare this contribution to be licenced under the [Apache
License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
-
- - [ ] In any other case, please file an [Apache Individual Contributor
License Agreement](https://www.apache.org/licenses/icla.pdf).
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/.github/release-drafter.yml
new/maven-resources-plugin-3.4.0/.github/release-drafter.yml
--- old/maven-resources-plugin-3.3.1/.github/release-drafter.yml
2023-03-21 12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/.github/release-drafter.yml
1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-_extends: maven-gh-actions-shared
-tag-template: maven-resources-plugin-$NEXT_MINOR_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/.github/workflows/maven-verify.yml
new/maven-resources-plugin-3.4.0/.github/workflows/maven-verify.yml
--- old/maven-resources-plugin-3.3.1/.github/workflows/maven-verify.yml
2023-03-21 12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/.github/workflows/maven-verify.yml
1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: Verify
-
-on:
- push:
- pull_request:
-
-jobs:
- build:
- name: Verify
- uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/.github/workflows/release-drafter.yml
new/maven-resources-plugin-3.4.0/.github/workflows/release-drafter.yml
--- old/maven-resources-plugin-3.3.1/.github/workflows/release-drafter.yml
2023-03-21 12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/.github/workflows/release-drafter.yml
1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: Release Drafter
-on:
- push:
- branches:
- - master
-jobs:
- update_release_draft:
- uses:
apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/DEPENDENCIES
new/maven-resources-plugin-3.4.0/DEPENDENCIES
--- old/maven-resources-plugin-3.3.1/DEPENDENCIES 2023-03-21
12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/DEPENDENCIES 2025-11-22
21:31:06.000000000 +0100
@@ -7,31 +7,38 @@
From: 'an unknown organization'
+
- javax.inject (http://code.google.com/p/atinject/)
javax.inject:javax.inject:jar:1
License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
- plexus-build-api
(http://forge.sonatype.com/spice-parent/plexus-build-api/)
org.sonatype.plexus:plexus-build-api:jar:0.0.7
License: Apache Public License 2.0
(http://www.apache.org/licenses/LICENSE-2.0)
-From: 'Codehaus Plexus' (http://codehaus-plexus.github.io/)
- - Plexus Interpolation API
(http://codehaus-plexus.github.io/plexus-interpolation/)
org.codehaus.plexus:plexus-interpolation:bundle:1.26
- License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'Codehaus Plexus' (https://codehaus-plexus.github.io/)
- - Plexus Common Utilities (https://codehaus-plexus.github.io/plexus-utils/)
org.codehaus.plexus:plexus-utils:jar:3.5.1
- License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+ - Plexus Interpolation API
(https://codehaus-plexus.github.io/plexus-pom/plexus-interpolation/)
org.codehaus.plexus:plexus-interpolation:bundle:1.28
+ License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
+
+ - Plexus XML Utilities (https://codehaus-plexus.github.io/plexus-xml/)
org.codehaus.plexus:plexus-xml:jar:3.0.1
+ License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
+
From: 'QOS.ch' (http://www.qos.ch)
+
- SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.36
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
+
From: 'The Apache Software Foundation' (https://www.apache.org/)
- - Apache Commons IO (https://commons.apache.org/proper/commons-io/)
commons-io:commons-io:jar:2.11.0
- License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Commons Lang (https://commons.apache.org/proper/commons-lang/)
org.apache.commons:commons-lang3:jar:3.12.0
- License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Maven Filtering (https://maven.apache.org/shared/maven-filtering/)
org.apache.maven.shared:maven-filtering:jar:3.3.1
+
+ - Apache Commons Lang (https://commons.apache.org/proper/commons-lang/)
org.apache.commons:commons-lang3:jar:3.20.0
License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Apache Maven Filtering (https://maven.apache.org/shared/maven-filtering/)
org.apache.maven.shared:maven-filtering:jar:3.4.0
+ License: Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/NOTICE
new/maven-resources-plugin-3.4.0/NOTICE
--- old/maven-resources-plugin-3.3.1/NOTICE 2023-03-21 12:01:00.000000000
+0100
+++ new/maven-resources-plugin-3.4.0/NOTICE 2025-11-22 21:31:06.000000000
+0100
@@ -1,8 +1,6 @@
-
Apache Maven Resources Plugin
-Copyright 2001-2023 The Apache Software Foundation
+Copyright 2001-2025 The Apache Software Foundation
+
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/README.md
new/maven-resources-plugin-3.4.0/README.md
--- old/maven-resources-plugin-3.3.1/README.md 2023-03-21 12:01:00.000000000
+0100
+++ new/maven-resources-plugin-3.4.0/README.md 2025-11-22 21:31:06.000000000
+0100
@@ -17,9 +17,9 @@
Contributing to [Apache Maven Resources
Plugin](https://maven.apache.org/plugins/maven-resources-plugin/)
======================
-[][jira]
[][license]
[](https://search.maven.org/artifact/org.apache.maven.plugins/maven-resources-plugin)
+[](https://search.maven.org/artifact/org.apache.maven.plugins/maven-resources-plugin)
[](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/plugins/maven-resources-plugin/README.md)
[][build]
[][test-results]
@@ -34,7 +34,6 @@
Getting Started
---------------
-+ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
+ Make sure you have a [GitHub account](https://github.com/signup/free).
+ If you're planning to implement a new feature, it makes sense to discuss
your changes
on the [dev list][ml-list] first.
@@ -60,11 +59,6 @@
+ Create minimal diffs - disable on save actions like reformat source code
or organize imports.
If you feel the source code should be reformatted, create a separate PR
for this change.
+ Check for unnecessary whitespace with `git diff --check` before committing.
-+ Make sure your commit messages are in the proper format. Your commit message
should contain the key of the JIRA issue.
-```
-[MRESOURCES-XXX] - Subject of the JIRA Ticket
- Optional supplemental description.
-```
+ Make sure you have added the necessary tests (JUnit/IT) for your changes.
+ Run all the tests with `mvn -Prun-its verify` to assure nothing else was
accidentally broken.
+ Submit a pull request to the repository in the Apache organization.
@@ -72,25 +66,15 @@
If you plan to contribute on a regular basis, please consider filing a
[contributor license agreement][cla].
-Making Trivial Changes
-----------------------
-
-For changes of a trivial nature to comments and documentation, it is not always
-necessary to create a new ticket in JIRA. In this case, it is appropriate to
-start the first line of a commit with '(doc)' instead of a ticket number.
-
Additional Resources
--------------------
+ [Contributing
patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
-+ [Apache Maven Resources JIRA project page][jira]
+ [Contributor License Agreement][cla]
+ [General GitHub documentation](https://help.github.com/)
+ [GitHub pull request
documentation](https://help.github.com/send-pull-requests/)
+ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
-+ #Maven IRC channel on freenode.org
-[jira]: https://issues.apache.org/jira/projects/MRESOURCES/
[license]: https://www.apache.org/licenses/LICENSE-2.0
[ml-list]: https://maven.apache.org/mailing-lists.html
[code-style]: https://maven.apache.org/developers/conventions/code.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/deploySite.sh
new/maven-resources-plugin-3.4.0/deploySite.sh
--- old/maven-resources-plugin-3.3.1/deploySite.sh 2023-03-21
12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/deploySite.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-mvn -Preporting site site:stage $@
-mvn scm-publish:publish-scm $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/pom.xml
new/maven-resources-plugin-3.4.0/pom.xml
--- old/maven-resources-plugin-3.3.1/pom.xml 2023-03-21 12:01:00.000000000
+0100
+++ new/maven-resources-plugin-3.4.0/pom.xml 2025-11-22 21:31:06.000000000
+0100
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>39</version>
+ <version>45</version>
</parent>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
+ <version>3.4.0</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Resources Plugin</name>
@@ -46,22 +46,22 @@
</contributors>
<prerequisites>
- <maven>${mavenVersion}</maven>
+ <maven>3.6.3</maven>
</prerequisites>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-resources-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-resources-plugin.git</developerConnection>
- <tag>maven-resources-plugin-3.3.1</tag>
+ <tag>maven-resources-plugin-3.4.0</tag>
<url>https://github.com/apache/maven-resources-plugin/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/MRESOURCES</url>
+ <system>GitHub</system>
+ <url>https://github.com/apache/maven-resources-plugin/issues</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
-
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-resources-plugin/</url>
+
<url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-resources-plugin/</url>
</ciManagement>
<distributionManagement>
<site>
@@ -71,10 +71,12 @@
</distributionManagement>
<properties>
- <mavenFilteringVersion>3.3.1</mavenFilteringVersion>
- <mavenVersion>3.2.5</mavenVersion>
+ <mavenFilteringVersion>3.4.0</mavenFilteringVersion>
+ <mavenVersion>3.9.11</mavenVersion>
<javaVersion>8</javaVersion>
-
<project.build.outputTimestamp>2023-03-21T12:00:59Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2025-11-22T21:31:06Z</project.build.outputTimestamp>
+
+ <version.maven-invoker-plugin>3.9.1</version.maven-invoker-plugin>
</properties>
<dependencies>
@@ -97,62 +99,41 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
+ <version>${version.maven-plugin-tools}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-interpolation</artifactId>
- <version>1.26</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.3.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.5.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
<version>${mavenFilteringVersion}</version>
</dependency>
- <!-- Upgrade of transitive commons-io 2.4 of maven-shared-utils of
maven-filtering. -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.11.0</version>
- <scope>compile</scope>
+ <version>2.21.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${mavenVersion}</version>
- <scope>test</scope>
+ <version>3.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -164,7 +145,18 @@
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
- <version>1.6.3</version>
+ <version>1.9.24</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.36</version>
<scope>test</scope>
</dependency>
</dependencies>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/it/MRESOURCES-99/verify.groovy
new/maven-resources-plugin-3.4.0/src/it/MRESOURCES-99/verify.groovy
--- old/maven-resources-plugin-3.3.1/src/it/MRESOURCES-99/verify.groovy
2023-03-21 12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/src/it/MRESOURCES-99/verify.groovy
2025-11-22 21:31:06.000000000 +0100
@@ -23,8 +23,6 @@
import java.util.Collections;
import java.util.Arrays;
-import org.codehaus.plexus.util.*;
-
boolean result = true;
File target = new File( basedir, "target" );
@@ -43,23 +41,14 @@
Properties props = new Properties();
-FileInputStream fis = null;
-try
-{
- fis = new FileInputStream( someResource );
+try (FileInputStream fis = new FileInputStream( someResource )) {
props.load( fis );
- fis.close();
- fis = null;
}
catch ( IOException ex )
{
System.err.println( "Failure during reading the properties " +
someResource.getAbsolutePath() );
return false;
}
-finally
-{
- IOUtil.close( fis );
-}
def keysWhichHaveToExist = [
"timestamp",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/it/user-filters/invoker.properties
new/maven-resources-plugin-3.4.0/src/it/user-filters/invoker.properties
--- old/maven-resources-plugin-3.3.1/src/it/user-filters/invoker.properties
2023-03-21 12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/src/it/user-filters/invoker.properties
2025-11-22 21:31:06.000000000 +0100
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.systemPropertiesFile = test.properties
\ No newline at end of file
+invoker.userPropertiesFile = test.properties
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
new/maven-resources-plugin-3.4.0/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
---
old/maven-resources-plugin-3.3.1/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
2025-11-22 21:31:06.000000000 +0100
@@ -18,7 +18,10 @@
*/
package org.apache.maven.plugins.resources;
+import javax.inject.Inject;
+
import java.io.File;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -32,7 +35,6 @@
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -50,7 +52,7 @@
* @author Andreas Hoheneder
* @author William Ferguson
*/
-@Mojo(name = "resources", defaultPhase = LifecyclePhase.PROCESS_RESOURCES,
requiresProject = true, threadSafe = true)
+@Mojo(name = "resources", defaultPhase = LifecyclePhase.PROCESS_RESOURCES,
threadSafe = true)
public class ResourcesMojo extends AbstractMojo {
/**
@@ -125,13 +127,13 @@
/**
*
*/
- @Component(role = MavenResourcesFiltering.class, hint = "default")
+ @Inject
protected MavenResourcesFiltering mavenResourcesFiltering;
/**
*
*/
- @Component(role = MavenResourcesFiltering.class)
+ @Inject
protected Map<String, MavenResourcesFiltering> mavenResourcesFilteringMap;
/**
@@ -297,7 +299,7 @@
if (StringUtils.isBlank(encoding) &&
isFilteringEnabled(getResources())) {
getLog().warn("File encoding has not been set, using platform
encoding "
- + System.getProperty("file.encoding")
+ + Charset.defaultCharset().displayName()
+ ". Build is platform dependent!");
getLog().warn("See
https://maven.apache.org/general.html#encoding-warning";);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
new/maven-resources-plugin-3.4.0/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
---
old/maven-resources-plugin-3.3.1/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
2025-11-22 21:31:06.000000000 +0100
@@ -34,11 +34,7 @@
* @author <a href="[email protected]">Michal Maczka</a>
* @author <a href="mailto:[email protected]";>Jason van Zyl</a>
*/
-@Mojo(
- name = "testResources",
- defaultPhase = LifecyclePhase.PROCESS_TEST_RESOURCES,
- requiresProject = true,
- threadSafe = true)
+@Mojo(name = "testResources", defaultPhase =
LifecyclePhase.PROCESS_TEST_RESOURCES, threadSafe = true)
public class TestResourcesMojo extends ResourcesMojo {
/**
* The output directory into which to copy the resources.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/site/apt/examples/filter.apt
new/maven-resources-plugin-3.4.0/src/site/apt/examples/filter.apt
--- old/maven-resources-plugin-3.3.1/src/site/apt/examples/filter.apt
2023-03-21 12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/src/site/apt/examples/filter.apt
2025-11-22 21:31:06.000000000 +0100
@@ -72,7 +72,7 @@
Hello ${name}
+-----+
- However, if we add a <<<\<filtering\>>>> tag to our POM and set it to
<<<true>>> like this:
+ However, if we add a <<<\<filtering\>>>> element to our POM and set it to
<<<true>>> like this:
+-----+
<project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/site/apt/index.apt.vm
new/maven-resources-plugin-3.4.0/src/site/apt/index.apt.vm
--- old/maven-resources-plugin-3.3.1/src/site/apt/index.apt.vm 2023-03-21
12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/src/site/apt/index.apt.vm 2025-11-22
21:31:06.000000000 +0100
@@ -36,7 +36,7 @@
Thus, this allows the separation of resources for the main source code and its
unit tests.
- Starting with version 2.3 this plugin uses the
{{{http://maven.apache.org/shared/maven-filtering/}Maven Filtering}}
+ This plugin uses the {{{http://maven.apache.org/shared/maven-filtering/}Maven
Filtering}}
shared component for filtering resources.
* Goals Overview
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resources-plugin-3.3.1/src/site/site.xml
new/maven-resources-plugin-3.4.0/src/site/site.xml
--- old/maven-resources-plugin-3.3.1/src/site/site.xml 2023-03-21
12:01:00.000000000 +0100
+++ new/maven-resources-plugin-3.4.0/src/site/site.xml 2025-11-22
21:31:06.000000000 +0100
@@ -19,17 +19,16 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";>
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
- <item name="Goals" href="plugin-info.html"/>
+ <item name="Plugin Documentation" href="plugin-info.html"/>
<item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/>
<!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
- <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="License" href="https://www.apache.org/licenses/"/>
<item name="Download" href="download.html"/>
</menu>
<menu name="Examples">
@@ -53,4 +52,4 @@
href="/examples/custom-resource-filters.html"/>
</menu>
</body>
-</project>
+</site>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
---
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
2025-11-22 21:31:06.000000000 +0100
@@ -26,7 +26,6 @@
import java.util.Properties;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.util.IOUtil;
/**
* Base class for propertyutils test case
@@ -78,19 +77,10 @@
*
* @param validationPropFile
*/
- private void loadValidationProperties(File validationPropFile) {
+ private void loadValidationProperties(File validationPropFile) throws
IOException {
validationProp = new Properties();
- InputStream in = null;
-
- try {
- in = Files.newInputStream(validationPropFile.toPath());
+ try (InputStream in =
Files.newInputStream(validationPropFile.toPath())) {
validationProp.load(in);
- in.close();
- in = null;
- } catch (IOException ex) {
- // TODO: do error handling
- } finally {
- IOUtil.close(in);
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
---
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
2025-11-22 21:31:06.000000000 +0100
@@ -24,13 +24,9 @@
import org.apache.maven.shared.filtering.PropertyUtils;
public class BasicPropertyUtilsTest extends AbstractPropertyUtilsTest {
- protected static final String validationFileName =
-
"/target/test-classes/unit/propertiesutils-test/basic_validation.properties";
-
- protected static final String propFileName =
"/target/test-classes/unit/propertiesutils-test/basic.properties";
protected File getPropertyFile() {
- File propFile = new File(getBasedir(), propFileName);
+ File propFile = new File(getBasedir(),
"/target/test-classes/unit/propertiesutils-test/basic.properties");
if (!propFile.exists()) {
propFile = null;
@@ -40,7 +36,8 @@
}
protected File getValidationFile() {
- File validationFile = new File(getBasedir(), validationFileName);
+ File validationFile =
+ new File(getBasedir(),
"/target/test-classes/unit/propertiesutils-test/basic_validation.properties");
if (!validationFile.exists()) {
validationFile = null;
@@ -54,7 +51,7 @@
*
* @throws Exception
*/
- public void testBasicLoadProperty_FF() throws Exception {
+ public void testBasicLoadPropertyFF() throws Exception {
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, false,
false);
assertNotNull(prop);
@@ -66,7 +63,7 @@
*
* @throws Exception
*/
- public void testBasicLoadProperty_TF() throws Exception {
+ public void testBasicLoadPropertyTF() throws Exception {
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true,
false);
assertNotNull(prop);
@@ -78,7 +75,7 @@
*
* @throws Exception
*/
- public void testBasicLoadProperty_TT() throws Exception {
+ public void testBasicLoadPropertyTT() throws Exception {
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true,
true);
validationProp.putAll(System.getProperties());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
---
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
2025-11-22 21:31:06.000000000 +0100
@@ -32,8 +32,6 @@
*/
public class CopyResourcesMojoTest extends AbstractMojoTestCase {
- protected static final String defaultPomFilePath =
"/target/test-classes/unit/resources-test/plugin-config.xml";
-
File outputDirectory = new File(getBasedir(),
"/target/copyResourcesTests");
protected void setUp() throws Exception {
@@ -46,7 +44,7 @@
}
public void testCopyWithoutFiltering() throws Exception {
- File testPom = new File(getBasedir(), defaultPomFilePath);
+ File testPom = new File(getBasedir(),
"/target/test-classes/unit/resources-test/plugin-config.xml");
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
mojo.setOutputDirectory(outputDirectory);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
---
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
2025-11-22 21:31:06.000000000 +0100
@@ -37,26 +37,21 @@
import org.codehaus.plexus.util.FileUtils;
public class ResourcesMojoTest extends AbstractMojoTestCase {
- protected static final String defaultPomFilePath =
"/target/test-classes/unit/resources-test/plugin-config.xml";
+ private final String defaultPomFilePath =
"/target/test-classes/unit/resources-test/plugin-config.xml";
/**
* test mojo lookup, test harness should be working fine
- *
- * @throws Exception
*/
public void testHarnessEnvironment() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
assertNotNull(mojo);
}
- /**
- * @throws Exception
- */
public void testResourceDirectoryStructure() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceDirectoryStructure");
List<Resource> resources = project.getBuild().getResources();
@@ -86,12 +81,9 @@
assertTrue(FileUtils.fileExists(resourcesDir + "/notpackage/test"));
}
- /**
- * @throws Exception
- */
- public void testResourceDirectoryStructure_RelativePath() throws Exception
{
+ public void testResourceDirectoryStructureRelativePath() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceDirectoryStructure_RelativePath");
List<Resource> resources = project.getBuild().getResources();
@@ -122,12 +114,9 @@
assertTrue(FileUtils.fileExists(resourcesDir + "/notpackage/test"));
}
- /**
- * @throws Exception
- */
public void testResourceEncoding() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("encoding");
List<Resource> resources = project.getBuild().getResources();
@@ -151,12 +140,9 @@
assertTrue(FileUtils.fileExists(resourcesDir + "/file4.txt"));
}
- /**
- * @throws Exception
- */
public void testResourceInclude() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceInclude");
List<Resource> resources = project.getBuild().getResources();
@@ -202,12 +188,9 @@
assertFalse(FileUtils.fileExists(resourcesDir +
"/notpackage/nottest/file.txt"));
}
- /**
- * @throws Exception
- */
public void testResourceExclude() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceExclude");
List<Resource> resources = project.getBuild().getResources();
@@ -259,7 +242,7 @@
*/
public void testResourceTargetPath() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceTargetPath");
List<Resource> resources = project.getBuild().getResources();
@@ -294,9 +277,9 @@
/**
* @throws Exception
*/
- public void testResourceSystemProperties_Filtering() throws Exception {
+ public void testResourceSystemPropertiesFiltering() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceSystemProperties_Filtering");
List<Resource> resources = project.getBuild().getResources();
@@ -340,9 +323,9 @@
/**
* @throws Exception
*/
- public void testResourceProjectProperties_Filtering() throws Exception {
+ public void testResourceProjectPropertiesFiltering() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceProjectProperties_Filtering");
List<Resource> resources = project.getBuild().getResources();
@@ -371,9 +354,9 @@
/**
* @throws Exception
*/
- public void testProjectProperty_Filtering_PropertyDestination() throws
Exception {
+ public void testProjectPropertyFilteringPropertyDestination() throws
Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project =
new
MavenProjectResourcesStub("resourcePojectProperty_Filtering_PropertyDestination");
List<Resource> resources = project.getBuild().getResources();
@@ -406,9 +389,9 @@
/**
* @throws Exception
*/
- public void testPropertyFiles_Filtering() throws Exception {
+ public void testPropertyFilesFiltering() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourcePropertyFiles_Filtering");
List<Resource> resources = project.getBuild().getResources();
LinkedList<String> filterList = new LinkedList<>();
@@ -439,9 +422,9 @@
/**
* @throws Exception
*/
- public void testPropertyFiles_Extra() throws Exception {
+ public void testPropertyFilesExtra() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourcePropertyFiles_Extra");
List<Resource> resources = project.getBuild().getResources();
LinkedList<String> filterList = new LinkedList<>();
@@ -472,9 +455,9 @@
/**
* @throws Exception
*/
- public void testPropertyFiles_MainAndExtra() throws Exception {
+ public void testPropertyFilesMainAndExtra() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourcePropertyFiles_MainAndExtra");
List<Resource> resources = project.getBuild().getResources();
LinkedList<String> filterList = new LinkedList<>();
@@ -516,9 +499,9 @@
*
* @throws Exception
*/
- public void testPropertyFiles_Filtering_TokensInFilters() throws Exception
{
+ public void testPropertyFilesFilteringTokensInFilters() throws Exception {
final File testPom = new File(getBasedir(), defaultPomFilePath);
- final ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources",
testPom);
+ final ResourcesMojo mojo = lookupMojo("resources", testPom);
final MavenProjectResourcesStub project =
new
MavenProjectResourcesStub("resourcePropertyFiles_Filtering_TokensInFilters");
final List<Resource> resources = project.getBuild().getResources();
@@ -550,7 +533,7 @@
public void testWindowsPathEscapingDisabled() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("windows-paths");
List<Resource> resources = project.getBuild().getResources();
@@ -586,7 +569,7 @@
public void testWindowsPathEscapingEnabled() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("windows-paths");
List<Resource> resources = project.getBuild().getResources();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
---
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
2025-11-22 21:31:06.000000000 +0100
@@ -28,30 +28,21 @@
import org.codehaus.plexus.util.FileUtils;
public class TestResourcesTest extends AbstractMojoTestCase {
- protected static final String defaultPomFilePath =
"/target/test-classes/unit/resources-test/plugin-config.xml";
-
- protected void setUp() throws Exception {
- super.setUp();
- }
+ private final String defaultPomFilePath =
"/target/test-classes/unit/resources-test/plugin-config.xml";
/**
* test mojo lookup, test harness should be working fine
- *
- * @throws Exception
*/
public void testHarnessEnvironment() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("testResources",
testPom);
+ ResourcesMojo mojo = lookupMojo("testResources", testPom);
assertNotNull(mojo);
}
- /**
- * @throws Exception
- */
public void testTestResourceDirectoryCreation() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- TestResourcesMojo mojo = (TestResourcesMojo)
lookupMojo("testResources", testPom);
+ TestResourcesMojo mojo = lookupMojo("testResources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("testResourceDirectoryStructure");
List<Resource> resources = project.getBuild().getResources();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
---
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
2025-11-22 21:31:06.000000000 +0100
@@ -27,11 +27,12 @@
import java.util.Collections;
import java.util.List;
-import org.apache.commons.io.FileUtils;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.filtering.MavenResourcesExecution;
import org.apache.maven.shared.filtering.MavenResourcesFiltering;
+import static org.apache.commons.io.FileUtils.writeLines;
+
/**
* @author Olivier Lamy
* @since 2.5
@@ -72,7 +73,7 @@
.getMavenSession()
.getSystemProperties()
.getProperty("toto"));
- FileUtils.writeLines(f, lines);
+ writeLines(f, lines);
} catch (IOException e) {
throw new MavenFilteringException(e.getMessage(), e);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
---
old/maven-resources-plugin-3.3.1/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
2023-03-21 12:01:00.000000000 +0100
+++
new/maven-resources-plugin-3.4.0/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
2025-11-22 21:31:06.000000000 +0100
@@ -27,6 +27,8 @@
import org.apache.maven.model.Build;
import org.codehaus.plexus.util.FileUtils;
+import static org.apache.commons.io.FileUtils.deleteDirectory;
+
public class MavenProjectBuildStub extends MavenProjectBasicStub {
protected Build build;
@@ -118,13 +120,7 @@
* @return
*/
private boolean isValidPath(String path) {
- boolean bRetVal = true;
-
- if (path.startsWith("c:") || path.startsWith("..") ||
path.startsWith("/") || path.startsWith("\\")) {
- bRetVal = false;
- }
-
- return bRetVal;
+ return !path.startsWith("c:") && !path.startsWith("..") &&
!path.startsWith("/") && !path.startsWith("\\");
}
private void setupBuild() {
@@ -145,19 +141,19 @@
public void cleanBuildEnvironment() throws Exception {
if (FileUtils.fileExists(resourcesDirectory)) {
- FileUtils.deleteDirectory(resourcesDirectory);
+ deleteDirectory(new File(resourcesDirectory));
}
if (FileUtils.fileExists(testResourcesDirectory)) {
- FileUtils.deleteDirectory(testResourcesDirectory);
+ deleteDirectory(new File(testResourcesDirectory));
}
if (FileUtils.fileExists(outputDirectory)) {
- FileUtils.deleteDirectory(outputDirectory);
+ deleteDirectory(new File(outputDirectory));
}
if (FileUtils.fileExists(testOutputDirectory)) {
- FileUtils.deleteDirectory(testOutputDirectory);
+ deleteDirectory(new File(testOutputDirectory));
}
}
++++++ maven-resources-plugin-bootstrap-resources.patch ++++++
++++ 1944 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/maven-resources-plugin/maven-resources-plugin-bootstrap-resources.patch
++++ and
/work/SRC/openSUSE:Factory/.maven-resources-plugin.new.14147/maven-resources-plugin-bootstrap-resources.patch
++++++ maven-resources-plugin-build.xml ++++++
--- /var/tmp/diff_new_pack.oqupA0/_old 2025-12-01 11:14:17.772982451 +0100
+++ /var/tmp/diff_new_pack.oqupA0/_new 2025-12-01 11:14:17.776982620 +0100
@@ -19,10 +19,10 @@
unit tests."/>
<property name="project.groupId" value="org.apache.maven.plugins"/>
<property name="project.artifactId" value="maven-resources-plugin"/>
- <property name="project.version" value="3.3.1"/>
+ <property name="project.version" value="3.4.0"/>
<property name="project.organization.name" value="The Apache Software
Foundation"/>
- <property name="spec.version" value="3.3"/>
+ <property name="spec.version" value="3.4"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
