From a8369028fb64c9e9f47269ce20d95c466aa49119 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Aug 2022 07:35:08 +0200 Subject: [PATCH] Initial import from Fedora --- .gitignore | 11 ++ .maven-filtering.metadata | 1 + 0001-Skip-failed-tests.patch | 86 +++++++++++++++ maven-filtering.spec | 198 +++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 297 insertions(+) create mode 100644 .maven-filtering.metadata create mode 100644 0001-Skip-failed-tests.patch create mode 100644 maven-filtering.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..89e277d 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,11 @@ +/results_* +/*.src.rpm + +/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 +/maven-filtering-3.2.0-source-release.zip diff --git a/.maven-filtering.metadata b/.maven-filtering.metadata new file mode 100644 index 0000000..ed8c25e --- /dev/null +++ b/.maven-filtering.metadata @@ -0,0 +1 @@ +35f7da9811aa67330bd361d8ccf40d369ae8da3c maven-filtering-3.2.0-source-release.zip diff --git a/0001-Skip-failed-tests.patch b/0001-Skip-failed-tests.patch new file mode 100644 index 0000000..f065154 --- /dev/null +++ b/0001-Skip-failed-tests.patch @@ -0,0 +1,86 @@ +From 2187555deff040b5fd0c75abb4445bf715f9acd8 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +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 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 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/maven-filtering.spec b/maven-filtering.spec new file mode 100644 index 0000000..97033cb --- /dev/null +++ b/maven-filtering.spec @@ -0,0 +1,198 @@ +%bcond_with bootstrap + +Name: maven-filtering +Version: 3.2.0 +Release: 6%{?dist} +Summary: Shared component providing resource filtering +License: ASL 2.0 +URL: https://maven.apache.org/shared/%{name}/index.html +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip + +Patch1: 0001-Skip-failed-tests.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(com.google.code.findbugs:jsr305) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-settings) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.hamcrest:hamcrest-core) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api::tests:) +%endif + +%description +These Plexus components have been built from the filtering process/code in +Maven Resources Plugin. The goal is to provide a shared component for all +plugins that needs to filter resources. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q +%patch1 -p1 + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.2.0-5 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.2.0-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Aug 26 2020 Marian Koncek - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Tue Aug 11 2020 Fabio Valentini - 3.2.0-1 +- Update to version 3.2.0. + +* Tue Jul 28 2020 Fedora Release Engineering - 3.1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.1.1-10 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.1-7 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 3.1.1-6 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 3.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jul 6 2016 Mikolaj Izdebski - 3.1.1-2 +- Regenerate build-requires + +* Fri Jun 3 2016 Mikolaj Izdebski - 3.1.1-1 +- Update to upstream version 3.1.1 + +* Wed Apr 13 2016 Mikolaj Izdebski - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Nov 9 2015 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 +- Remove legacy obsoletes/provides +- Update to current packaging guidelines + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Oct 24 2014 Mikolaj Izdebski - 1.3-1 +- Update to upstream version 1.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 11 2014 Mikolaj Izdebski - 1.2-1 +- Update to upstream version 1.2 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.1-4 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 1.1-3 +- Fix unowned directory + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Feb 19 2013 Mikolaj Izdebski - 1.1-1 +- Update to upstream version 1.1 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.0-10 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Nov 27 2012 Tomas Radej - 1.0-9 +- Added NOTICE to javadoc + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 15 2012 Tomas Radej - 1.0-7 +- Replaced plexus-maven-plugin with plexus-containers-component-metadata + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Aug 31 2011 Tomas Radej - 1.0-5 +- Really fixed Provides/Obsoletes + +* Wed Aug 31 2011 Tomas Radej - 1.0-4 +- Fixed Provides/Obsoletes + +* Wed Aug 31 2011 Tomas Radej - 1.0-3 +- Added Provides/Obsoletes + +* Tue Aug 16 2011 Tomas Radej 1.0-2 +- Removed rm -rf {buildroot} + +* Tue Aug 16 2011 Tomas Radej 1.0-1 +- Initial release (thanks to the GULaG team) diff --git a/sources b/sources new file mode 100644 index 0000000..4128082 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (maven-filtering-3.2.0-source-release.zip) = 6cb730fbf9d5a2f3dbf951547d3b2720989906001a1844cfd38367a579f7a11d073807d68d4a907d083daa4295154fa135205dabba94f21ab73afca3022fbe7b