re-import sources as agreed with the maintainer

This commit is contained in:
Adam Samalik 2023-06-29 11:00:31 +02:00 committed by root
parent 7a140b84bd
commit adcedf45bd
6 changed files with 13 additions and 90 deletions

13
.gitignore vendored
View File

@ -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

View File

@ -0,0 +1 @@
015559e466938c7e9053603d37b96ef3e03b802b maven-shared-utils-3.2.1-source-release.zip

View File

@ -1,28 +0,0 @@
From 932f9b15bd62255f81c66b564f748fff6ec84c86 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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

View File

@ -1,25 +0,0 @@
From 3b87b36b85e365f32a1b9443a962e3149e2dfd64 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
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<String, String> map = new HashMap<>();
+ final Map<String, Object> map = new HashMap<>();
map.put( key, value );
return new FileUtils.FilterWrapper[]
{
--
2.26.2

View File

@ -1,28 +0,0 @@
From 932f9b15bd62255f81c66b564f748fff6ec84c86 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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

View File

@ -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}