From 6162262c09e3dd9d70fcb19877f7bff0f34e9e8f Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Nov 14 2016 10:37:34 +0000
Subject: Update to upstream version 1.7.4


---

diff --git a/.gitignore b/.gitignore
index b302cab..c41eda8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ maven-doxia-sitetools-1.0-alpha10-src.tar.gz
 /doxia-sitetools-1.7.1-source-release.zip
 /doxia-sitetools-1.7.2-source-release.zip
 /doxia-sitetools-1.7.3-source-release.zip
+/doxia-sitetools-1.7.4-source-release.zip
diff --git a/0001-Port-to-plexus-utils-3.0.24.patch b/0001-Port-to-plexus-utils-3.0.24.patch
index e1da256..360c3f3 100644
--- a/0001-Port-to-plexus-utils-3.0.24.patch
+++ b/0001-Port-to-plexus-utils-3.0.24.patch
@@ -1,4 +1,4 @@
-From f50b41186d3357b88124556ff9ef34456cdf6bf1 Mon Sep 17 00:00:00 2001
+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] Port to plexus-utils 3.0.24
@@ -8,26 +8,26 @@ Subject: [PATCH] Port to plexus-utils 3.0.24
  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 d891bff..2370e4b 100644
+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
-         // doxiaSiteRendererVersion
-         InputStream inputStream = this.getClass().getResourceAsStream( "/META-INF/"
-             + "maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties" );
--        Properties properties = PropertyUtils.loadProperties( inputStream );
-+        Properties properties;
-+        try
-+        {
-+            properties = PropertyUtils.loadProperties( inputStream );
-+        }
-+        catch ( IOException exc )
-+        {
-+            properties = null;
-+        }
-         if ( inputStream == null )
-         {
-             getLogger().debug( "pom.properties for doxia-site-renderer could not be found." );
+         // doxiaSiteRendererVersion
+         InputStream inputStream = this.getClass().getResourceAsStream( "/META-INF/"
+             + "maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties" );
+-        Properties properties = PropertyUtils.loadProperties( inputStream );
++        Properties properties;
++        try
++        {
++            properties = PropertyUtils.loadProperties( inputStream );
++        }
++        catch ( IOException exc )
++        {
++            properties = null;
++        }
+         if ( inputStream == null )
+         {
+             getLogger().debug( "pom.properties for doxia-site-renderer could not be found." );
 -- 
 2.7.4
 
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index 25ced55..736a565 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -2,7 +2,7 @@
 %global subproj sitetools
 
 Name:           %{parent}-%{subproj}
-Version:        1.7.3
+Version:        1.7.4
 Release:        1%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
@@ -103,6 +103,9 @@ rm -rf $(find -type d -name itext)
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Nov 14 2016 Michael Simacek <msimacek@redhat.com> - 1.7.4-1
+- Update to upstream version 1.7.4
+
 * Wed Nov 09 2016 Michael Simacek <msimacek@redhat.com> - 1.7.3-1
 - Update to upstream version 1.7.3
 
diff --git a/sources b/sources
index 581905c..6316266 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-614e6b9391807823fadedc72a8aa5c74  doxia-sitetools-1.7.3-source-release.zip
+b50716825c1141cd3fd40c0506c81c10  doxia-sitetools-1.7.4-source-release.zip