[maven-doxia] Update to upstream version 1.6

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Jul 17 10:55:49 UTC 2014


commit 177ad9c9f4ee718d2f5549f019da18a01fc4b7b6
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Jul 17 10:40:10 2014 +0200

    Update to upstream version 1.6

 .gitignore                                         |    1 +
 ...sable-tests-which-rely-on-ordering-in-set.patch |  199 ++++----------------
 0001-Update-to-Commons-Collections-1.10.patch      |    8 +-
 0001-Update-to-Plexus-Container-1.5.5.patch        |   20 +-
 ...a-core-remove-plexus-component-annotation.patch |   24 ---
 0004-Fix-itext-dependency.patch                    |    8 +-
 maven-doxia.spec                                   |  112 +++--------
 sources                                            |    2 +-
 8 files changed, 88 insertions(+), 286 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 009f80a..9a01573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ maven-doxia-1.1.2.tar.gz
 /doxia-1.3-source-release.zip
 /doxia-1.4-source-release.zip
 /doxia-1.5-source-release.zip
+/doxia-1.6-source-release.zip
diff --git a/0001-Disable-tests-which-rely-on-ordering-in-set.patch b/0001-Disable-tests-which-rely-on-ordering-in-set.patch
index 3ca44de..f4b9809 100644
--- a/0001-Disable-tests-which-rely-on-ordering-in-set.patch
+++ b/0001-Disable-tests-which-rely-on-ordering-in-set.patch
@@ -1,193 +1,70 @@
-From c7e883d08372769594f1ca86fba5a854a37287f8 Mon Sep 17 00:00:00 2001
+From 821b58812dc6d30d91a89c90266904a83daaf117 Mon Sep 17 00:00:00 2001
 From: Michal Srb <msrb at redhat.com>
 Date: Wed, 26 Mar 2014 09:58:20 +0100
-Subject: [PATCH] Disable tests which rely on ordering in set
+Subject: [PATCH 4/4] Disable tests which rely on ordering in set
 
 These tests fail with Java 8
 ---
- .../apache/maven/doxia/sink/AbstractSinkTest.java  | 120 ++++++++++-----------
- .../maven/doxia/module/fo/FoAggregateSinkTest.java |  30 +++---
- 2 files changed, 75 insertions(+), 75 deletions(-)
+ .../src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java   | 4 ++++
+ .../java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java    | 2 ++
+ 2 files changed, 6 insertions(+)
 
 diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
-index ebba69c..72c9276 100644
+index 5e817d6..7439cd3 100644
 --- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
 +++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
