From f72a2eae0bb329bf5ec3bd77331433b7971eaf02 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 24 2017 09:31:23 +0000 Subject: import rh-maven35-plexus-containers-1.7.1-2.2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a6475e4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/plexus-containers-1.7.1.tar.gz diff --git a/.rh-maven35-plexus-containers.metadata b/.rh-maven35-plexus-containers.metadata new file mode 100644 index 0000000..8459092 --- /dev/null +++ b/.rh-maven35-plexus-containers.metadata @@ -0,0 +1 @@ +598d1c03d2807fad1b598e8583bb95f1b6a71fc0 SOURCES/plexus-containers-1.7.1.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Port-to-current-qdox.patch b/SOURCES/0001-Port-to-current-qdox.patch new file mode 100644 index 0000000..1d283b9 --- /dev/null +++ b/SOURCES/0001-Port-to-current-qdox.patch @@ -0,0 +1,39 @@ +From 81ed06024dd78113d2e6c5090e59cacc43453a54 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 20 Jan 2017 17:27:51 +0100 +Subject: [PATCH] Port to current qdox + +--- + .../java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java | 2 +- + pom.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java +index 0a798fe..41efa44 100644 +--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java ++++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java +@@ -244,7 +244,7 @@ public class QDoxComponentGleaner + // Remove any Plexus specific interfaces from the calculation + // ---------------------------------------------------------------------- + +- List interfaces = new ArrayList( javaClass.getImplementedInterfaces() ); ++ List interfaces = new ArrayList( javaClass.getInterfaces() ); + + for ( Iterator it = interfaces.iterator(); it.hasNext(); ) + { +diff --git a/pom.xml b/pom.xml +index eaba94d..f80f0d2 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -85,7 +85,7 @@ + + com.thoughtworks.qdox + qdox +- 2.0-M2 ++ 2.0-M5 + + + org.jdom +-- +2.9.3 + diff --git a/SPECS/plexus-containers.spec b/SPECS/plexus-containers.spec new file mode 100644 index 0000000..b9735f1 --- /dev/null +++ b/SPECS/plexus-containers.spec @@ -0,0 +1,306 @@ +%{?scl:%scl_package plexus-containers} +%{!?scl:%global pkg_name %{name}} + +Name: %{?scl_prefix}plexus-containers +Version: 1.7.1 +Release: 2.2%{?dist} +Summary: Containers for Plexus +License: ASL 2.0 and MIT +URL: https://github.com/codehaus-plexus/plexus-containers +BuildArch: noarch + +Source0: https://github.com/codehaus-plexus/%{pkg_name}/archive/%{pkg_name}-%{version}.tar.gz + +Patch0: 0001-Port-to-current-qdox.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(com.google.collections:google-collections) +BuildRequires: %{?scl_prefix}mvn(commons-cli:commons-cli) +BuildRequires: %{?scl_prefix}mvn(com.sun:tools) +BuildRequires: %{?scl_prefix}mvn(com.thoughtworks.qdox:qdox) +BuildRequires: %{?scl_prefix}mvn(junit:junit) +BuildRequires: %{?scl_prefix}mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-core) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-model) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-plugin-api) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-project) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: %{?scl_prefix}mvn(org.apache.xbean:xbean-reflect) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-classworlds) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-cli) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: %{?scl_prefix}mvn(org.jdom:jdom2) +BuildRequires: %{?scl_prefix}mvn(org.ow2.asm:asm-all) + +%description +The Plexus project seeks to create end-to-end developer tools for +writing applications. At the core is the container, which can be +embedded or for a full scale application server. There are many +reusable components for hibernate, form processing, jndi, i18n, +velocity, etc. Plexus also includes an application server which +is like a J2EE application server, without all the baggage. + +%package component-metadata +Summary: Component metadata from %{pkg_name} + +%description component-metadata +%{summary}. + +%package component-javadoc +Summary: Javadoc component from %{pkg_name} + +%description component-javadoc +%{summary}. + +%package component-annotations +Summary: Component API from %{pkg_name} + +%description component-annotations +%{summary}. + +%package container-default +Summary: Default Container from %{pkg_name} +Provides: %{?scl_prefix}plexus-containers-component-api = %{version}-%{release} + +%description container-default +%{summary}. + +%package javadoc +Summary: API documentation for all plexus-containers packages +Provides: %{name}-component-annotations-javadoc = %{version}-%{release} +Provides: %{name}-component-javadoc-javadoc = %{version}-%{release} +Provides: %{name}-component-metadata-javadoc = %{version}-%{release} +Provides: %{name}-container-default-javadoc = %{version}-%{release} + +%description javadoc +%{summary}. + +%prep +%setup -q -n %{pkg_name}-%{pkg_name}-%{version} + +%patch0 -p1 + +%pom_remove_plugin -r :maven-site-plugin + +# For Maven 3 compat +%pom_add_dep org.apache.maven:maven-core plexus-component-metadata + +# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM +%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default +%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default + +%pom_remove_dep com.sun:tools plexus-component-javadoc +%pom_add_dep com.sun:tools plexus-component-javadoc + +# Generate OSGI info +%pom_xpath_inject "pom:project" " + bundle + + + + org.apache.felix + maven-bundle-plugin + true + + + <_nouses>true + org.codehaus.plexus.component.annotations.* + + + + + " plexus-component-annotations + +# to prevent ant from failing +mkdir -p plexus-component-annotations/src/test/java + +# integration tests fix +sed -i "s|2.3| %{javadoc_plugin_version}|" plexus-component-javadoc/src/it/basic/pom.xml + +# plexus-component-api has been merged into plexus-container-default +%mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api" + +# keep compat symlink for maven's sake +%mvn_file ":plexus-component-annotations" %{pkg_name}/plexus-component-annotations plexus/containers-component-annotations + +%build +%mvn_build -f -s + +%install +%mvn_install + + +# plexus-containers pom goes into main package + +%files -f .mfiles-plexus-containers + +%files component-annotations -f .mfiles-plexus-component-annotations + +%files container-default -f .mfiles-plexus-container-default + +%files component-metadata -f .mfiles-plexus-component-metadata + +%files component-javadoc -f .mfiles-plexus-component-javadoc + +%files javadoc -f .mfiles-javadoc + +%changelog +* Thu Jun 22 2017 Michael Simacek - 1.7.1-2.2 +- Mass rebuild 2017-06-22 + +* Wed Jun 21 2017 Java Maintainers - 1.7.1-2.1 +- Automated package import and SCL-ization + +* Sat Feb 11 2017 Fedora Release Engineering - 1.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 20 2017 Michael Simacek - 1.7.1-1 +- Update to upstream version 1.7.1 + +* Wed Jun 15 2016 Mikolaj Izdebski - 1.6-6 +- Regenerate build-requires + +* Thu Feb 04 2016 Fedora Release Engineering - 1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 1 2015 Mikolaj Izdebski - 1.6-3 +- Update upstream URL + +* Thu Feb 5 2015 Mikolaj Izdebski - 1.6-2 +- Add runtime dependenty on ASM5 + +* Mon Oct 27 2014 Mikolaj Izdebski - 1.6-1 +- Update to upstream version 1.6 + +* Mon Oct 6 2014 Mikolaj Izdebski - 1.5.5-20 +- Obsolete plexus-container-default + +* Wed Sep 24 2014 Mikolaj Izdebski - 1.5.5-19 +- Remove verioned build-requires on maven-javadoc-plugin + +* Fri Jul 04 2014 Mat Booth - 1.5.5-18 +- Port to lastest objectweb-asm + +* Sat Jun 07 2014 Fedora Release Engineering - 1.5.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 30 2014 Michal Srb - 1.5.5-16 +- Drop empty .mfiles + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.5.5-15 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Dec 5 2013 Mikolaj Izdebski - 1.5.5-14 +- Update to Plexus Classworlds 2.5, resolves: rhbz#1015124 +- Require xbean >= 3.14, resolves: rhbz#1038607 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.5.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 23 2013 Mikolaj Izdebski - 1.5.5-12 +- Generate OSGi metadata +- Resolves: rhbz#987116 +- Bump maven-javadoc-plugin version to 2.9.1 + +* Fri Mar 22 2013 Mikolaj Izdebski - 1.5.5-11 +- Correctly place plexus-containers POM in the main package + +* Thu Mar 21 2013 Stanislav Ochotnicky - 1.5.5-11 +- Add compat symlinks to keep Maven working + +* Wed Mar 20 2013 Stanislav Ochotnicky - 1.5.5-10 +- Update to latest packaging guidelines +- Remove several unneeded buildrequires + +* Thu Feb 14 2013 Fedora Release Engineering - 1.5.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.5.5-8 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Nov 14 2012 Stanislav Ochotnicky - 1.5.5-7 +- Fix license tag (Plexus license was replaced by MIT some time ago) +- Update javadoc plugin BR version + +* Sat Jul 21 2012 Fedora Release Engineering - 1.5.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Feb 17 2012 Deepak Bhole - 1.5.5-5 +- Resolves rhbz#791339 +- Applied fix from Omair Majid to build with Java 7 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.5.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Jun 28 2011 Stanislav Ochotnicky - 1.5.5-3 +- Fix maven3 build +- Use new add_maven_depmap macro + +* Mon Feb 28 2011 Stanislav Ochotnicky - 1.5.5-2 +- Remove unneeded env var definitions + +* Fri Feb 25 2011 Stanislav Ochotnicky - 1.5.5-1 +- Update to latest upstream +- Remove obsolete patches +- Use maven 3 to build +- Packaging fixes +- Versionless jars & javadocs + +* Wed Feb 09 2011 Fedora Release Engineering - 1.5.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Oct 11 2010 Stanislav Ochotnicky - 1.5.4-4 +- Add plexus-cli to component-metadata Requires + +* Wed Sep 8 2010 Stanislav Ochotnicky - 1.5.4-3 +- Use javadoc:aggregate +- Merge javadoc subpackages into one -javadoc + +* Thu Jul 15 2010 Stanislav Ochotnicky - 1.5.4-2 +- Fix maven depmaps + +* Tue Jul 13 2010 Stanislav Ochotnicky - 1.5.4-1 +- Version bump +- Add new sub-packages +- Cleanups + +* Thu Aug 20 2009 Andrew Overholt 0:1.0-0.1.a34.7 +- Clean up javadoc post/postun +- Build with ant +- Remove gcj support +- Clean up groups + +* Fri May 15 2009 Fernando Nasser 1.0-0.1.a34.6 +- Fix license + +* Tue Apr 28 2009 Yong Yang 1.0-0.1.a34.5 +- Add BRs maven2-plugin-surfire*, maven-doxia* +- Merge from RHEL-4-EP-5 1.0-0.1.a34.2, add plexus-containers-sourcetarget.patch +- Rebuild with new maven2 2.0.8 built in non-bootstrap mode + +* Mon Mar 16 2009 Yong Yang 1.0-0.1.a34.4 +- rebuild with new maven2 2.0.8 built in bootstrap mode + +* Wed Feb 04 2009 Yong Yang - 1.0-0.1.a34.3 +- re-build with maven + +* Wed Feb 04 2009 Yong Yang - 1.0-0.1.a34.2 +- fix bulding with ant +- temporarily buid with ant + +* Wed Jan 14 2009 Yong Yang - 1.0-0.1.a34.1jpp.2 +- re-build with maven +- disabled assert in plexus-container-default/.../UriConverter.java??? + +* Tue Jan 13 2009 Yong Yang - 1.0-0.1.a34.1jpp.1 +- Imported into devel from dbhole's maven 2.0.8 packages + +* Tue Apr 08 2008 Deepak Bhole 1.0-0.1.a34.0jpp.1 +- Initial build with original base spec from JPackage