diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6712afb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/doxia-sitetools-1.4-source-release.zip diff --git a/.rh-maven33-maven-doxia-sitetools.metadata b/.rh-maven33-maven-doxia-sitetools.metadata new file mode 100644 index 0000000..dbde1ff --- /dev/null +++ b/.rh-maven33-maven-doxia-sitetools.metadata @@ -0,0 +1 @@ +9cf1241775c0b667bd7b383d4704b8a5afe662f6 SOURCES/doxia-sitetools-1.4-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-Remove-dependency-on-velocity-tools.patch b/SOURCES/0001-Remove-dependency-on-velocity-tools.patch new file mode 100644 index 0000000..d8f00e8 --- /dev/null +++ b/SOURCES/0001-Remove-dependency-on-velocity-tools.patch @@ -0,0 +1,36 @@ +From fee413e27bf8d8c85a7e03ba6f92621ad6455cab Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Mon, 29 Apr 2013 11:02:31 +0200 +Subject: [PATCH] Remove dependency on velocity-tools + +--- + .../org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java +index d57d308..a8bb759 100644 +--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java ++++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java +@@ -70,8 +70,8 @@ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; + import org.apache.maven.doxia.util.XmlValidator; + + import org.apache.velocity.Template; ++import org.apache.velocity.VelocityContext; + import org.apache.velocity.context.Context; +-import org.apache.velocity.tools.ToolManager; + + import org.codehaus.plexus.component.annotations.Component; + import org.codehaus.plexus.component.annotations.Requirement; +@@ -432,8 +432,7 @@ public class DefaultSiteRenderer + + private Context createVelocityContext( SiteRendererSink sink, SiteRenderingContext siteRenderingContext ) + { +- ToolManager toolManager = new ToolManager( true ); +- Context context = toolManager.createContext(); ++ Context context = new VelocityContext(); + + // ---------------------------------------------------------------------- + // Data objects +-- +1.8.1.4 + diff --git a/SPECS/maven-doxia-sitetools.spec b/SPECS/maven-doxia-sitetools.spec new file mode 100644 index 0000000..c729a32 --- /dev/null +++ b/SPECS/maven-doxia-sitetools.spec @@ -0,0 +1,258 @@ +%global pkg_name maven-doxia-sitetools +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%global parent maven-doxia +%global subproj sitetools + +Name: %{?scl_prefix}%{pkg_name} +Version: 1.4 +Release: 3.13%{?dist} +Summary: Doxia content generation framework +License: ASL 2.0 +URL: http://maven.apache.org/doxia/ + +Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip + +Patch1: 0001-Remove-dependency-on-velocity-tools.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix_java_common}mvn(commons-collections:commons-collections) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-core) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-logging-api) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-module-apt) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-module-fml) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-module-fo) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-module-xdoc) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-module-xhtml) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.doxia:doxia-sink-api) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-parent:pom:) +BuildRequires: %{?scl_prefix}mvn(org.apache.velocity:velocity) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-i18n) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-velocity) +BuildRequires: %{?scl_prefix_java_common}mvn(xalan:xalan) +BuildRequires: %{?scl_prefix_java_common}mvn(xml-apis:xml-apis) + +BuildArch: noarch + +%description +Doxia is a content generation framework which aims to provide its +users with powerful techniques for generating static and dynamic +content. Doxia can be used to generate static sites in addition to +being incorporated into dynamic content generation systems like blogs, +wikis and content management systems. + +%package javadoc +Summary: Javadoc for %{pkg_name} + +%description javadoc +API documentation for %{pkg_name}. + +%prep +%setup -q -n doxia-%{subproj}-%{version} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x + +# upstream added support for velocity toolmanager, but it also means new +# dependency on velocity-tools. we don't want to depend on this package +# (it depends on struts 1) so this patch reverts upstream changes +%patch1 -p1 +%pom_remove_dep :velocity-tools doxia-site-renderer + +%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin +%pom_remove_dep net.sourceforge.htmlunit:htmlunit doxia-site-renderer/pom.xml + +%pom_xpath_inject "pom:plugin[pom:artifactId[text()='modello-maven-plugin']]/pom:configuration" \ + "true" doxia-decoration-model + +# There are two backends for generating PDFs: one based on iText and +# one using FOP. iText module is broken and only brings additional +# dependencies. Besides that upstream admits that iText support will +# likely removed in future versions of Doxia. In Fedora we remove +# iText backend sooner in order to fix dependency problems. +# +# See also: http://maven.apache.org/doxia/faq.html#How_to_export_in_PDF +# http://lists.fedoraproject.org/pipermail/java-devel/2013-April/004742.html +rm -rf $(find -type d -name itext) +%pom_remove_dep :itext doxia-doc-renderer +%pom_remove_dep :doxia-module-itext doxia-doc-renderer +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +# tests can't run because of missing deps +%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} + +%files javadoc -f .mfiles-javadoc + +%changelog +* Mon Feb 08 2016 Michal Srb - 1.4-3.13 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 1.4-3.12 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 1.4-3.11 +- maven33 rebuild + +* Thu Jan 15 2015 Mikolaj Izdebski - 1.4-3.10 +- Add directory ownership on %%{_mavenpomdir} subdir + +* Tue Jan 13 2015 Michael Simacek - 1.4-3.9 +- Mass rebuild 2015-01-13 + +* Mon Jan 12 2015 Michael Simacek - 1.4-3.8 +- Rebuild to regenerate requires from java-common + +* Tue Jan 06 2015 Michael Simacek - 1.4-3.7 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 1.4-3.6 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 1.4-3.5 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 1.4-3.4 +- Mass rebuild 2014-02-18 + +* Mon Feb 17 2014 Mikolaj Izdebski - 1.4-3.3 +- SCL-ize build-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 1.4-3.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 1.4-3.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 1.4-3 +- Mass rebuild 2013-12-27 + +* Fri Jun 28 2013 Mikolaj Izdebski - 1.4-2 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Mon Apr 29 2013 Michal Srb - 1.4-1 +- Update to upstream version 1.4 +- Remove unneeded patch + +* Tue Apr 9 2013 Mikolaj Izdebski - 1.3-4 +- Fix BuildRequires + +* Tue Apr 9 2013 Mikolaj Izdebski - 1.3-3 +- Remove iText PDF backend + +* Tue Apr 09 2013 Michal Srb +- Remove dependency on velocity-tools + +* Wed Feb 06 2013 Michal Srb - 1.3-1 +- Update to upstream version 1.3 +- Migrate from maven-doxia to doxia subpackages (#889145) +- Build with xmvn +- Replace patches with pom_ macros +- Remove unnecessary depmap + +* Wed Feb 06 2013 Java SIG - 1.2-6 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Nov 28 2012 Tomas Radej - 1.2-5 +- Removed (B)R on plexus-container-default + +* Thu Jul 19 2012 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 27 2012 Stanislav Ochotnicky - 1.2-3 +- Remove dependency on plexux-xmlrpc +- Add BR/R on java 1.7.0+ + +* Mon Jan 09 2012 Jaromir Capik - 1.2-2 +- Migration from plexus-maven-plugin to plexus-containers-component-metadata +- Minor spec file changes according to the latest guidelines + +* Fri May 6 2011 Stanislav Ochotnicky - 1.2-1 +- Update to latest version (1.2) +- Use maven 3 to build +- Remove version limits on BR/R (not valid anymore anyway) + +* Tue Feb 08 2011 Fedora Release Engineering - 1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 17 2010 Alexander Kurtakov 1.1.3-2 +- Adapt to current guidelines. + +* Tue Sep 7 2010 Stanislav Ochotnicky - 1.1.3-1 +- Update to 1.1.3 +- Enable javadoc generation again +- Update maven plugins BRs +- Make dependency on maven-doxia unversioned + +* Thu Jun 17 2010 Deepak Bhole - 0:1.1.2-3 +- Rebuild with maven 2.2.1 +- Remove modello 1.0 patch + +* Wed May 5 2010 Mary Ellen Foster 0:1.1.2-2 +- Add (Build)Requirement maven-shared-reporting-impl, + plexus-containers-container-default, jakarta-commons-configuration + +* Fri Feb 12 2010 Mary Ellen Foster 0:1.1.2-1 +- Update to 1.1.2 +- Temporarily disable javadoc until maven2-plugin-javadoc is rebuilt against + the new doxia + +* Mon Dec 21 2009 Alexander Kurtakov 1.0-0.2.a10.2 +- BR maven-surefire-provider-junit. + +* Tue Sep 01 2009 Andrew Overholt 1.0-0.2.a10.1 +- Add itext, tomcat5, and tomcat5-servlet-2.4-api BRs + +* Fri Aug 28 2009 Andrew Overholt 1.0-0.2.a10 +- First Fedora build + +* Fri Jun 20 2000 Deepak Bhole 1.0-0.1.a10.0jpp.1 +- Initial build