This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See https://gitlab.nuiton.org/nuiton/jrst.git commit 1a5d981927f81095f0f83e7b4aaf8d28411831dc Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Jul 8 14:58:14 2022 +0200 #120: Update to doxia 1.11 and support JDK 17 #118: Update libs --- .../test/java/org/nuiton/jrst/JrstParserTest.java | 1 - .../src/main/java/org/nuiton/jrst/JrstParser.java | 3 +- .../test/java/org/nuiton/jrst/JrstParserTest.java | 1 - .../java/org/nuiton/jrst/AbstractJrstParser.java | 17 ++++++-- .../org/nuiton/jrst/JRSTToXmlStrategyDocutils.java | 5 +-- pom.xml | 48 +++++++++++----------- 6 files changed, 41 insertions(+), 34 deletions(-) diff --git a/doxia-module-jrst-legacy/src/test/java/org/nuiton/jrst/JrstParserTest.java b/doxia-module-jrst-legacy/src/test/java/org/nuiton/jrst/JrstParserTest.java index bf2b6e1..983a254 100644 --- a/doxia-module-jrst-legacy/src/test/java/org/nuiton/jrst/JrstParserTest.java +++ b/doxia-module-jrst-legacy/src/test/java/org/nuiton/jrst/JrstParserTest.java @@ -29,7 +29,6 @@ import org.apache.maven.doxia.AbstractModuleTest; import org.apache.maven.doxia.module.xdoc.XdocSink; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; -import org.junit.Ignore; /** * @author chatellier diff --git a/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java b/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java index 5fd8aba..00f4529 100644 --- a/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java +++ b/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java @@ -2,7 +2,7 @@ * #%L * JRst :: Doxia module * %% - * Copyright (C) 2009 - 2017 CodeLutin + * Copyright (C) 2009 - 2022 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -47,5 +47,4 @@ public class JrstParser extends AbstractJrstParser { public JRSTToXmlStrategy getStrategy() { return jrstStrategy; } - } diff --git a/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java b/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java index ac3666a..88af67e 100644 --- a/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java +++ b/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java @@ -26,7 +26,6 @@ import org.apache.maven.doxia.AbstractModuleTest; import org.apache.maven.doxia.module.xdoc.XdocSink; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; -import org.junit.Ignore; import java.io.Reader; import java.io.StringWriter; diff --git a/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java b/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java index 5eeb67a..22b8882 100644 --- a/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java +++ b/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java @@ -2,7 +2,7 @@ * #%L * JRst :: Site util * %% - * Copyright (C) 2012 - 2017 CodeLutin + * Copyright (C) 2012 - 2022 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -29,10 +29,13 @@ import java.io.StringReader; import org.apache.maven.doxia.logging.Log; import org.apache.maven.doxia.module.xdoc.XdocParser; +import org.apache.maven.doxia.parser.AbstractParser; import org.apache.maven.doxia.parser.ParseException; +import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.siterenderer.RenderingContext; import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.util.IOUtil; import org.dom4j.Document; import org.nuiton.util.FileUtil; @@ -43,7 +46,7 @@ import org.nuiton.util.FileUtil; * @author tchemit (chemit@codelutin.com) * @since 2.0.1 */ -public abstract class AbstractJrstParser extends XdocParser { +public abstract class AbstractJrstParser extends AbstractParser { public static final String JRST_PARSER_ID = "jrst"; @@ -55,6 +58,9 @@ public abstract class AbstractJrstParser extends XdocParser { protected boolean verbose; + @Requirement(role = Parser.class, hint = "xdoc") + protected XdocParser xdocParser; + @Override public void parse(Reader source, Sink sink) throws ParseException { @@ -71,7 +77,7 @@ public abstract class AbstractJrstParser extends XdocParser { // Give xsl result to XDoc parser Reader reader = new StringReader(doc.asXML()); - super.parse(reader, sink); + xdocParser.parse(reader, sink); } catch (Exception e) { throw new ParseException("Can't parse rst file", e); } finally { @@ -80,6 +86,11 @@ public abstract class AbstractJrstParser extends XdocParser { } } + @Override + public void parse(Reader source, Sink sink, String reference) throws ParseException { + parse(source, sink); + } + public void setRenderingContext(RenderingContext renderingContext) { this.renderingContext = renderingContext; } diff --git a/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyDocutils.java b/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyDocutils.java index 56d2940..514708c 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyDocutils.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyDocutils.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2017 CodeLutin + * Copyright (C) 2004 - 2022 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.component.annotations.Component; import org.dom4j.Document; import org.dom4j.DocumentException; -import org.dom4j.DocumentHelper; import org.dom4j.io.SAXReader; import org.nuiton.jrst.legacy.JRSTReader; import org.python.util.PythonInterpreter; @@ -110,7 +109,7 @@ public class JRSTToXmlStrategyDocutils implements JRSTToXmlStrategy { interp.cleanup(); // Transforms the output stream to a document - String xmlString = new String(out.toByteArray(), encoding); + String xmlString = out.toString(encoding); Document doc = null; try { diff --git a/pom.xml b/pom.xml index 472f22e..188ff76 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L JRst %% - Copyright (C) 2004 - 2018 CodeLutin + Copyright (C) 2004 - 2022 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>11.8</version> + <version>11.12</version> </parent> <artifactId>jrst</artifactId> @@ -110,9 +110,9 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <nuitonI18nVersion>4.0-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>4.1</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> - <jaxxVersion>2.45</jaxxVersion> + <jaxxVersion>2.46</jaxxVersion> <!-- tests fail with 3.3.x --> <mavenVersion>3.2.5</mavenVersion> @@ -128,14 +128,14 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.1-rc-3-SNAPSHOT</version> + <version>3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.5</version> <scope>compile</scope> </dependency> @@ -230,13 +230,13 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.3.0</version> + <version>3.4.2</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-annotations</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </dependency> <dependency> @@ -326,41 +326,41 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-xdoc</artifactId> - <version>1.9.1</version> + <version>1.11.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> - <version>1.9.1</version> + <version>1.11.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-sink-api</artifactId> - <version>1.9.1</version> + <version>1.11.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-logging-api</artifactId> - <version>1.9.1</version> + <version>1.11.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-decoration-model</artifactId> - <version>1.9.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> <scope>provided</scope> </dependency> @@ -402,14 +402,14 @@ <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> <type>test-jar</type> - <version>1.9.1</version> + <version>1.11.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-site-renderer</artifactId> - <version>1.9.2</version> + <version>1.11.1</version> </dependency> <dependency> @@ -421,7 +421,7 @@ <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> <scope>provided</scope> </dependency> @@ -435,12 +435,12 @@ <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-pdf</artifactId> - <version>9.1.20</version> + <version>9.1.22</version> </dependency> <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-core</artifactId> - <version>9.1.20</version> + <version>9.1.22</version> </dependency> <dependency> @@ -473,14 +473,14 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.13</version> + <version>4.13.2</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>29.0-jre</version> + <version>31.1-jre</version> </dependency> <dependency> @@ -492,7 +492,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.7</version> + <version>2.11.0</version> </dependency> <dependency> @@ -510,7 +510,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.10</version> + <version>3.12.0</version> </dependency> <dependency> @@ -541,7 +541,7 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> - <version>1.5.5</version> + <version>2.1.1</version> </plugin> </plugins> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.