From b8973208ca43f1e43d63dde4ce242ba084f664bb445c2c8d1a61ec593ae05645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 16:41:19 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main maven-resources-plugin revision 624becd52ce433ee2214296ba74ebae8 --- .gitattributes | 23 + _multibuild | 3 + ...-resources-plugin-3.3.1-source-release.zip | 3 + ...resources-plugin-bootstrap-resources.patch | 1327 +++++++++++++++++ maven-resources-plugin-build.xml | 265 ++++ maven-resources-plugin.changes | 93 ++ maven-resources-plugin.spec | 131 ++ 7 files changed, 1845 insertions(+) create mode 100644 .gitattributes create mode 100644 _multibuild create mode 100644 maven-resources-plugin-3.3.1-source-release.zip create mode 100644 maven-resources-plugin-bootstrap-resources.patch create mode 100644 maven-resources-plugin-build.xml create mode 100644 maven-resources-plugin.changes create mode 100644 maven-resources-plugin.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..93032d2 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + bootstrap + 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 new file mode 100644 index 0000000..7ef4afb --- /dev/null +++ b/maven-resources-plugin-bootstrap-resources.patch @@ -0,0 +1,1327 @@ +--- 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} ++ ${project.description} ++ ${project.groupId} ++ ${project.artifactId} ++ ${project.version} ++ resources ++ ++ ++ copy-resources ++ Copy resources of the configured plugin attribute resources ++ false ++ true ++ false ++ false ++ false ++ true ++ org.apache.maven.plugins.resources.CopyResourcesMojo ++ java ++ per-lookup ++ once-per-session ++ 2.3 ++ true ++ ++ ++ addDefaultExcludes ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ delimiters ++ java.util.LinkedHashSet ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ encoding ++ java.lang.String ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeString ++ java.lang.String ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeWindowsPaths ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ fileNameFiltering ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ filters ++ java.util.List ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ includeEmptyDirs ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ mavenFilteringHints ++ java.util.List ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ nonFilteredFileExtensions ++ java.util.List ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ outputDirectory ++ java.io.File ++ true ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ overwrite ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ resources ++ java.util.List ++ true ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ skip ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ supportMultiLineFiltering ++ boolean ++ 2.5 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useBuildFilters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useDefaultDelimiters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ${maven.resources.skip} ++ ++ ++ ++ ++ ++ ++ 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 ++ true ++ false ++ false ++ false ++ true ++ process-resources ++ org.apache.maven.plugins.resources.ResourcesMojo ++ java ++ per-lookup ++ once-per-session ++ true ++ ++ ++ addDefaultExcludes ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ delimiters ++ java.util.LinkedHashSet ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ encoding ++ java.lang.String ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeString ++ java.lang.String ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeWindowsPaths ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ fileNameFiltering ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ filters ++ java.util.List ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ includeEmptyDirs ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ mavenFilteringHints ++ java.util.List ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ nonFilteredFileExtensions ++ java.util.List ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ outputDirectory ++ java.io.File ++ true ++ true ++ 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. ++ ++ ++ overwrite ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ skip ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ supportMultiLineFiltering ++ boolean ++ 2.5 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useBuildFilters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useDefaultDelimiters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ${maven.resources.skip} ++ ++ ++ ++ ++ ++ ++ testResources ++ Copy resources for the test source code to the test output directory. Always uses the project.build.testResources element to specify the resources to copy. ++ false ++ true ++ false ++ false ++ false ++ true ++ process-test-resources ++ org.apache.maven.plugins.resources.TestResourcesMojo ++ java ++ per-lookup ++ once-per-session ++ true ++ ++ ++ addDefaultExcludes ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ delimiters ++ java.util.LinkedHashSet ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ encoding ++ java.lang.String ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeString ++ java.lang.String ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeWindowsPaths ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ fileNameFiltering ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ filters ++ java.util.List ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ includeEmptyDirs ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ mavenFilteringHints ++ java.util.List ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ nonFilteredFileExtensions ++ java.util.List ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ outputDirectory ++ java.io.File ++ true ++ true ++ Copy resources for the test source code to the test output directory. Always uses the project.build.testResources element to specify the resources to copy. ++ ++ ++ overwrite ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ resources ++ java.util.List ++ true ++ true ++ Copy resources for the test source code to the test output directory. Always uses the project.build.testResources element to specify the resources to copy. ++ ++ ++ skip ++ boolean ++ 2.6 ++ false ++ true ++ Copy resources for the test source code to the test output directory. Always uses the project.build.testResources element to specify the resources to copy. ++ ++ ++ supportMultiLineFiltering ++ boolean ++ 2.5 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useBuildFilters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useDefaultDelimiters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ${maven.test.skip} ++ ++ ++ ++ ++ ++ ++ +--- 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} ++ ${project.description} ++ ${project.groupId} ++ ${project.artifactId} ++ ${project.version} ++ resources ++ false ++ true ++ ++ ++ copy-resources ++ Copy resources of the configured plugin attribute resources ++ false ++ true ++ false ++ false ++ false ++ true ++ org.apache.maven.plugins.resources.CopyResourcesMojo ++ java ++ per-lookup ++ once-per-session ++ 2.3 ++ true ++ ++ ++ addDefaultExcludes ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ buildFilters ++ java.util.List ++ 2.4 ++ false ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ delimiters ++ java.util.LinkedHashSet ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ encoding ++ java.lang.String ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeString ++ java.lang.String ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeWindowsPaths ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ fileNameFiltering ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ filters ++ java.util.List ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ includeEmptyDirs ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ mavenFilteringHints ++ java.util.List ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ nonFilteredFileExtensions ++ java.util.List ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ outputDirectory ++ java.io.File ++ true ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ overwrite ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ project ++ org.apache.maven.project.MavenProject ++ true ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ resources ++ java.util.List ++ true ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ session ++ org.apache.maven.execution.MavenSession ++ true ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ skip ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ supportMultiLineFiltering ++ boolean ++ 2.5 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useBuildFilters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useDefaultDelimiters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ${maven.resources.skip} ++ ++ ++ ++ ++ ++ ++ org.apache.maven.shared.filtering.MavenResourcesFiltering ++ 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=&lt;goal-name&gt;</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=&lt;goal-name&gt;</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=&lt;goal-name&gt;</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=&lt;goal-name&gt;</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=&lt;goal-name&gt;</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. ++ false ++ true ++ false ++ false ++ false ++ true ++ process-resources ++ org.apache.maven.plugins.resources.ResourcesMojo ++ java ++ per-lookup ++ once-per-session ++ true ++ ++ ++ addDefaultExcludes ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ buildFilters ++ java.util.List ++ 2.4 ++ false ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ delimiters ++ java.util.LinkedHashSet ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ encoding ++ java.lang.String ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeString ++ java.lang.String ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeWindowsPaths ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ fileNameFiltering ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ filters ++ java.util.List ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ includeEmptyDirs ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ mavenFilteringHints ++ java.util.List ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ nonFilteredFileExtensions ++ java.util.List ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ outputDirectory ++ java.io.File ++ true ++ true ++ 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. ++ ++ ++ overwrite ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ project ++ org.apache.maven.project.MavenProject ++ true ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ resources ++ java.util.List ++ true ++ false ++ 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. ++ ++ ++ session ++ org.apache.maven.execution.MavenSession ++ true ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ skip ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ supportMultiLineFiltering ++ boolean ++ 2.5 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useBuildFilters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useDefaultDelimiters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ${maven.resources.skip} ++ ++ ++ ++ ++ ++ ++ org.apache.maven.shared.filtering.MavenResourcesFiltering ++ default ++ mavenResourcesFiltering ++ ++ ++ org.apache.maven.shared.filtering.MavenResourcesFiltering ++ mavenResourcesFilteringMap ++ ++ ++ ++ ++ testResources ++ Copy resources for the test source code to the test output directory. ++Always uses the project.build.testResources element to specify the resources to copy. ++ false ++ true ++ false ++ false ++ false ++ true ++ process-test-resources ++ org.apache.maven.plugins.resources.TestResourcesMojo ++ java ++ per-lookup ++ once-per-session ++ true ++ ++ ++ addDefaultExcludes ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ buildFilters ++ java.util.List ++ 2.4 ++ false ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ delimiters ++ java.util.LinkedHashSet ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ encoding ++ java.lang.String ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeString ++ java.lang.String ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ escapeWindowsPaths ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ fileNameFiltering ++ boolean ++ 3.0.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ filters ++ java.util.List ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ includeEmptyDirs ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ mavenFilteringHints ++ java.util.List ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ nonFilteredFileExtensions ++ java.util.List ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ outputDirectory ++ java.io.File ++ true ++ true ++ Copy resources for the test source code to the test output directory. ++Always uses the project.build.testResources element to specify the resources to copy. ++ ++ ++ overwrite ++ boolean ++ 2.3 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ project ++ org.apache.maven.project.MavenProject ++ true ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ resources ++ java.util.List ++ true ++ true ++ Copy resources for the test source code to the test output directory. ++Always uses the project.build.testResources element to specify the resources to copy. ++ ++ ++ session ++ org.apache.maven.execution.MavenSession ++ true ++ false ++ Copy resources of the configured plugin attribute resources ++ ++ ++ skip ++ boolean ++ 2.6 ++ false ++ true ++ Copy resources for the test source code to the test output directory. ++Always uses the project.build.testResources element to specify the resources to copy. ++ ++ ++ supportMultiLineFiltering ++ boolean ++ 2.5 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useBuildFilters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ useDefaultDelimiters ++ boolean ++ 2.4 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ${maven.test.skip} ++ ++ ++ ++ ++ ++ ++ org.apache.maven.shared.filtering.MavenResourcesFiltering ++ default ++ mavenResourcesFiltering ++ ++ ++ org.apache.maven.shared.filtering.MavenResourcesFiltering ++ mavenResourcesFilteringMap ++ ++ ++ ++ ++ ++ ++ org.slf4j ++ slf4j-api ++ jar ++ 1.7.36 ++ ++ ++ javax.inject ++ javax.inject ++ jar ++ 1 ++ ++ ++ org.codehaus.plexus ++ plexus-interpolation ++ jar ++ 1.26 ++ ++ ++ org.codehaus.plexus ++ plexus-utils ++ jar ++ 3.5.1 ++ ++ ++ org.apache.maven.shared ++ maven-filtering ++ jar ++ 3.3.1 ++ ++ ++ org.sonatype.plexus ++ plexus-build-api ++ jar ++ 0.0.7 ++ ++ ++ commons-io ++ commons-io ++ jar ++ 2.11.0 ++ ++ ++ org.apache.commons ++ commons-lang3 ++ jar ++ 3.12.0 ++ ++ ++ diff --git a/maven-resources-plugin-build.xml b/maven-resources-plugin-build.xml new file mode 100644 index 0000000..b5aa505 --- /dev/null +++ b/maven-resources-plugin-build.xml @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =================================== WARNING =================================== + JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. + =============================================================================== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven-resources-plugin.changes b/maven-resources-plugin.changes new file mode 100644 index 0000000..7161878 --- /dev/null +++ b/maven-resources-plugin.changes @@ -0,0 +1,93 @@ +------------------------------------------------------------------- +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 + +- Remove all dependencies with scope test, since a raw xmvn does + not hide them from maven. + +------------------------------------------------------------------- +Thu Apr 28 11:51:20 UTC 2022 - Fridrich Strba + +- Upgrade to version 3.2.0 + * Bug + + [MRESOURCES-171] - ISO8859-1 properties files get changed into + UTF-8 when filtered + + [MRESOURCES-210] - copy-resources erases file permissions + + [MRESOURCES-236] - Copying of files with permissions broken + + [MRESOURCES-257] - property from list element in pom model + * Improvement + + [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 + contents differ + * Dependency upgrade + + [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 +- Modified patch: + * maven-resources-plugin-bootstrap-resources.patch + + regenerate with current version of tools against the current + version of package + +------------------------------------------------------------------- +Tue Mar 22 13:44:41 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + +------------------------------------------------------------------- +Sun Nov 24 17:47:59 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin + +------------------------------------------------------------------- +Wed Apr 3 09:27:51 UTC 2019 - Fridrich Strba + +- Initial packaging of maven-resources-plugin 3.1.0 +- Generate and customize ant build.xml file to use with the + bootstrap variang +- Create as a multibuild package to allow bootstrapping +- Added patch: + * maven-resources-plugin-bootstrap-resources.patch + + For the bootstrap version, add pre-generated resources that + need maven-plugin-plugin and maven to be generated at build + time diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec new file mode 100644 index 0000000..5bb5b82 --- /dev/null +++ b/maven-resources-plugin.spec @@ -0,0 +1,131 @@ +# +# spec file +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "bootstrap" +%bcond_without bootstrap +%else +%bcond_with bootstrap +%endif +%global base_name maven-resources-plugin +Version: 3.3.1 +Release: 0 +Summary: Maven Resources Plugin +License: Apache-2.0 +Group: Development/Libraries/Java +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-lang3 +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local +BuildRequires: maven-filtering >= 1.3 +BuildRequires: maven-lib +BuildRequires: maven-plugin-annotations +BuildRequires: plexus-interpolation +BuildRequires: plexus-utils +BuildRequires: sisu-plexus +BuildRequires: unzip +BuildRequires: xmvn-install +BuildRequires: xmvn-resolve +BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) +BuildArch: noarch +%if %{with bootstrap} +Name: %{base_name}-bootstrap +BuildRequires: ant +%else +Name: %{base_name} +BuildRequires: xmvn +BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-jar-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-resources-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin) +Obsoletes: %{base_name}-bootstrap +#!BuildRequires: maven-compiler-plugin-bootstrap +#!BuildRequires: maven-jar-plugin-bootstrap +#!BuildRequires: maven-javadoc-plugin-bootstrap +#!BuildRequires: maven-plugin-plugin-bootstrap +#!BuildRequires: maven-resources-plugin-bootstrap +#!BuildRequires: maven-surefire-plugin-bootstrap +%endif + +%description +The Resources Plugin handles the copying of project resources +to the output directory. + +%if %{without bootstrap} +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +API documentation for %{name}. +%endif + +%prep +%setup -q -n %{base_name}-%{version} +%if %{with bootstrap} +cp %{SOURCE1} build.xml +%patch0 -p1 +%endif + +# Remove all dependencies with scope test, since a raw xmvn does not hide them +%pom_remove_dep -r :::test: + +%build +%if %{with bootstrap} +mkdir -p lib +build-jar-repository -s lib \ + commons-lang3 \ + maven-filtering/maven-filtering \ + maven/maven-core \ + maven/maven-model \ + maven/maven-plugin-api \ + maven-plugin-tools/maven-plugin-annotations \ + org.eclipse.sisu.plexus \ + plexus/interpolation \ + plexus/utils +%{ant} -Dtest.skip=true jar +%else +xmvn --batch-mode --offline \ + -Dmaven.test.skip=true \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -Dmaven.compiler.release=8 \ +%endif + package org.apache.maven.plugins:maven-javadoc-plugin:aggregate +%endif + +%{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar + +%install +%mvn_install +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE NOTICE + +%if %{without bootstrap} +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE +%endif + +%changelog