From adcedf45bde00fb297a21cc7f1bb187b10079092 Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 11:00:31 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 13 ++++++++- .maven-shared-utils.metadata | 1 + ...-POSIX-attributes-for-symbolic-links.patch | 28 ------------------- 0002-Port-to-plexus-utils-3.0.10.patch | 25 ----------------- ...-POSIX-attributes-for-symbolic-links.patch | 28 ------------------- gating.yaml | 8 ------ 6 files changed, 13 insertions(+), 90 deletions(-) create mode 100644 .maven-shared-utils.metadata delete mode 100644 0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch delete mode 100644 0002-Port-to-plexus-utils-3.0.10.patch delete mode 100644 0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 0fe1524..4b22e99 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,12 @@ -SOURCES/maven-shared-utils-3.2.1-source-release.zip +/maven-shared-utils-0.2-source-release.zip +/maven-shared-utils-0.3-source-release.zip +/maven-shared-utils-0.4-source-release.zip +/maven-shared-utils-0.5-source-release.zip +/maven-shared-utils-0.6-source-release.zip +/maven-shared-utils-0.7-source-release.zip +/maven-shared-utils-0.8-source-release.zip +/maven-shared-utils-0.9-source-release.zip +/maven-shared-utils-3.0.0-source-release.zip +/maven-shared-utils-3.0.1-source-release.zip +/maven-shared-utils-3.1.0-source-release.zip +/maven-shared-utils-3.2.1-source-release.zip diff --git a/.maven-shared-utils.metadata b/.maven-shared-utils.metadata new file mode 100644 index 0000000..c4eb42d --- /dev/null +++ b/.maven-shared-utils.metadata @@ -0,0 +1 @@ +015559e466938c7e9053603d37b96ef3e03b802b maven-shared-utils-3.2.1-source-release.zip diff --git a/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch deleted file mode 100644 index c82fcf4..0000000 --- a/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 932f9b15bd62255f81c66b564f748fff6ec84c86 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 24 Sep 2020 20:17:56 +0200 -Subject: [PATCH 3/3] Avoid setting POSIX attributes for symbolic links - ---- - src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java -index a3be324..a396d99 100644 ---- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java -+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java -@@ -1973,9 +1973,9 @@ public class FileUtils - } - } - } -- } - -- copyFilePermissions( from, to ); -+ copyFilePermissions( from, to ); -+ } - } - - /** --- -2.26.2 - diff --git a/0002-Port-to-plexus-utils-3.0.10.patch b/0002-Port-to-plexus-utils-3.0.10.patch deleted file mode 100644 index 1445dff..0000000 --- a/0002-Port-to-plexus-utils-3.0.10.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3b87b36b85e365f32a1b9443a962e3149e2dfd64 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Fri, 11 Sep 2020 11:02:29 +0200 -Subject: [PATCH 2/3] Port to plexus-utils 3.0.10 - ---- - .../java/org/apache/maven/shared/utils/io/FileUtilsTest.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java -index 9fa7c85..151bbc9 100644 ---- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java -+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java -@@ -655,7 +655,7 @@ public class FileUtilsTest - - private FileUtils.FilterWrapper[] wrappers( String key, String value ) - { -- final Map map = new HashMap<>(); -+ final Map map = new HashMap<>(); - map.put( key, value ); - return new FileUtils.FilterWrapper[] - { --- -2.26.2 - diff --git a/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch deleted file mode 100644 index 7783723..0000000 --- a/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 932f9b15bd62255f81c66b564f748fff6ec84c86 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 24 Sep 2020 20:17:56 +0200 -Subject: [PATCH 3/3] Avoid setting POSIX attributes for symbolic links - ---- - src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java -index a3be324..a396d99 100644 ---- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java -+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java -@@ -1973,9 +1973,9 @@ public class FileUtils - } - } - } -- } - -- copyFilePermissions( from, to ); -+ copyFilePermissions( from, to ); -+ } - } - - /** --- -2.26.2 - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index d6b7694..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_contexts: - - osci_compose_gate -rules: - # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test - - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}