From 7ae45ab2d96c342c59534d5895f6022e78bf1509 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 14 Oct 2020 16:05:11 -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/plexus-build-api#1ce8c8531ee544d6d4874c0c674e159a5a6215d6 --- .gitignore | 6 + ...-api-migration-to-component-metadata.patch | 18 ++ plexus-build-api-utils-3.3.0.patch | 42 +++++ plexus-build-api.spec | 171 ++++++++++++++++++ sources | 2 + 5 files changed, 239 insertions(+) create mode 100644 plexus-build-api-migration-to-component-metadata.patch create mode 100644 plexus-build-api-utils-3.3.0.patch create mode 100644 plexus-build-api.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..9444a45 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,6 @@ +/results_* +/*.src.rpm + +/plexus-build-api-0.0.6.tar.gz +/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz +/LICENSE-2.0.txt diff --git a/plexus-build-api-migration-to-component-metadata.patch b/plexus-build-api-migration-to-component-metadata.patch new file mode 100644 index 0000000..d9b0068 --- /dev/null +++ b/plexus-build-api-migration-to-component-metadata.patch @@ -0,0 +1,18 @@ +diff -Naur plexus-build-api-0.0.7.orig/pom.xml plexus-build-api-0.0.7/pom.xml +--- plexus-build-api-0.0.7.orig/pom.xml 2011-02-11 17:37:00.000000000 +0100 ++++ plexus-build-api-0.0.7/pom.xml 2011-07-27 14:48:31.508448776 +0200 +@@ -46,12 +46,11 @@ + + + org.codehaus.plexus +- plexus-maven-plugin +- 1.3.4 ++ plexus-component-metadata + + + +- descriptor ++ generate-metadata + + + diff --git a/plexus-build-api-utils-3.3.0.patch b/plexus-build-api-utils-3.3.0.patch new file mode 100644 index 0000000..923e9dc --- /dev/null +++ b/plexus-build-api-utils-3.3.0.patch @@ -0,0 +1,42 @@ +diff --git a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java b/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java +index 7cce37d..68b5b41 100644 +--- a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java ++++ b/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java +@@ -14,6 +14,7 @@ See the Apache License Version 2.0 for the specific language governing permissio + package org.sonatype.plexus.build.incremental; + + import java.io.File; ++import java.util.Comparator; + + import org.codehaus.plexus.util.Scanner; + +@@ -54,4 +55,7 @@ public class EmptyScanner implements Scanner { + return basedir; + } + ++ public void setFilenameComparator(Comparator filenameComparator) { ++ } ++ + } +diff --git a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java b/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java +index 14c1e26..c89fa52 100644 +--- a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java ++++ b/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java +@@ -18,6 +18,7 @@ import java.io.FileOutputStream; + import java.io.IOException; + import java.io.OutputStream; + import java.util.ArrayList; ++import java.util.Comparator; + import java.util.HashSet; + import java.util.Iterator; + import java.util.List; +@@ -66,6 +67,9 @@ public class TestIncrementalBuildContext implements BuildContext { + public File getBasedir() { + return basedir; + } ++ ++ public void setFilenameComparator(Comparator filenameComparator) { ++ } + } + + private final Set changedFiles; diff --git a/plexus-build-api.spec b/plexus-build-api.spec new file mode 100644 index 0000000..8b13b42 --- /dev/null +++ b/plexus-build-api.spec @@ -0,0 +1,171 @@ +Name: plexus-build-api +Version: 0.0.7 +Release: 30%{?dist} +Summary: Plexus Build API +License: ASL 2.0 +URL: https://github.com/sonatype/sisu-build-api +BuildArch: noarch + +#Fetched from https://github.com/sonatype/sisu-build-api/tarball/plexus-build-api-0.0.7 +Source0: sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt + +# Forwarded upstream: https://github.com/sonatype/sisu-build-api/pull/2 +Patch0: %{name}-migration-to-component-metadata.patch + +# Port to plexus-utils 3.3.0 (implement a dummy method) +Patch1: %{name}-utils-3.3.0.patch + +BuildRequires: maven-local +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) + +%description +Plexus Build API + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q -n sonatype-sisu-build-api-f1f8849 +cp -p %{SOURCE1} . + +%patch0 -p1 +%patch1 -p1 + +# remove unnecessary dependency on parent POM +%pom_remove_parent + +%mvn_file : plexus/%{name} + +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration" + +%build +%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE-2.0.txt + +%files javadoc -f .mfiles-javadoc +%doc LICENSE-2.0.txt + +%changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.0.7-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 16 2020 Mat Booth - 0.0.7-29 +- Unecessary restriction on plexus-util, with the patch it's actually still + source compatible with older versions + +* Sat Jul 11 2020 Jiri Vanek - 0.0.7-28 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jan 30 2020 Fedora Release Engineering - 0.0.7-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Nov 25 2019 Fabio Valentini - 0.0.7-26 +- Remove unnecessary dependency on parent POM. + +* Wed Nov 13 2019 Fabio Valentini - 0.0.7-25 +- Explicitly specify maven compiler source and target versions. + +* Thu Oct 17 2019 Fabio Valentini - 0.0.7-24 +- Port to plexus-utils 3.3.0. + +* Fri Jul 26 2019 Fedora Release Engineering - 0.0.7-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.0.7-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.0.7-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Igor Gnatenko - 0.0.7-20 +- Escape macros in %%changelog + +* Fri Feb 09 2018 Fedora Release Engineering - 0.0.7-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.0.7-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.0.7-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.0.7-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 0.0.7-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 8 2015 Mikolaj Izdebski - 0.0.7-14 +- Update to current packaging guidelines + +* Sat Jun 07 2014 Fedora Release Engineering - 0.0.7-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 26 2014 Mikolaj Izdebski - 0.0.7-12 +- Remove BuildRequires on maven-surefire-provider-junit4 + +* Wed May 21 2014 Mikolaj Izdebski - 0.0.7-11 +- Use .mfiles generated during build + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0.0.7-10 +- Use Requires: java-headless rebuild (#1067528) + +* Sun Aug 04 2013 Fedora Release Engineering - 0.0.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.0.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0.0.7-7 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Mon Nov 26 2012 Mikolaj Izdebski - error: source 0 defined multiple times +- Install license files +- Resolves: rhbz#880200 + +* Thu Nov 22 2012 Jaromir Capik - 0.0.7-5 +- Migration to plexus-containers-container-default + +* Sat Jul 21 2012 Fedora Release Engineering - 0.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Nov 04 2011 Jaromir Capik - 0.0.7-2 +- Migration from plexus-maven-plugin to plexus-containers-component-metadata + +* Tue Aug 2 2011 Alexander Kurtakov 0.0.7-1 +- Update to latest upstream version. + +* Thu Jun 23 2011 Stanislav Ochotnicky - 0.0.6-7 +- Add spice-parent to Requires + +* Fri Jun 3 2011 Alexander Kurtakov 0.0.6-6 +- Build with maven. +- Fix requires. +- Guidelines fixes. + +* Wed Feb 09 2011 Fedora Release Engineering - 0.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed May 26 2010 Hui Wang 0.0.6-3 +- Add missing requires + +* Wed May 26 2010 Hui Wang 0.0.6-2 +- Change JPP-%%{name}.pom to JPP.plexus-%%{name}.pom + +* Wed May 19 2010 Hui Wang 0.0.6-1 +- Initial version of the package diff --git a/sources b/sources new file mode 100644 index 0000000..3238668 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +3dc76e0f6936addf5e4fbeb9551ab107 sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt