.gitignore

@@ -1 +1 @@
-SOURCES/doxia-sitetools-1.7.5-source-release.zip
+SOURCES/doxia-sitetools-1.9.1-source-release.zip

.maven-doxia-sitetools.metadata

@@ -1 +1 @@
-9ab874120bd60f532c167a430d8e077c2914016d SOURCES/doxia-sitetools-1.7.5-source-release.zip
+d562abd0872e02e64e588243dfa02189b2dfa9df SOURCES/doxia-sitetools-1.9.1-source-release.zip

SOURCES/0001-Port-to-plexus-utils-3.0.24.patch

@@ -1,17 +1,17 @@
-From 2f2adbedfff4d846e039d06ef932c867a8616523 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Thu, 12 May 2016 08:28:17 +0200
-Subject: [PATCH 1/2] Port to plexus-utils 3.0.24
-
----
- .../apache/maven/doxia/siterenderer/DefaultSiteRenderer.java   | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-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 9bc3ef2..c31688d 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
-@@ -559,7 +559,15 @@ public class DefaultSiteRenderer
+From 2f2adbedfff4d846e039d06ef932c867a8616523 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 12 May 2016 08:28:17 +0200
+Subject: [PATCH 1/2] Port to plexus-utils 3.0.24
+
+---
+ .../apache/maven/doxia/siterenderer/DefaultSiteRenderer.java   | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+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 9bc3ef2..c31688d 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
+@@ -568,7 +568,15 @@ public class DefaultSiteRenderer
          // doxiaSiteRendererVersion
          InputStream inputStream = this.getClass().getResourceAsStream( "/META-INF/"
              + "maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties" );
@@ -28,6 +28,6 @@ index 9bc3ef2..c31688d 100644
          if ( inputStream == null )
          {
              getLogger().debug( "pom.properties for doxia-site-renderer could not be found." );
--- 
-2.9.3
-
+-- 
+2.9.3
+

SOURCES/0002-Remove-dependency-on-velocity-tools.patch

@@ -1,17 +1,17 @@
-From da397953bd73068c4ab8d219ec91e312fd3d5d55 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Mon, 6 Feb 2017 14:27:53 +0100
-Subject: [PATCH 2/2] Remove dependency on velocity-tools
-
----
- .../doxia/siterenderer/DefaultSiteRenderer.java    | 58 +---------------------
- 1 file changed, 2 insertions(+), 56 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 c31688d..58058b3 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
-@@ -76,31 +76,11 @@ import org.apache.maven.doxia.parser.module.ParserModuleNotFoundException;
+From da397953bd73068c4ab8d219ec91e312fd3d5d55 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Mon, 6 Feb 2017 14:27:53 +0100
+Subject: [PATCH 2/2] Remove dependency on velocity-tools
+
+---
+ .../doxia/siterenderer/DefaultSiteRenderer.java    | 58 +---------------------
+ 1 file changed, 2 insertions(+), 56 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 c31688d..58058b3 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
+@@ -76,31 +76,11 @@ import org.apache.maven.doxia.parser.module.ParserModuleNotFoundException;
  import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
  import org.apache.maven.doxia.util.XmlValidator;
  import org.apache.velocity.Template;
@@ -44,7 +44,7 @@ index c31688d..58058b3 100644
  import org.codehaus.plexus.PlexusContainer;
  import org.codehaus.plexus.component.annotations.Component;
  import org.codehaus.plexus.component.annotations.Requirement;
-@@ -481,41 +461,7 @@ public class DefaultSiteRenderer
+@@ -490,41 +469,7 @@ public class DefaultSiteRenderer
       */
      protected Context createToolManagedVelocityContext( SiteRenderingContext siteRenderingContext )
      {
@@ -87,6 +87,6 @@ index c31688d..58058b3 100644
      }
  
      /**
--- 
-2.9.3
-
+-- 
+2.9.3
+

SPECS/maven-doxia-sitetools.spec

@@ -1,18 +1,12 @@
-%bcond_without  markdown
-%bcond_without  fop
-
-%global parent maven-doxia
-%global subproj sitetools
-
-Name:           %{parent}-%{subproj}
-Version:        1.7.5
+Name:           maven-doxia-sitetools
+Version:        1.9.1
 Release:        2%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
 URL:            http://maven.apache.org/doxia/
 BuildArch:      noarch
 
-Source0:        http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-sitetools-%{version}-source-release.zip
 
 Patch0:         0001-Port-to-plexus-utils-3.0.24.patch
 Patch1:         0002-Remove-dependency-on-velocity-tools.patch
@@ -20,19 +14,14 @@ Patch1:         0002-Remove-dependency-on-velocity-tools.patch
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-collections:commons-collections)
 BuildRequires:  mvn(commons-io:commons-io)
-BuildRequires:  mvn(commons-lang:commons-lang)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-core)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-logging-api)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-apt)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-fml)
-%if %{with fop}
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-fo)
-%endif
-%if %{with markdown}
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-markdown)
-%endif
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xdoc)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xhtml)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xhtml5)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-artifact:2.2.1)
@@ -55,7 +44,6 @@ BuildRequires:  mvn(xalan:xalan)
 BuildRequires:  mvn(xml-apis:xml-apis)
 
 Provides:      maven-doxia-tools = %{version}-%{release}
-Obsoletes:     maven-doxia-tools < 1.7
 
 %description
 Doxia is a content generation framework which aims to provide its
@@ -71,7 +59,9 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n doxia-%{subproj}-%{version}
+%setup -q -n doxia-sitetools-%{version}
+
+sed -i 's/\r//' doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 %patch0 -p1
 %patch1 -p1
 
@@ -97,13 +87,9 @@ API documentation for %{name}.
 rm -rf $(find -type d -name itext)
 %pom_remove_dep -r :doxia-module-itext
 
-%if %{without markdown}
 %pom_remove_dep -r :doxia-module-markdown
-%endif
-%if %{without fop}
 %pom_remove_dep -r :doxia-module-fo
 rm -r doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo
-%endif
 
 %mvn_alias :doxia-integration-tools org.apache.maven.shared:maven-doxia-tools
 
@@ -114,13 +100,24 @@ rm -r doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo
 %install
 %mvn_install
 
-
 %files -f .mfiles
-%dir %{_javadir}/%{name}
-
+%doc LICENSE NOTICE
 %files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.1-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 1.9.1-1
+- Update to upstream version 1.9.1
+
+* Thu May 30 2019 Marian Koncek <mkoncek@redhat.com> - 1.8.1-1
+- Update to upstream version 1.8.1
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.5-3
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
@@ -255,5 +252,5 @@ rm -r doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo
 * Fri Aug 28 2009 Andrew Overholt <overholt@redhat.com> 1.0-0.2.a10
 - First Fedora build
 
-* Fri Jun 20 2000 Deepak Bhole <dbhole@redhat.com> 1.0-0.1.a10.0jpp.1
+* Tue Jun 20 2000 Deepak Bhole <dbhole@redhat.com> 1.0-0.1.a10.0jpp.1
 - Initial build