From ed558e0c37ecc5f2d2fc1e9ae4fb629c52555a31 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 14 Oct 2020 21:33:44 -0700 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/replacer#98693179e13c83f63379441425448bd67057e4ad --- .gitignore | 6 ++ 0001-Fix-build-with-Mockito-2.x.patch | 73 +++++++++++++ replacer.spec | 145 ++++++++++++++++++++++++++ sources | 1 + 4 files changed, 225 insertions(+) create mode 100644 0001-Fix-build-with-Mockito-2.x.patch create mode 100644 replacer.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..5a85526 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,6 @@ +/results_* +/*.src.rpm + +/replacer-1.5.2-src-svn.tar.gz +/replacer-1.5.3.tar.xz +/1.6.tar.gz diff --git a/0001-Fix-build-with-Mockito-2.x.patch b/0001-Fix-build-with-Mockito-2.x.patch new file mode 100644 index 0000000..adb01da --- /dev/null +++ b/0001-Fix-build-with-Mockito-2.x.patch @@ -0,0 +1,73 @@ +From 60b89b4047b55aca0592243efd63fc9ac5f2c0f0 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Wed, 13 Feb 2019 16:09:35 +0000 +Subject: [PATCH] Fix build with Mockito 2.x + +--- + .../maven_replacer_plugin/ReplacementProcessorTest.java | 1 - + .../maven_replacer_plugin/ReplacerMojoIntegrationTest.java | 2 +- + .../code/maven_replacer_plugin/ReplacerMojoTest.java | 7 ++++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/test/java/com/google/code/maven_replacer_plugin/ReplacementProcessorTest.java b/src/test/java/com/google/code/maven_replacer_plugin/ReplacementProcessorTest.java +index 30632e7..83d088c 100644 +--- a/src/test/java/com/google/code/maven_replacer_plugin/ReplacementProcessorTest.java ++++ b/src/test/java/com/google/code/maven_replacer_plugin/ReplacementProcessorTest.java +@@ -43,7 +43,6 @@ public class ReplacementProcessorTest { + public void setUp() throws Exception { + when(fileUtils.readFile(FILE, ENCODING)).thenReturn(CONTENT); + when(replacement.getToken()).thenReturn(TOKEN); +- when(replacement.getValue()).thenReturn(VALUE); + when(replacerFactory.create(replacement)).thenReturn(replacer); + + processor = new ReplacementProcessor(fileUtils, replacerFactory); +diff --git a/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoIntegrationTest.java b/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoIntegrationTest.java +index 0e7aa64..6d99455 100644 +--- a/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoIntegrationTest.java ++++ b/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoIntegrationTest.java +@@ -7,7 +7,7 @@ import static org.hamcrest.Matchers.equalTo; + import static org.junit.Assert.assertFalse; + import static org.junit.Assert.assertTrue; + import static org.mockito.Matchers.anyString; +-import static org.mockito.Matchers.argThat; ++import static org.mockito.hamcrest.MockitoHamcrest.argThat; + import static org.mockito.Mockito.mock; + import static org.mockito.Mockito.never; + import static org.mockito.Mockito.verify; +diff --git a/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoTest.java b/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoTest.java +index 060f916..b53845c 100644 +--- a/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoTest.java ++++ b/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoTest.java +@@ -7,9 +7,10 @@ import static org.hamcrest.MatcherAssert.assertThat; + import static org.hamcrest.Matchers.equalTo; + import static org.junit.Assert.assertTrue; + import static org.junit.Assert.fail; ++import static org.mockito.Matchers.any; + import static org.mockito.Matchers.anyInt; + import static org.mockito.Matchers.anyString; +-import static org.mockito.Matchers.argThat; ++import static org.mockito.hamcrest.MockitoHamcrest.argThat; + import static org.mockito.Matchers.eq; + import static org.mockito.Matchers.isA; + import static org.mockito.Mockito.mock; +@@ -428,7 +429,7 @@ public class ReplacerMojoTest { + + @Test (expected = MojoExecutionException.class) + public void shouldRethrowIOExceptionsAsMojoExceptions() throws Exception { +- when(fileUtils.readFile(anyString(), anyString())).thenThrow(new IOException()); ++ when(fileUtils.readFile((String)any(), (String)any())).thenThrow(new IOException()); + + mojo.setRegexFlags(regexFlags); + mojo.setRegex(REGEX); +@@ -442,7 +443,7 @@ public class ReplacerMojoTest { + + @Test + public void shouldNotThrowExceptionWhenIgnoringErrors() throws Exception { +- when(fileUtils.readFile(anyString(), anyString())).thenThrow(new IOException()); ++ when(fileUtils.readFile((String)any(), (String)any())).thenThrow(new IOException()); + + mojo.setIgnoreErrors(true); + mojo.setFile(FILE); +-- +2.20.1 + diff --git a/replacer.spec b/replacer.spec new file mode 100644 index 0000000..815cec7 --- /dev/null +++ b/replacer.spec @@ -0,0 +1,145 @@ +Name: replacer +Version: 1.6 +Release: 17%{?dist} +Summary: Replacer Maven Mojo +License: MIT +URL: https://github.com/beiliubei/maven-replacer-plugin +# http://code.google.com/p/maven-replacer-plugin/ +Source0: https://github.com/beiliubei/maven-replacer-plugin/archive/%{version}.tar.gz + +BuildRequires: maven-local +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(xerces:xercesImpl) + +BuildArch: noarch + +%description +Maven plugin to replace tokens in a given file with a value. + +This plugin is also used to automatically generating PackageVersion.java +in the FasterXML.com project. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q -n maven-replacer-plugin-%{version} + +# remove unnecessary dependency on parent POM +%pom_remove_parent + +%pom_remove_plugin :dashboard-maven-plugin +%pom_remove_plugin :maven-assembly-plugin + +# remove hard-coded compiler settings +%pom_remove_plugin :maven-compiler-plugin + +%pom_xpath_inject pom:build/pom:plugins " +maven-javadoc-plugin +\${maven.compiler.source}false +" + +# trivial port to commons-lang3 +%pom_change_dep :commons-lang org.apache.commons:commons-lang3:3.8.1 + +for i in $(find -name "*.java"); do + sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" $i; +done + +%mvn_file :%{name} %{name} +%mvn_alias :%{name} com.google.code.maven-replacer-plugin:maven-replacer-plugin + +%build +%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 + +%install +%mvn_install + +%files -f .mfiles +%doc README.md +%license LICENSE + +%files javadoc -f .mfiles-javadoc +%license LICENSE + +%changelog +* Thu Jul 30 2020 Fabio Valentini - 1.6-17 +- Port to commons-lang3. + +* Wed Jul 29 2020 Fedora Release Engineering - 1.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1.6-15 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jun 26 2020 Mat Booth - 1.6-14 +- Allow building against Java 11 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 22 2019 Fabio Valentini - 1.6-12 +- Remove unnecessary dependency on parent POM. + +* Fri Jul 26 2019 Fedora Release Engineering - 1.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Apr 18 2019 Mat Booth - 1.6-10 +- Disable tests to reduce dependency tree + +* Wed Feb 13 2019 Mat Booth - 1.6-9 +- Fix build against mockito 2.x + +* Sat Feb 02 2019 Fedora Release Engineering - 1.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Mar 17 2015 gil cattaneo 1.6-1 +- update to 1.6 +- fix Url tag and Source0 tag + +* Wed Feb 11 2015 gil cattaneo 1.5.3-2 +- introduce license macro + +* Thu Jul 03 2014 gil cattaneo 1.5.3-1 +- update to 1.5.3 + +* Sun Jun 08 2014 Fedora Release Engineering - 1.5.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 28 2014 Michael Simacek - 1.5.2-4 +- Use Requires: java-headless rebuild (#1067528) + +* Sun Aug 04 2013 Fedora Release Engineering - 1.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 03 2013 gil cattaneo 1.5.2-2 +- switch to XMvn +- minor changes to adapt to current guideline + +* Sun May 26 2013 gil cattaneo 1.5.2-1 +- initial rpm diff --git a/sources b/sources new file mode 100644 index 0000000..cdb5868 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +fd3504b890f62e583db4182b09dad5be 1.6.tar.gz