-@@ -405,41 +405,41 @@ public abstract class AbstractSinkTest
+@@ -419,6 +419,7 @@ public abstract class AbstractSinkTest
       * invoked on the current sink, produces the same result as
       * {@link #getFigureBlock getFigureBlock}( source, caption ).
       */
--    public void testFigure()
--    {
--        String source = "figure.jpg";
--        String caption = "Figure_caption";
--        sink.figure();
--        sink.figureGraphics( source );
--        sink.figureCaption();
--        sink.text( caption );
--        sink.figureCaption_();
--        sink.figure_();
--        sink.flush();
--        sink.close();
--
--        String actual = testWriter.toString();
--        String expected = getFigureBlock( source, caption );
--
--        assertEquals( "Wrong figure!", expected, actual );
--    }
--
--
--    public void testFigureWithoutCaption()
--    {
--        String source = "figure.jpg";
--        sink.figure();
--        sink.figureGraphics( source );
--        sink.figure_();
--        sink.flush();
--        sink.close();
--
--        String actual = testWriter.toString();
--        String expected = getFigureBlock( source, null );
--
--        assertEquals( "Wrong figure!", expected, actual );
--        
--    }
-+    //public void testFigure()
-+    //{
-+    //    String source = "figure.jpg";
-+    //    String caption = "Figure_caption";
-+    //    sink.figure();
-+    //    sink.figureGraphics( source );
-+    //    sink.figureCaption();
-+    //    sink.text( caption );
-+    //    sink.figureCaption_();
-+    //    sink.figure_();
-+    //    sink.flush();
-+    //    sink.close();
-+
-+    //    String actual = testWriter.toString();
-+    //    String expected = getFigureBlock( source, caption );
-+
-+    //    assertEquals( "Wrong figure!", expected, actual );
-+    //}
-+
-+
-+    //public void testFigureWithoutCaption()
-+    //{
-+    //    String source = "figure.jpg";
-+    //    sink.figure();
-+    //    sink.figureGraphics( source );
-+    //    sink.figure_();
-+    //    sink.flush();
-+    //    sink.close();
-+
-+    //    String actual = testWriter.toString();
-+    //    String expected = getFigureBlock( source, null );
-+
-+    //    assertEquals( "Wrong figure!", expected, actual );
-+    //    
-+    //}
++    /*
+     public void testFigure() throws Exception
+     {
+         String source = "figure.jpg";
+@@ -469,6 +470,7 @@ public abstract class AbstractSinkTest
+             assertEquals( "Wrong figure!", expected, actual );
+         }
+     }
++    */
      
      /**
       * Checks that the sequence <code>[table(),
-@@ -449,31 +449,31 @@ public abstract class AbstractSinkTest
+@@ -478,6 +480,7 @@ public abstract class AbstractSinkTest
       * invoked on the current sink, produces the same result as
       * {@link #getTableBlock getTableBlock}( cell, caption ).
       */
--    public void testTable()
--    {
--        String cell = "cell";
--        String caption = "Table_caption";
--        int[] justify = { Sink.JUSTIFY_CENTER };
--        sink.table();
--        sink.tableRows( justify, false );
--        sink.tableRow();
--        sink.tableCell();
--        sink.text( cell );
--        sink.tableCell_();
--        sink.tableRow_();
--        sink.tableRows_();
--        sink.tableCaption();
--        sink.text( caption );
--        sink.tableCaption_();
--        sink.table_();
--        sink.flush();
--        sink.close();
--
--        String actual = testWriter.toString();
--        String expected = getTableBlock( cell, caption );
--
--        assertEquals( "Wrong table!", expected, actual );
--    }
-+    //public void testTable()
-+    //{
-+    //    String cell = "cell";
-+    //    String caption = "Table_caption";
-+    //    int[] justify = { Sink.JUSTIFY_CENTER };
-+    //    sink.table();
-+    //    sink.tableRows( justify, false );
-+    //    sink.tableRow();
-+    //    sink.tableCell();
-+    //    sink.text( cell );
-+    //    sink.tableCell_();
-+    //    sink.tableRow_();
-+    //    sink.tableRows_();
-+    //    sink.tableCaption();
-+    //    sink.text( caption );
-+    //    sink.tableCaption_();
-+    //    sink.table_();
-+    //    sink.flush();
-+    //    sink.close();
-+
-+    //    String actual = testWriter.toString();
-+    //    String expected = getTableBlock( cell, caption );
-+
-+    //    assertEquals( "Wrong table!", expected, actual );
-+    //}
++    /*
+     public void testTable() throws Exception
+     {
+         String cell = "cell";
+@@ -511,6 +514,7 @@ public abstract class AbstractSinkTest
+             assertEquals( "Wrong table!", expected, actual );
+         }
+     }
++    */
  
      /**
       * Checks that the sequence <code>[paragraph(), text( text ),
 diff --git a/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java b/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
-index 4f67fb0..4548c33 100644
+index 847c341..729357b 100644
 --- a/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
 +++ b/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
-@@ -155,21 +155,21 @@ public class FoAggregateSinkTest
+@@ -164,6 +164,7 @@ public class FoAggregateSinkTest
      /**
       * Test of figureGraphics method, of class FoAggregateSink.
       */
--    public void testFigureGraphics()
--    {
--        try
--        {
--            sink = new FoAggregateSink( writer );
--            sink.setDocumentName( "./folder\\docName.xml" );
--            sink.figureGraphics( "./../images/fig.png", null );
--        }
--        finally
--        {
--            sink.close();
--        }
--
--        assertTrue( writer.toString().indexOf( "<fo:external-graphic src=\"./images/fig.png\"" ) != -1 );
--    }
-+    //public void testFigureGraphics()
-+    //{
-+    //    try
-+    //    {
-+    //        sink = new FoAggregateSink( writer );
-+    //        sink.setDocumentName( "./folder\\docName.xml" );
-+    //        sink.figureGraphics( "./../images/fig.png", null );
-+    //    }
-+    //    finally
-+    //    {
-+    //        sink.close();
-+    //    }
-+
-+    //    assertTrue( writer.toString().indexOf( "<fo:external-graphic src=\"./images/fig.png\"" ) != -1 );
-+    //}
++    /*
+     public void testFigureGraphics() throws Exception
+     {
+         try
+@@ -187,6 +188,7 @@ public class FoAggregateSinkTest
+         Diff diff = XMLUnit.compareXML( wrapXml( expected ), wrapXml( actual ) );
+         assertTrue( "Wrong figure!", diff.identical() );
+     }
++    */
  
      /**
       * Test of anchor method, of class FoAggregateSink.
 -- 
-1.9.0
+1.9.3
 
diff --git a/0001-Update-to-Commons-Collections-1.10.patch b/0001-Update-to-Commons-Collections-1.10.patch
index 769efb9..76e7b76 100644
--- a/0001-Update-to-Commons-Collections-1.10.patch
+++ b/0001-Update-to-Commons-Collections-1.10.patch
@@ -1,14 +1,14 @@
-From 81d4838fefbf7a87dc46eb5a55b18e77320b7884 Mon Sep 17 00:00:00 2001
+From 786df11d7033f89fd2256e2c45900bd822c36abc Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Thu, 7 Nov 2013 08:24:01 +0100
-Subject: [PATCH] Update to Commons Collections 1.10
+Subject: [PATCH 3/4] Update to Commons Collections 1.10
 
 ---
  doxia-modules/doxia-module-fo/pom.xml | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/doxia-modules/doxia-module-fo/pom.xml b/doxia-modules/doxia-module-fo/pom.xml
-index 1adb4f0..75ff692 100644
+index 6d54eba..0d89e4f 100644
 --- a/doxia-modules/doxia-module-fo/pom.xml
 +++ b/doxia-modules/doxia-module-fo/pom.xml
 @@ -73,7 +73,14 @@ under the License.
@@ -28,5 +28,5 @@ index 1adb4f0..75ff692 100644
      <dependency>
        <groupId>org.apache.xmlgraphics</groupId>
 -- 
-1.8.1.4
+1.9.3
 
diff --git a/0001-Update-to-Plexus-Container-1.5.5.patch b/0001-Update-to-Plexus-Container-1.5.5.patch
index 2929da5..b121811 100644
--- a/0001-Update-to-Plexus-Container-1.5.5.patch
+++ b/0001-Update-to-Plexus-Container-1.5.5.patch
@@ -1,7 +1,7 @@
-From 7da9425b8fc0cb20500f4e5aa8a8adc67d107969 Mon Sep 17 00:00:00 2001
+From 1ebea913dce45bdebd5f2fbf765a8091f7a88907 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Wed, 6 Nov 2013 12:46:26 +0100
-Subject: [PATCH] Update to Plexus Container 1.5.5
+Subject: [PATCH 2/4] Update to Plexus Container 1.5.5
 
 ---
  .../java/org/apache/maven/doxia/module/AbstractIdentityTest.java   | 3 ++-
@@ -32,7 +32,7 @@ index 100add3..8c78956 100644
          String actual = writer.toString();
  
 diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
-index ebba69c..1aac4fc 100644
+index 93d0f01..5e817d6 100644
 --- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
 +++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
 @@ -25,6 +25,7 @@ import java.io.Writer;
@@ -41,9 +41,9 @@ index ebba69c..1aac4fc 100644
  import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
 +import org.codehaus.plexus.DefaultPlexusContainer;
  import org.codehaus.plexus.util.IOUtil;
- 
- /**
-@@ -54,7 +55,7 @@ public abstract class AbstractSinkTest
+ import org.custommonkey.xmlunit.Diff;
+ import org.custommonkey.xmlunit.XMLUnit;
+@@ -56,7 +57,7 @@ public abstract class AbstractSinkTest
  
          testWriter.reset();
          sink = createSink( testWriter );
@@ -51,7 +51,7 @@ index ebba69c..1aac4fc 100644
 +        sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
      }
  
-     // ---------------------------------------------------------------------
+     /**
 diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
 index 5f9108e..88db2b4 100644
 --- a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
@@ -74,7 +74,7 @@ index 5f9108e..88db2b4 100644
          for ( Iterator<Map.Entry<String, String>> it = getTestDocuments().entrySet().iterator(); it.hasNext(); )
          {
 diff --git a/pom.xml b/pom.xml
-index 754f65d..82b36c3 100644
+index 4d42f3e..a0dbb9c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -287,18 +287,13 @@ under the License.
@@ -87,7 +87,7 @@ index 754f65d..82b36c3 100644
        <dependency>
          <groupId>org.codehaus.plexus</groupId>
          <artifactId>plexus-utils</artifactId>
-         <version>3.0.10</version>
+         <version>3.0.15</version>
        </dependency>
 -      <dependency><!-- remove when upgrading parent to version 22 -->
 -        <groupId>org.codehaus.plexus</groupId>
@@ -98,5 +98,5 @@ index 754f65d..82b36c3 100644
    </dependencyManagement>
    <dependencies>
 -- 
-1.8.1.4
+1.9.3
 
diff --git a/0004-Fix-itext-dependency.patch b/0004-Fix-itext-dependency.patch
index 83bfb39..ebacc2a 100644
--- a/0004-Fix-itext-dependency.patch
+++ b/0004-Fix-itext-dependency.patch
@@ -1,7 +1,7 @@
-From b1f8c2fca4c068487acb93479eb6bfb875322bc8 Mon Sep 17 00:00:00 2001
+From 516ad4811e3531889f805e0a8ba62c31ff77f7e3 Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky at redhat.com>
 Date: Mon, 29 Apr 2013 11:37:12 +0200
-Subject: [PATCH] Fix itext dependency
+Subject: [PATCH 1/4] Fix itext dependency
 
 ---
  doxia-modules/doxia-module-itext/pom.xml           |  2 +-
@@ -12,7 +12,7 @@ Subject: [PATCH] Fix itext dependency
  5 files changed, 13 insertions(+), 102 deletions(-)
 
 diff --git a/doxia-modules/doxia-module-itext/pom.xml b/doxia-modules/doxia-module-itext/pom.xml
-index ea35ee2..55a4f61 100644
+index 86acc37..9cc34ff 100644
 --- a/doxia-modules/doxia-module-itext/pom.xml
 +++ b/doxia-modules/doxia-module-itext/pom.xml
 @@ -58,7 +58,7 @@ under the License.
@@ -241,5 +241,5 @@ index 3e24d07..50d0d70 100644
      }
  }
 -- 
-1.8.1.4
+1.9.3
 
diff --git a/maven-doxia.spec b/maven-doxia.spec
index 39989e8..556c60f 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -1,41 +1,11 @@
-# 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.
-#
-
 %if 0%{?fedora}
 %bcond_without itext
 %bcond_without markdown
 %endif
 
 Name:           maven-doxia
-Version:        1.5
-Release:        7%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -52,11 +22,6 @@ Source0:        http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%{ver
 Source1:        RenderingContext.java
 
 
-# abstract class should not be annotated as component because maven
-# will pick it up and try to instantiate
-# Forwarded upstream: DOXIA-503
-Patch1:         0001-doxia-core-remove-plexus-component-annotation.patch
-
 # Build against iText 2.x
 # http://jira.codehaus.org/browse/DOXIA-53
 Patch2:         0004-Fix-itext-dependency.patch
@@ -72,54 +37,35 @@ Patch5:         0001-Disable-tests-which-rely-on-ordering-in-set.patch
 
 BuildArch:      noarch
 
-BuildRequires:  java >= 1:1.6.0
-BuildRequires:  jpackage-utils
-BuildRequires:  ant
-BuildRequires:  plexus-cli
 BuildRequires:  maven-local
-BuildRequires:  maven-assembly-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-plugin-plugin
-BuildRequires:  maven-site-plugin
-BuildRequires:  maven-shade-plugin
-BuildRequires:  maven-surefire-maven-plugin
-BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven-shared-reporting-impl
-BuildRequires:  maven-doxia-sitetools
-BuildRequires:  maven-doxia-tools
-BuildRequires:  modello-maven-plugin
-BuildRequires:  plexus-classworlds
-BuildRequires:  apache-commons-collections
-BuildRequires:  apache-commons-logging
-BuildRequires:  apache-commons-validator
-BuildRequires:  apache-commons-configuration
-BuildRequires:  junit
-BuildRequires:  jakarta-oro
-BuildRequires:  plexus-i18n
-BuildRequires:  plexus-utils
-BuildRequires:  plexus-velocity
-BuildRequires:  plexus-build-api
-BuildRequires:  velocity
-BuildRequires:  fop
-BuildRequires:  plexus-containers-component-metadata
-BuildRequires:  plexus-containers-component-javadoc
-BuildRequires:  plexus-containers-container-default >= 1.5.5-14
-BuildRequires:  httpcomponents-client
-BuildRequires:  httpcomponents-project
-BuildRequires:  xmlgraphics-commons
-BuildRequires:  avalon-framework
-BuildRequires:  geronimo-parent-poms
-BuildRequires:  geronimo-jms
-BuildRequires:  javamail
+BuildRequires:  mvn(commons-configuration:commons-configuration)
+BuildRequires:  mvn(commons-lang:commons-lang)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.httpcomponents:httpclient)
+BuildRequires:  mvn(org.apache.httpcomponents:httpcore)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-core)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-core::tests:)
+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-modules:pom:)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xhtml)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia:pom:)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-test-docs)
+BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires:  mvn(org.apache.xmlgraphics:fop)
+BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(xerces:xercesImpl)
+BuildRequires:  mvn(xmlunit:xmlunit)
 %if %{with itext}
-BuildRequires:  itext
+BuildRequires:  mvn(com.lowagie:itext)
 %endif
 %if %{with markdown}
-BuildRequires:  pegdown >= 1.4.2-2
+BuildRequires:  mvn(org.pegdown:pegdown)
 %endif
 
 Obsoletes:      maven-doxia-book < %{epoch}:%{version}-%{release}
@@ -256,7 +202,6 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n doxia-%{version}
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -321,6 +266,9 @@ cp -p %SOURCE1 doxia-core/src/main/java/org/apache/maven/doxia/sink/render/
 
 
 %changelog
+* Thu Jul 17 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.6-1
+- Update to upstream version 1.6
+
 * Wed Jun 11 2014 Michael Simacek <msimacek at redhat.com> - 0:1.5-7
 - Change BR classworlds to plexus-classworlds
 
diff --git a/sources b/sources
index a6cacf2..393930a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b9a6b8d0cb1c92afac3cd3b6a9c3dcf  doxia-1.5-source-release.zip
+a1a327bd252f5bf634381d87da7d3797  doxia-1.6-source-release.zip


More information about the scm-commits mailing list