From f6316613dbff510e17c33b341bd783cc903e0c45 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:50:54 +0000 Subject: import rh-maven33-maven-site-plugin-3.2-7.13.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2c001b2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-site-plugin-3.2-source-release.zip diff --git a/.rh-maven33-maven-site-plugin.metadata b/.rh-maven33-maven-site-plugin.metadata new file mode 100644 index 0000000..f0d2c07 --- /dev/null +++ b/.rh-maven33-maven-site-plugin.metadata @@ -0,0 +1 @@ +b0536084b28a688ca76137ed9a9016c90bec702d SOURCES/maven-site-plugin-3.2-source-release.zip 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-Fix-jetty-dependencies.patch b/SOURCES/0001-Fix-jetty-dependencies.patch new file mode 100644 index 0000000..b9756fe --- /dev/null +++ b/SOURCES/0001-Fix-jetty-dependencies.patch @@ -0,0 +1,52 @@ +From 5f1902e3e0003d989e29578d6c40a5e936fcb65a Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Fri, 22 Feb 2013 11:13:23 +0100 +Subject: [PATCH] Fix jetty dependencies + +--- + pom.xml | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 9e99e5f..267cc91 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -403,18 +403,31 @@ under the License. + + + +- org.mortbay.jetty +- jetty ++ org.eclipse.jetty ++ jetty-server + 6.1.25 + ++ ++ ++ org.eclipse.jetty ++ jetty-webapp ++ 6.1.25 ++ ++ ++ ++ org.eclipse.jetty ++ jetty-servlet ++ 6.1.25 ++ ++ + +- org.mortbay.jetty ++ org.eclipse.jetty + jetty-util + 6.1.25 + + + +- org.mortbay.jetty ++ org.eclipse.jetty + jetty-client + 6.1.25 + test +-- +1.8.1.2 + diff --git a/SOURCES/0001-Port-to-jetty-9.patch b/SOURCES/0001-Port-to-jetty-9.patch new file mode 100644 index 0000000..89229ce --- /dev/null +++ b/SOURCES/0001-Port-to-jetty-9.patch @@ -0,0 +1,74 @@ +From 4c2e25dd41672533a6f6f3da490d2cbfa385884a Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Fri, 22 Feb 2013 10:56:19 +0100 +Subject: [PATCH] Port to jetty 9 + +--- + .../org/apache/maven/plugins/site/SiteRunMojo.java | 28 +++++++++++----------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java b/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java +index f341eef..d7e6c09 100644 +--- a/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java ++++ b/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java +@@ -42,12 +42,13 @@ import org.apache.maven.reporting.exec.MavenReportExecution; + + import org.codehaus.plexus.util.IOUtil; + +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Handler; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.handler.DefaultHandler; +-import org.mortbay.jetty.nio.SelectChannelConnector; +-import org.mortbay.jetty.webapp.WebAppContext; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Handler; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.handler.DefaultHandler; ++import org.eclipse.jetty.server.handler.HandlerList; ++import org.eclipse.jetty.server.ServerConnector; ++import org.eclipse.jetty.webapp.WebAppContext; + + /** + * Starts the site up, rendering documents as requested for faster editing. +@@ -84,7 +85,7 @@ public class SiteRunMojo + Server server = new Server(); + server.setStopAtShutdown( true ); + +- Connector defaultConnector = getDefaultConnector(); ++ ServerConnector defaultConnector = getDefaultConnector( server ); + server.setConnectors( new Connector[] { defaultConnector } ); + + WebAppContext webapp = createWebApplication(); +@@ -93,10 +94,9 @@ public class SiteRunMojo + DefaultHandler defaultHandler = new DefaultHandler(); + defaultHandler.setServer( server ); + +- Handler[] handlers = new Handler[2]; +- handlers[0] = webapp; +- handlers[1] = defaultHandler; +- server.setHandlers( handlers ); ++ HandlerList handlers = new HandlerList(); ++ handlers.setHandlers(new Handler[] { webapp, defaultHandler } ); ++ server.setHandler( handlers ); + + getLog().info( "Starting Jetty on http://localhost:" + port + "/" ); + try +@@ -219,11 +219,11 @@ public class SiteRunMojo + return webapp; + } + +- private Connector getDefaultConnector() ++ private ServerConnector getDefaultConnector( Server server ) + { +- Connector connector = new SelectChannelConnector(); ++ ServerConnector connector = new ServerConnector( server ); + connector.setPort( port ); +- connector.setMaxIdleTime( MAX_IDLE_TIME ); ++ connector.setIdleTimeout( MAX_IDLE_TIME ); + return connector; + } + +-- +1.8.1.2 + diff --git a/SOURCES/maven-site-plugin-jetty-provided.patch b/SOURCES/maven-site-plugin-jetty-provided.patch new file mode 100644 index 0000000..e5f3a73 --- /dev/null +++ b/SOURCES/maven-site-plugin-jetty-provided.patch @@ -0,0 +1,31 @@ +--- pom.xml~ 2013-03-01 09:27:48.503184556 +0100 ++++ pom.xml 2013-03-01 09:29:26.886220106 +0100 +@@ -406,24 +406,28 @@ + org.eclipse.jetty + jetty-server + 6.1.25 ++ provided + + + + org.eclipse.jetty + jetty-webapp + 6.1.25 ++ provided + + + + org.eclipse.jetty + jetty-servlet + 6.1.25 ++ provided + + + + org.eclipse.jetty + jetty-util + 6.1.25 ++ provided + + + diff --git a/SPECS/maven-site-plugin.spec b/SPECS/maven-site-plugin.spec new file mode 100644 index 0000000..c8ee540 --- /dev/null +++ b/SPECS/maven-site-plugin.spec @@ -0,0 +1,215 @@ +%global pkg_name maven-site-plugin +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +Name: %{?scl_prefix}%{pkg_name} +Version: 3.2 +Release: 7.13%{?dist} +Summary: Maven Site Plugin + +License: ASL 2.0 +URL: http://maven.apache.org/plugins/maven-site-plugin/ +Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip + +Patch0: 0001-Port-to-jetty-9.patch +Patch1: 0001-Fix-jetty-dependencies.patch +# Jetty is needed only in interactive mode of maven-site-plugin. Change +# dependency scope from compile to provided to reduce dependency bloat. +Patch2: %{pkg_name}-jetty-provided.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}maven-artifact-manager +BuildRequires: %{?scl_prefix}maven-plugin-plugin +BuildRequires: %{?scl_prefix}maven-assembly-plugin +BuildRequires: %{?scl_prefix}maven-compiler-plugin +BuildRequires: %{?scl_prefix}maven-install-plugin +BuildRequires: %{?scl_prefix}maven-javadoc-plugin +BuildRequires: %{?scl_prefix}maven-jar-plugin +BuildRequires: %{?scl_prefix}maven-resources-plugin +BuildRequires: %{?scl_prefix}maven-doxia-sink-api +BuildRequires: %{?scl_prefix}maven-doxia-logging-api +BuildRequires: %{?scl_prefix}maven-doxia-core +BuildRequires: %{?scl_prefix}maven-doxia-module-xhtml +BuildRequires: %{?scl_prefix}maven-doxia-module-apt +BuildRequires: %{?scl_prefix}maven-doxia-module-xdoc +BuildRequires: %{?scl_prefix}maven-doxia-module-fml +BuildRequires: %{?scl_prefix}maven-doxia-sitetools +BuildRequires: %{?scl_prefix}maven-doxia-tools >= 1.4-8 +BuildRequires: %{?scl_prefix}maven-project +BuildRequires: %{?scl_prefix}maven-surefire-plugin +BuildRequires: %{?scl_prefix}maven-surefire-provider-junit +BuildRequires: %{?scl_prefix}maven-shade-plugin +BuildRequires: %{?scl_prefix}maven-plugin-testing-harness +BuildRequires: %{?scl_prefix}maven-wagon-provider-api +BuildRequires: %{?scl_prefix}maven-reporting-exec +BuildRequires: %{?scl_prefix}plexus-containers-component-metadata +BuildRequires: %{?scl_prefix_java_common}jetty-client >= 9.0.0-0.1.RC0 +BuildRequires: %{?scl_prefix_java_common}jetty-server >= 9.0.0-0.1.RC0 +BuildRequires: %{?scl_prefix_java_common}jetty-servlet >= 9.0.0-0.1.RC0 +BuildRequires: %{?scl_prefix_java_common}jetty-util >= 9.0.0-0.1.RC0 +BuildRequires: %{?scl_prefix_java_common}jetty-webapp >= 9.0.0-0.1.RC0 +BuildRequires: %{?scl_prefix_java_common}tomcat-servlet-3.0-api +BuildRequires: %{?scl_prefix}plexus-archiver +BuildRequires: %{?scl_prefix}plexus-containers-container-default +BuildRequires: %{?scl_prefix}plexus-i18n +BuildRequires: %{?scl_prefix}plexus-velocity +BuildRequires: %{?scl_prefix}plexus-utils +BuildRequires: %{?scl_prefix}jetty-parent + + +%description +The Maven Site Plugin is a plugin that generates a site for the current project. + +%package javadoc +Summary: Javadoc for %{pkg_name} + +%description javadoc +API documentation for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{version} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%patch0 -p1 +%patch1 -p1 +%patch2 +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +# skipping tests because we need to fix them first for jetty update +%mvn_build -f +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%{_javadir}/%{pkg_name} +%dir %{_mavenpomdir}/%{pkg_name} +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Mon Feb 08 2016 Michal Srb - 3.2-7.13 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 3.2-7.12 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 3.2-7.11 +- maven33 rebuild + +* Thu Jan 15 2015 Mikolaj Izdebski - 3.2-7.10 +- Add directory ownership on %%{_mavenpomdir} subdir + +* Tue Jan 13 2015 Michael Simacek - 3.2-7.9 +- Mass rebuild 2015-01-13 + +* Tue Jan 06 2015 Michael Simacek - 3.2-7.8 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 3.2-7.7 +- Mass rebuild 2014-05-26 + +* Thu Feb 20 2014 Michael Simacek - 3.2-7.6 +- Adjust maven-wagon R/BR + +* Wed Feb 19 2014 Mikolaj Izdebski - 3.2-7.5 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 3.2-7.4 +- Mass rebuild 2014-02-18 + +* Fri Feb 14 2014 Mikolaj Izdebski - 3.2-7.3 +- SCL-ize requires and build-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 3.2-7.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 3.2-7.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 3.2-7 +- Mass rebuild 2013-12-27 + +* Wed Nov 13 2013 Mikolaj Izdebski - 3.2-6 +- Remove BR on main jetty package + +* Fri Jun 28 2013 Mikolaj Izdebski - 3.2-5 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Fri Mar 1 2013 Mikolaj Izdebski - 3.2-4 +- Merge branch 'port-to-jetty-9' into master + +* Tue Feb 26 2013 Mikolaj Izdebski - 3.2-3 +- Change jetty dependency scope to provided + +* Mon Feb 25 2013 Michal Srb - 3.2-3 +- Port to jetty 9.0.0 + +* Thu Feb 07 2013 Michal Srb - 3.2-2 +- Migrate from maven-doxia to doxia subpackages + +* Thu Jan 24 2013 Mikolaj Izdebski - 3.2-1 +- Update to upstream version 3.2 +- Build with xmvn + +* Tue Oct 30 2012 Mikolaj Izdebski - 3.1-3 +- Don't require full jetty, only minimal set of subpackages + +* Thu Jul 19 2012 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jun 20 2012 Mikolaj Izdebski - 3.1-1 +- Updatw to upstream 3.1 + +* Wed Apr 18 2012 Alexander Kurtakov 3.0-5 +- BR/R servlet 3. + +* Thu Jan 26 2012 Alexander Kurtakov 3.0-4 +- Add BR/R on jetty-parent. + +* Thu Jan 26 2012 Stanislav Ochotnicky - 3.0-3 +- Port for jetty 8.1.0 +- Small spec cleanups + +* Fri Jan 13 2012 Fedora Release Engineering - 3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Aug 12 2011 Alexander Kurtakov 3.0-1 +- Update to upstream 3.0 release. + +* Thu Jul 21 2011 Jaromir Capik - 2.3-3 +- Removal of plexus-maven-plugin dependency (not needed) + +* Thu Jun 23 2011 Stanislav Ochotnicky - 2.3-2 +- Add several missing things to (Build)Requires +- Fix build for maven3-only buildroot + +* Wed May 25 2011 Alexander Kurtakov 2.3-1 +- Update to new upstream version. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 26 2011 Alexander Kurtakov 2.2-1 +- Update to new upstream version. + +* Tue Jun 15 2010 Alexander Kurtakov 2.1-3 +- Requires maven-doxia-tools. + +* Tue May 18 2010 Alexander Kurtakov 2.1-2 +- Fix requires. + +* Tue May 18 2010 Alexander Kurtakov 2.1-1 +- Initial package.