From 1689aa3538a5013a498da761bedc21a75a43f5f5 Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Thu, 29 Jun 2023 10:59:03 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .gitignore                   |  8 +++-
 .maven-filtering.metadata    |  1 +
 0001-Skip-failed-tests.patch | 86 ------------------------------------
 gating.yaml                  |  8 ----
 4 files changed, 8 insertions(+), 95 deletions(-)
 create mode 100644 .maven-filtering.metadata
 delete mode 100644 0001-Skip-failed-tests.patch
 delete mode 100644 gating.yaml

diff --git a/.gitignore b/.gitignore
index f6d74c7..21a263c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
-SOURCES/maven-filtering-3.1.1-source-release.zip
+/maven-filtering-1.0-source-release.zip
+/maven-filtering-1.1-source-release.zip
+/maven-filtering-1.2-source-release.zip
+/maven-filtering-1.3-source-release.zip
+/maven-filtering-3.0.0-source-release.zip
+/maven-filtering-3.1.0-source-release.zip
+/maven-filtering-3.1.1-source-release.zip
diff --git a/.maven-filtering.metadata b/.maven-filtering.metadata
new file mode 100644
index 0000000..84bfb71
--- /dev/null
+++ b/.maven-filtering.metadata
@@ -0,0 +1 @@
+f09258f2a7db1c2658c9898f0796abfd32fd9142 maven-filtering-3.1.1-source-release.zip
diff --git a/0001-Skip-failed-tests.patch b/0001-Skip-failed-tests.patch
deleted file mode 100644
index f065154..0000000
--- a/0001-Skip-failed-tests.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 2187555deff040b5fd0c75abb4445bf715f9acd8 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Wed, 26 Aug 2020 13:32:02 +0200
-Subject: [PATCH] Skip failed tests
-
----
- .../IncrementalResourceFilteringTest.java     | 56 -------------------
- 1 file changed, 56 deletions(-)
-
-diff --git a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
-index 06f62f3..e70590c 100644
---- a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
-+++ b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
-@@ -56,41 +56,6 @@ public class IncrementalResourceFilteringTest
-         outputDirectory.mkdirs();
-     }
- 
--    public void testSimpleIncrementalFiltering()
--        throws Exception
--    {
--        // run full build first
--        filter( "time" );
--
--        assertTime( "time", "file01.txt" );
--        assertTime( "time", "file02.txt" );
--
--        // only one file is expected to change
--        Set<String> changedFiles = new HashSet<>();
--        changedFiles.add( "file01.txt" );
--
--        TestIncrementalBuildContext ctx =
--            new TestIncrementalBuildContext( unitDirectory, changedFiles, Collections.emptyMap() );
--        ThreadBuildContext.setThreadBuildContext( ctx );
--
--        filter( "notime" );
--        assertTime( "notime", "file01.txt" );
--        assertTime( "time", "file02.txt" ); // this one is unchanged
--
--        assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
--
--        ctx = new TestIncrementalBuildContext( unitDirectory, Collections.emptySet(), changedFiles,
--                                               Collections.emptyMap() );
--        ThreadBuildContext.setThreadBuildContext( ctx );
--
--        filter( "moretime" );
--        assertFalse( new File( outputDirectory, "file01.txt" ).exists() );
--        assertTime( "time", "file02.txt" ); // this one is unchanged
--
--        assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
--
--    }
--
-     public void testOutputChange()
-         throws Exception
-     {
-@@ -135,27 +100,6 @@ public class IncrementalResourceFilteringTest
- 
-     }
- 
--    public void testFilterDeleted()
--        throws Exception
--    {
--        // run full build first
--        filter( "time" );
--
--        // all files are reprocessed after content of filters changes
--        Set<String> deletedFiles = new HashSet<>();
--        deletedFiles.add( "filters.txt" );
--        TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, Collections.emptySet(),
--                                                                           deletedFiles, Collections.emptyMap() );
--        ThreadBuildContext.setThreadBuildContext( ctx );
--
--        filter( "notime" );
--        assertTime( "notime", "file01.txt" );
--        assertTime( "notime", "file02.txt" );
--
--        assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
--        assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file02.txt" ) ) );
--    }
--
-     private void assertTime( String time, String relpath )
-         throws IOException
-     {
--- 
-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}