From c53d7b11ae8c92c1589102c31c167bff9562f5ca Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:45:28 +0000 Subject: import rh-maven33-plexus-bsh-factory-1.0-0.14.a7.13.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2fd212 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/plexus-bsh-factory-src.tar.gz diff --git a/.rh-maven33-plexus-bsh-factory.metadata b/.rh-maven33-plexus-bsh-factory.metadata new file mode 100644 index 0000000..a2d43b0 --- /dev/null +++ b/.rh-maven33-plexus-bsh-factory.metadata @@ -0,0 +1 @@ +8f6bd1d3e87a28eaeb40be2ae10f287933222d9b SOURCES/plexus-bsh-factory-src.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-Migrate-to-plexus-containers-container-default.patch b/SOURCES/0001-Migrate-to-plexus-containers-container-default.patch new file mode 100644 index 0000000..a095fb4 --- /dev/null +++ b/SOURCES/0001-Migrate-to-plexus-containers-container-default.patch @@ -0,0 +1,73 @@ +From e501d0ee85bb661173c4c5c3fd1c74fabe78c2e3 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 10 Apr 2013 11:30:35 +0200 +Subject: [PATCH] Migrate to plexus-containers-container-default + +--- + .../component/factory/bsh/BshComponentFactory.java | 26 +++++++++++++++++----- + 1 file changed, 20 insertions(+), 6 deletions(-) + +diff --git a/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java b/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java +index f2f3437..5e39fcf 100644 +--- a/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java ++++ b/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java +@@ -8,6 +8,8 @@ import org.codehaus.plexus.PlexusContainer; + import org.codehaus.plexus.component.factory.AbstractComponentFactory; + import org.codehaus.plexus.component.factory.ComponentInstantiationException; + import org.codehaus.plexus.component.repository.ComponentDescriptor; ++import org.codehaus.plexus.component.repository.exception.ComponentLookupException; ++import org.codehaus.plexus.logging.Logger; + import org.codehaus.plexus.util.IOUtil; + + import java.io.FileNotFoundException; +@@ -68,24 +70,31 @@ public class BshComponentFactory + catch ( EvalError evalError ) + { + containerRealm.display(); +- +- container.getLogger().info( "Error text: " + evalError.getErrorText() ); +- ++ ++ try ++ { ++ container.lookup( Logger.class ).info( "Error text: " + evalError.getErrorText() ); ++ } ++ catch ( ComponentLookupException e ) ++ { ++ throw new ComponentInstantiationException( e ); ++ } ++ + throw new ComponentInstantiationException( "Cannot build component for: " + +- componentDescriptor.getComponentKey() + ++ componentDescriptor.toString() + + "; unable to read BeanShell script", evalError ); + } + catch ( FileNotFoundException e ) + { + containerRealm.display(); + throw new ComponentInstantiationException( "Cannot build component for: " + +- componentDescriptor.getComponentKey() + ++ componentDescriptor.toString() + + "; unable to read BeanShell script", e ); + } + catch ( IOException e ) + { + throw new ComponentInstantiationException( "Cannot build component for: " + +- componentDescriptor.getComponentKey() + ++ componentDescriptor.toString() + + "; unable to read BeanShell script", e ); + } + finally +@@ -96,4 +105,9 @@ public class BshComponentFactory + return result; + } + ++ public String getId() ++ { ++ return getClass().toString(); ++ } ++ + } +-- +1.8.1.4 + diff --git a/SOURCES/plexus-bsh-factory-encodingfix.patch b/SOURCES/plexus-bsh-factory-encodingfix.patch new file mode 100644 index 0000000..91a8fae --- /dev/null +++ b/SOURCES/plexus-bsh-factory-encodingfix.patch @@ -0,0 +1,11 @@ +--- ./release-pom.xml.sav 2006-09-12 14:19:08.000000000 -0400 ++++ ./release-pom.xml 2006-09-12 14:19:13.000000000 -0400 +@@ -112,7 +112,7 @@ + + + trygvis +- Trygve Laugst�l ++ Trygve Laugstol + trygvis@codehaus.org + + Developer diff --git a/SOURCES/plexus-bsh-factory-license.txt b/SOURCES/plexus-bsh-factory-license.txt new file mode 100644 index 0000000..9c833b0 --- /dev/null +++ b/SOURCES/plexus-bsh-factory-license.txt @@ -0,0 +1,26 @@ +From jason@maven.org Wed Jul 9 21:16:12 2008 +Return-Path: +To: dev@plexus.codehaus.org + +No one uses it anyway, so you can safely remove it. But the license is MIT if not stated, though it's all switching to ASL. + +***** + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/SPECS/plexus-bsh-factory.spec b/SPECS/plexus-bsh-factory.spec new file mode 100644 index 0000000..e18c551 --- /dev/null +++ b/SPECS/plexus-bsh-factory.spec @@ -0,0 +1,203 @@ +%global pkg_name plexus-bsh-factory +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +%define parent plexus +%define subname bsh-factory + +Name: %{?scl_prefix}%{pkg_name} +Version: 1.0 +Release: 0.14.a7.13%{?dist} +Epoch: 0 +Summary: Plexus Bsh component factory +License: MIT +URL: http://plexus.codehaus.org/ +BuildArch: noarch +# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-bsh-factory-1.0-alpha-7-SNAPSHOT plexus-bsh-factory/ +# tar czf plexus-bsh-factory-src.tar.gz plexus-bsh-factory/ +Source0: %{pkg_name}-src.tar.gz +Source3: plexus-bsh-factory-license.txt + +Patch1: %{pkg_name}-encodingfix.patch +Patch2: 0001-Migrate-to-plexus-containers-container-default.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(bsh:bsh) +BuildRequires: %{?scl_prefix}mvn(classworlds:classworlds) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-utils) + +%description +Bsh component class creator for Plexus. + +%package javadoc +Summary: Javadoc for %{pkg_name} + +%description javadoc +Javadoc for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x + +%patch1 -b .sav +%patch2 -p1 +cp release-pom.xml pom.xml +cp -p %{SOURCE3} . +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_file : %{parent}/%{subname} +%mvn_build -f +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%dir %{_mavenpomdir}/plexus +%dir %{_javadir}/plexus +%doc plexus-bsh-factory-license.txt + +%files javadoc -f .mfiles-javadoc +%doc plexus-bsh-factory-license.txt + +%changelog +* Mon Feb 08 2016 Michal Srb - 0:1.0-0.14.a7.13 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 0:1.0-0.14.a7.12 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 0:1.0-0.14.a7.11 +- maven33 rebuild + +* Fri Jan 16 2015 Michal Srb - 0:1.0-0.14.a7.10 +- Fix directory ownership + +* Thu Jan 15 2015 Mikolaj Izdebski - 0:1.0-0.14.a7.9 +- Rebuild to fix provides + +* Tue Jan 13 2015 Michael Simacek - 0:1.0-0.14.a7.8 +- Mass rebuild 2015-01-13 + +* Tue Jan 06 2015 Michael Simacek - 0:1.0-0.14.a7.7 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 0:1.0-0.14.a7.6 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 0:1.0-0.14.a7.5 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 0:1.0-0.14.a7.4 +- Mass rebuild 2014-02-18 + +* Mon Feb 17 2014 Mikolaj Izdebski - 0:1.0-0.14.a7.3 +- SCL-ize build-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 0:1.0-0.14.a7.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 0:1.0-0.14.a7.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 01.0-0.14.a7 +- Mass rebuild 2013-12-27 + +* Fri Jun 28 2013 Mikolaj Izdebski - 0:1.0-0.13.a7 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Mon Apr 29 2013 Mikolaj Izdebski - 0:1.0-0.12.a7 +- Simplify build dependencies +- Update to current packaging guidelines + +* Wed Apr 10 2013 Michal Srb - 0:1.0-0.11.a7 +- Port to plexus-containers-container-default + +* Wed Feb 06 2013 Java SIG - 0:1.0-0.10.a7 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 23 2013 Michal Srb - 0:1.0-0.9.a7 +- Build with xmvn + +* Thu Nov 22 2012 Stanislav Ochotnicky - 0:1.0-0.8.a7 +- Cleanup whole spec file (#878828) +- Build/install javadoc package (#878134, #878135) + +* Thu Nov 15 2012 Tom Callaway - 0:1.0-0.7.a7s.1.13 +- fix incomplete license.txt + +* Tue Aug 21 2012 Mikolaj Izdebski - 0:1.0-0.7.a7s.1.12 +- Don't own _mavenfragdir + +* Sat Jul 21 2012 Fedora Release Engineering - 0:1.0-0.7.a7s.1.11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.0-0.6.a7s.1.11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 0:1.0-0.5.a7s.1.11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Feb 12 2010 Alexander Kurtakov 0:1.0-0.4.a7s.1.11 +- Drop gcj_support. +- Build with ant. Fixes rhbz#539101. + +* Sun Jul 26 2009 Fedora Release Engineering - 0:1.0-0.4.a7s.1.10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Mar 23 2009 Deepak Bhole - 1.0-0.3.a7s.1.10 +- Rebuild with maven + +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.0-0.3.a7s.1.9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Aug 13 2008 Deepak Bhole 1.0-0.2.a7s.1.9 +- Build for ppc64 + +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a7s.1.8 +- add license information from upstream + +* Wed Jul 9 2008 Tom "spot" Callaway 1.0-0.2.a7s.1.7 +- drop repotag +- label license as Unknown (hopefully, upstream will get back to us before the sun explodes) + +* Thu Feb 28 2008 Deepak Bhole 1.0-0.2.a7s.1jpp.6 +- Rebuild + +* Fri Sep 21 2007 Deepak Bhole 1.0-0.1.a7s.2jpp.5 +- ExcludeArch ppc64 + +* Mon Sep 10 2007 Deepak Bhole 1.0-0.1.a7s.2jpp.4 +- Build with maven + +* Fri Aug 31 2007 Deepak Bhole 1.0-0.1.a7s.2jpp.3 +- Build without maven (to build on ppc) + +* Tue Mar 20 2007 Deepak Bhole 1.0-0.1.a7s.2jpp.2 +- Build with maven + +* Fri Feb 23 2007 Tania Bento 0:1.0-0.1.a7s.2jpp.1 +- Fixed %%Release. +- Fixed %%BuildRoot. +- Fixed %%Vendor. +- Fixed %%Distribution. +- Fixed instructions on how to generate source drop. +- Removed %%post and %%postun sections for javadoc. +- Made sure lines had less than 80 characters. +- Changed to use cp -p to preserve timestamps. + +* Tue Oct 17 2006 Deepak Bhole 1.0-0.a7s.2jpp +- Update for maven2 9jpp + +* Thu Sep 07 2006 Deepak Bhole 1.0-0.a7s.1jpp +- Initial build