diff --git a/.gitignore b/.gitignore index ec1a455..808173e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ maven-doxia-1.1.2.tar.gz /doxia-1.5-source-release.zip /doxia-1.6-source-release.zip /doxia-1.7-source-release.zip +/doxia-1.8-source-release.zip +/doxia-1.9-source-release.zip diff --git a/0002-Disable-tests-which-rely-on-ordering-in-set.patch b/0002-Disable-tests-which-rely-on-ordering-in-set.patch new file mode 100644 index 0000000..bc57e86 --- /dev/null +++ b/0002-Disable-tests-which-rely-on-ordering-in-set.patch @@ -0,0 +1,61 @@ +From 6e1707a4bdea698f62fac215b6bca646bf14e4b4 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 26 Mar 2014 09:58:20 +0100 +Subject: [PATCH 3/4] Disable tests which rely on ordering in set + +--- + .../test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java | 3 +++ + .../java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java +index 3ac8734..707cdf1 100644 +--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java ++++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java +@@ -452,6 +452,7 @@ public abstract class AbstractSinkTest + * invoked on the current sink, produces the same result as + * {@link #getFigureBlock getFigureBlock}( source, caption ). + */ ++ /* + public void testFigure() throws Exception + { + String source = "figure.jpg"; +@@ -511,6 +512,7 @@ public abstract class AbstractSinkTest + * invoked on the current sink, produces the same result as + * {@link #getTableBlock getTableBlock}( cell, caption ). + */ ++ /* + public void testTable() throws Exception + { + String cell = "cell"; +@@ -544,6 +543,7 @@ public abstract class AbstractSinkTest + assertEquals( actual, expected ); + } + } ++ */ + + /** + * Checks that the sequence [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 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 +@@ -164,6 +164,7 @@ public class FoAggregateSinkTest + /** + * Test of figureGraphics method, of class FoAggregateSink. + */ ++ /* + public void testFigureGraphics() throws Exception + { + try +@@ -188,6 +188,7 @@ public class FoAggregateSinkTest + + assertThat ( wrapXml( actual ), CompareMatcher.isIdenticalTo( wrapXml( expected ) )); + } ++ */ + + /** + * Test of anchor method, of class FoAggregateSink. +-- +2.5.5 + diff --git a/0002-Update-to-Plexus-Container-1.5.5.patch b/0002-Update-to-Plexus-Container-1.5.5.patch deleted file mode 100644 index 3a208ca..0000000 --- a/0002-Update-to-Plexus-Container-1.5.5.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 6a3583cafd46194b6c2c5f4db061f72f16d014ef Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 6 Nov 2013 12:46:26 +0100 -Subject: [PATCH 2/4] Update to Plexus Container 1.5.5 - ---- - .../java/org/apache/maven/doxia/module/AbstractIdentityTest.java | 3 ++- - .../test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java | 5 +++-- - .../test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java | 3 ++- - pom.xml | 2 +- - 4 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java -index 2f4f495..540461d 100644 ---- a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java -+++ b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java -@@ -33,6 +33,7 @@ import org.apache.maven.doxia.parser.Parser; - import org.apache.maven.doxia.sink.Sink; - import org.apache.maven.doxia.sink.impl.SinkTestDocument; - import org.apache.maven.doxia.sink.impl.TextSink; -+import org.codehaus.plexus.DefaultPlexusContainer; - import org.codehaus.plexus.util.IOUtil; - - /** -@@ -107,7 +108,7 @@ public abstract class AbstractIdentityTest - writer = new StringWriter(); - sink = new TextSink( writer ); - Parser parser = createParser(); -- parser.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) ); -+ parser.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) ); - parser.parse( reader, sink ); - String actual = writer.toString(); - -diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java -index a67a114..3ac8734 100644 ---- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java -+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java -@@ -28,6 +28,7 @@ import org.apache.maven.doxia.logging.PlexusLoggerWrapper; - import org.apache.maven.doxia.sink.Sink; - import org.apache.maven.doxia.sink.SinkEventAttributes; - import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; -+import org.codehaus.plexus.DefaultPlexusContainer; - import org.codehaus.plexus.util.IOUtil; - import org.custommonkey.xmlunit.Diff; - import org.custommonkey.xmlunit.XMLUnit; -@@ -59,7 +60,7 @@ public abstract class AbstractSinkTest - - testWriter.reset(); - sink = createSink( testWriter ); -- sink.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) ); -+ sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) ); - } - - /** -@@ -809,7 +810,7 @@ public abstract class AbstractSinkTest - - testWriter.reset(); - sink = createSink( testWriter ); -- sink.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) ); -+ sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() )); - - comment = "-"; - sink.comment( comment ); -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 -+++ b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java -@@ -31,6 +31,7 @@ import junit.framework.AssertionFailedError; - - import org.apache.maven.doxia.parser.Parser; - -+import org.codehaus.plexus.DefaultPlexusContainer; - import org.codehaus.plexus.PlexusTestCase; - import org.codehaus.plexus.logging.Logger; - -@@ -96,7 +97,7 @@ public abstract class AbstractXmlValidator - public void testValidateFiles() - throws Exception - { -- final Logger logger = getContainer().getLoggerManager().getLoggerForComponent( Parser.ROLE ); -+ final Logger logger = ( ( DefaultPlexusContainer )getContainer() ).getLoggerManager().getLoggerForComponent( Parser.ROLE ); - - for ( Iterator> it = getTestDocuments().entrySet().iterator(); it.hasNext(); ) - { -diff --git a/pom.xml b/pom.xml -index 134f8b8..fcf4f32 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -180,7 +180,7 @@ under the License. - - org.codehaus.plexus - plexus-container-default -- 1.0-alpha-30 -+ 1.5.5 - - - org.codehaus.plexus --- -2.5.5 - diff --git a/0003-Disable-tests-which-rely-on-ordering-in-set.patch b/0003-Disable-tests-which-rely-on-ordering-in-set.patch deleted file mode 100644 index 3e69d59..0000000 --- a/0003-Disable-tests-which-rely-on-ordering-in-set.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6e1707a4bdea698f62fac215b6bca646bf14e4b4 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 26 Mar 2014 09:58:20 +0100 -Subject: [PATCH 3/4] Disable tests which rely on ordering in set - ---- - .../test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java | 3 +++ - .../java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java | 2 ++ - 2 files changed, 5 insertions(+) - -diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java -index 3ac8734..707cdf1 100644 ---- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java -+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java -@@ -452,6 +452,7 @@ public abstract class AbstractSinkTest - * invoked on the current sink, produces the same result as - * {@link #getFigureBlock getFigureBlock}( source, caption ). - */ -+ /* - public void testFigure() throws Exception - { - String source = "figure.jpg"; -@@ -511,6 +512,7 @@ public abstract class AbstractSinkTest - * invoked on the current sink, produces the same result as - * {@link #getTableBlock getTableBlock}( cell, caption ). - */ -+ /* - public void testTable() throws Exception - { - String cell = "cell"; -@@ -544,6 +546,7 @@ public abstract class AbstractSinkTest - assertEquals( "Wrong table!", expected, actual ); - } - } -+ */ - - /** - * Checks that the sequence [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 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 -@@ -164,6 +164,7 @@ public class FoAggregateSinkTest - /** - * Test of figureGraphics method, of class FoAggregateSink. - */ -+ /* - 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. --- -2.5.5 - diff --git a/0004-Port-to-fop-2.0.patch b/0004-Port-to-fop-2.0.patch deleted file mode 100644 index c09b624..0000000 --- a/0004-Port-to-fop-2.0.patch +++ /dev/null @@ -1,157 +0,0 @@ -From b72bf32dbabf4c18cf48bdbc344227fb0b2d5110 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 17 Aug 2015 17:15:05 +0200 -Subject: [PATCH 4/4] Port to fop-2.0 - ---- - doxia-modules/doxia-module-fo/pom.xml | 2 +- - .../org/apache/maven/doxia/module/fo/FoUtils.java | 58 ++++++---------------- - 2 files changed, 16 insertions(+), 44 deletions(-) - -diff --git a/doxia-modules/doxia-module-fo/pom.xml b/doxia-modules/doxia-module-fo/pom.xml -index e66c736..6d261c8 100644 ---- a/doxia-modules/doxia-module-fo/pom.xml -+++ b/doxia-modules/doxia-module-fo/pom.xml -@@ -85,7 +85,7 @@ under the License. - - org.apache.xmlgraphics - fop -- 0.95 -+ 2.0 - - - log4j -diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java -index 0e7efc1..c398eaf 100644 ---- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java -+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java -@@ -24,6 +24,7 @@ import java.io.File; - import java.io.FileOutputStream; - import java.io.IOException; - import java.io.OutputStream; -+import java.net.URI; - import java.util.Date; - - import javax.xml.transform.Result; -@@ -38,6 +39,7 @@ import org.apache.fop.apps.FOPException; - import org.apache.fop.apps.FOUserAgent; - import org.apache.fop.apps.Fop; - import org.apache.fop.apps.FopFactory; -+import org.apache.fop.apps.FopFactoryBuilder; - import org.apache.fop.apps.MimeConstants; - import org.apache.maven.doxia.document.DocumentModel; - import org.codehaus.plexus.util.IOUtil; -@@ -52,28 +54,11 @@ import org.codehaus.plexus.util.StringUtils; - */ - public class FoUtils - { -- /** To reuse the FopFactory **/ -- private static final FopFactory FOP_FACTORY = FopFactory.newInstance(); -- - /** To reuse the TransformerFactory **/ - private static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance(); - -- /** -- * Converts an FO file to a PDF file using FOP. -- * -- * @param fo the FO file, not null. -- * @param pdf the target PDF file, not null. -- * @param resourceDir The base directory for relative path resolution, could be null. -- * If null, defaults to the parent directory of fo. -- * @param documentModel the document model to add PDF metadatas like author, title and keywords, could be null. -- * @throws javax.xml.transform.TransformerException In case of a conversion problem. -- * @since 1.1.1 -- */ -- public static void convertFO2PDF( File fo, File pdf, String resourceDir, DocumentModel documentModel ) -- throws TransformerException -- { -- FOUserAgent foUserAgent = getDefaultUserAgent( fo, resourceDir ); - -+ private static void prepareUserAgent( FOUserAgent foUserAgent, DocumentModel documentModel ) { - if ( documentModel != null && documentModel.getMeta() != null ) - { - // http://xmlgraphics.apache.org/fop/embedding.html#user-agent -@@ -113,8 +98,6 @@ public class FoUtils - { - foUserAgent.setCreationDate( new Date() ); - } -- -- convertFO2PDF( fo, pdf, resourceDir, foUserAgent ); - } - - /** -@@ -124,16 +107,13 @@ public class FoUtils - * @param pdf the target PDF file, not null. - * @param resourceDir The base directory for relative path resolution, could be null. - * If null, defaults to the parent directory of fo. -- * @param foUserAgent the FOUserAgent to use. -- * May be null, in which case a default user agent will be used. -+ * @param documentModel the document model to add PDF metadatas like author, title and keywords, could be null. - * @throws javax.xml.transform.TransformerException In case of a conversion problem. - * @since 1.1.1 - */ -- public static void convertFO2PDF( File fo, File pdf, String resourceDir, FOUserAgent foUserAgent ) -+ public static void convertFO2PDF( File fo, File pdf, String resourceDir, DocumentModel documentModel ) - throws TransformerException - { -- FOUserAgent userAgent = ( foUserAgent == null ? getDefaultUserAgent( fo, resourceDir ) : foUserAgent ); -- - OutputStream out = null; - try - { -@@ -149,7 +129,11 @@ public class FoUtils - Result res = null; - try - { -- Fop fop = FOP_FACTORY.newFop( MimeConstants.MIME_PDF, userAgent, out ); -+ URI baseURI = getBaseURI( fo, resourceDir ); -+ FopFactory fopFactory = new FopFactoryBuilder( baseURI ).build(); -+ FOUserAgent userAgent = fopFactory.newFOUserAgent(); -+ prepareUserAgent( userAgent, documentModel ); -+ Fop fop = fopFactory.newFop( MimeConstants.MIME_PDF, userAgent, out ); - res = new SAXResult( fop.getDefaultHandler() ); - } - catch ( FOPException e ) -@@ -193,34 +177,22 @@ public class FoUtils - } - - /** -- * Returns a base URL to be used by the FOUserAgent. -+ * Returns a base URI. - * - * @param fo the FO file. - * @param resourceDir the resource directory. -- * @return String. -+ * @return URI. - */ -- private static String getBaseURL( File fo, String resourceDir ) -+ private static URI getBaseURI( File fo, String resourceDir ) - { -- String url = null; -- - if ( resourceDir == null ) - { -- url = "file:///" + fo.getParent() + "/"; -+ return fo.getParentFile().toURI(); - } - else - { -- url = "file:///" + resourceDir + "/"; -+ return new File( resourceDir + "/" ).toURI(); - } -- -- return url; -- } -- -- private static FOUserAgent getDefaultUserAgent( File fo, String resourceDir ) -- { -- FOUserAgent foUserAgent = FOP_FACTORY.newFOUserAgent(); -- foUserAgent.setBaseURL( getBaseURL( fo, resourceDir ) ); -- -- return foUserAgent; - } - - private FoUtils() --- -2.5.5 - diff --git a/Makefile b/Makefile deleted file mode 100644 index 3bda47d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: maven-doxia -# $Id$ -NAME := maven-doxia -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/maven-doxia.spec b/maven-doxia.spec index c1211c2..4fed49f 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -1,10 +1,9 @@ %bcond_with itext -%bcond_without markdown %bcond_without fop Name: maven-doxia -Version: 1.7 -Release: 12%{?dist} +Version: 1.9 +Release: 1%{?dist} Epoch: 0 Summary: Content generation framework License: ASL 2.0 @@ -16,14 +15,8 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%{ver # https://issues.apache.org/jira/browse/DOXIA-53 Patch1: 0001-Fix-itext-dependency.patch -# Accepted upstream: DOXIA-504, https://issues.apache.org/jira/browse/DOXIA-504 -Patch2: 0002-Update-to-Plexus-Container-1.5.5.patch - # Don't run bad tests which rely on ordering in set (they fail with Java 8) -Patch3: 0003-Disable-tests-which-rely-on-ordering-in-set.patch - -# Not upstreamable due to higher Java version of fop's dependencies -Patch4: 0004-Port-to-fop-2.0.patch +Patch2: 0002-Disable-tests-which-rely-on-ordering-in-set.patch BuildArch: noarch @@ -38,7 +31,8 @@ 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(xmlunit:xmlunit) +BuildRequires: mvn(org.xmlunit:xmlunit-core) +BuildRequires: mvn(org.xmlunit:xmlunit-matchers) %if %{with fop} BuildRequires: mvn(commons-collections:commons-collections) @@ -51,13 +45,9 @@ BuildRequires: mvn(org.apache.xmlgraphics:fop) BuildRequires: mvn(com.lowagie:itext) %endif -%if %{with markdown} -BuildRequires: mvn(org.pegdown:pegdown) -%endif - Obsoletes: maven-doxia-book < %{epoch}:%{version}-%{release} Obsoletes: maven-doxia-maven-plugin < %{epoch}:%{version}-%{release} - +Obsoletes: maven-doxia-module-markdown < %{epoch}:%{version}-%{release} %description Doxia is a content generation framework which aims to provide its @@ -66,7 +56,6 @@ 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 core Summary: Core module for %{name} @@ -119,14 +108,6 @@ Summary: iText module for %{name} This package provides %{summary}. %endif -%if %{with markdown} -%package module-markdown -Summary: Markdown module for %{name} - -%description module-markdown -This package provides %{summary}. -%endif - %package module-latex Summary: Latex module for %{name} @@ -163,6 +144,12 @@ Summary: XHTML module for %{name} %description module-xhtml This package provides %{summary}. +%package module-xhtml5 +Summary: XHTML5 module for %{name} + +%description module-xhtml5 +This package provides %{summary}. + %package sink-api Summary: Sink-api module for %{name} @@ -187,13 +174,13 @@ Summary: Javadoc for %{name} %description javadoc API documentation for %{name}. - %prep %setup -q -n doxia-%{version} + +find -name '*.java' -exec sed -i 's/\r//' {} + +find -name '*.xml' -exec sed -i 's/\r//' {} + %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 # we don't have clirr-maven-plugin %pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml @@ -209,17 +196,13 @@ API documentation for %{name}. # requires network rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java -# FIXME fails -rm doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java - %mvn_package :::tests: tests +%pom_disable_module doxia-module-markdown doxia-modules + %if %{without itext} %pom_disable_module doxia-module-itext doxia-modules %endif -%if %{without markdown} -%pom_disable_module doxia-module-markdown doxia-modules -%endif %if %{without fop} %pom_disable_module doxia-module-fo doxia-modules %endif @@ -230,9 +213,7 @@ rm doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/modu %install %mvn_install - %files -f .mfiles-doxia -%dir %{_javadir}/%{name} %doc LICENSE NOTICE %files core -f .mfiles-doxia-core %files logging-api -f .mfiles-doxia-logging-api @@ -247,15 +228,13 @@ rm doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/modu %if %{with itext} %files module-itext -f .mfiles-doxia-module-itext %endif -%if %{with markdown} -%files module-markdown -f .mfiles-doxia-module-markdown -%endif %files module-latex -f .mfiles-doxia-module-latex %files module-rtf -f .mfiles-doxia-module-rtf %files modules -f .mfiles-doxia-modules %files module-twiki -f .mfiles-doxia-module-twiki %files module-xdoc -f .mfiles-doxia-module-xdoc %files module-xhtml -f .mfiles-doxia-module-xhtml +%files module-xhtml5 -f .mfiles-doxia-module-xhtml5 %files sink-api -f .mfiles-doxia-sink-api %files test-docs -f .mfiles-doxia-test-docs %files tests -f .mfiles-tests @@ -263,8 +242,11 @@ rm doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/modu %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE - %changelog +* Wed Sep 18 2019 Marian Koncek - 0:1.9-1 +- Update to upstream version 1.9 +- Obsolete markdown module + * Tue Sep 03 2019 Fabio Valentini - 0:1.7-12 - Disable itext support. diff --git a/sources b/sources index 81db8de..b54b1ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -309db839b0828aa6f32b80fd6506fbd0 doxia-1.7-source-release.zip +SHA512 (doxia-1.9-source-release.zip) = c9acda38da29c193a5319a925c1d12408f5167210eb72a8859d85c133c5fb45fd51774c35f2b6fe845b4051d653279e07e0c867021c407c7bf16ba57ef1a3565