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 e577d3087bd53a1ad11f5fe0bfc4741200f2195c Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Feb 12 17:13:38 2017 +0100 fixes #3529: Fix tests broken since doxia 1.6 update --- doxia-module-jrst-legacy/pom.xml | 8 +++++++- .../src/main/java/org/nuiton/jrst/JrstParser.java | 4 ++-- .../src/test/java/org/nuiton/jrst/JrstParserTest.java | 7 ++----- doxia-module-jrst/pom.xml | 8 +++++++- doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java | 4 ++-- .../src/test/java/org/nuiton/jrst/JrstParserTest.java | 7 ++----- jrst-site-util/pom.xml | 3 +-- .../src/main/java/org/nuiton/jrst/AbstractJrstParser.java | 7 +++---- pom.xml | 3 ++- 9 files changed, 28 insertions(+), 23 deletions(-) diff --git a/doxia-module-jrst-legacy/pom.xml b/doxia-module-jrst-legacy/pom.xml index 56c768e..1e8d8a3 100644 --- a/doxia-module-jrst-legacy/pom.xml +++ b/doxia-module-jrst-legacy/pom.xml @@ -3,7 +3,7 @@ #%L JRst :: Doxia module %% - Copyright (C) 2009 - 2012 CodeLutin, Chemit tony + Copyright (C) 2009 - 2017 CodeLutin, Chemit tony %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -114,6 +114,12 @@ </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <scope>runtime</scope> diff --git a/doxia-module-jrst-legacy/src/main/java/org/nuiton/jrst/JrstParser.java b/doxia-module-jrst-legacy/src/main/java/org/nuiton/jrst/JrstParser.java index 03ea800..e4cef1d 100644 --- a/doxia-module-jrst-legacy/src/main/java/org/nuiton/jrst/JrstParser.java +++ b/doxia-module-jrst-legacy/src/main/java/org/nuiton/jrst/JrstParser.java @@ -2,7 +2,7 @@ * #%L * JRst :: Doxia module legacy * %% - * Copyright (C) 2009 - 2010 CodeLutin + * Copyright (C) 2009 - 2017 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 @@ -40,7 +40,7 @@ import org.codehaus.plexus.component.annotations.Requirement; " the specified doxia Sink.") public class JrstParser extends AbstractJrstParser { - @Requirement(optional = false, hint = "legacy") + @Requirement(hint = "legacy") protected JRSTToXmlStrategy jrstStrategy; @Override 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 4f17643..bf2b6e1 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 @@ -2,7 +2,7 @@ * #%L * JRst :: Doxia module legacy * %% - * Copyright (C) 2009 - 2010 CodeLutin + * Copyright (C) 2009 - 2017 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 @@ -34,10 +34,7 @@ import org.junit.Ignore; /** * @author chatellier * @version $Revision : 1$ - * - * Test ignored due to bug : http://jira.codehaus.org/browse/MPLUGINTESTING-25 */ -@Ignore public class JrstParserTest extends AbstractModuleTest { protected JrstParser parser; @@ -46,7 +43,7 @@ public class JrstParserTest extends AbstractModuleTest { protected void setUp() throws Exception { super.setUp(); - parser = (JrstParser) lookup(Parser.ROLE, "jrst"); + parser = lookup(Parser.ROLE, "jrst"); } public void testParse() throws Exception { diff --git a/doxia-module-jrst/pom.xml b/doxia-module-jrst/pom.xml index 1b40e6a..3f4ac38 100644 --- a/doxia-module-jrst/pom.xml +++ b/doxia-module-jrst/pom.xml @@ -3,7 +3,7 @@ #%L JRst :: Doxia module %% - Copyright (C) 2012 CodeLutin, Chemit tony + Copyright (C) 2012 - 2017 CodeLutin, Chemit tony %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -94,6 +94,12 @@ </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <scope>runtime</scope> 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 68ff6cf..5fd8aba 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 - 2010 CodeLutin + * Copyright (C) 2009 - 2017 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 @@ -40,7 +40,7 @@ import org.codehaus.plexus.component.annotations.Requirement; "into the specified doxia Sink.") public class JrstParser extends AbstractJrstParser { - @Requirement(optional = false, hint = "docutils") + @Requirement(hint = "docutils") protected JRSTToXmlStrategy jrstStrategy; @Override 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 a1eb5f8..ac3666a 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 @@ -2,7 +2,7 @@ * #%L * JRst :: Doxia module * %% - * Copyright (C) 2009 - 2010 CodeLutin + * Copyright (C) 2009 - 2017 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 @@ -34,10 +34,7 @@ import java.io.StringWriter; /** * @author chatellier * @version $Revision : 1$ - * - * Test ignored due to bug : http://jira.codehaus.org/browse/MPLUGINTESTING-25 */ -@Ignore public class JrstParserTest extends AbstractModuleTest { protected JrstParser parser; @@ -46,7 +43,7 @@ public class JrstParserTest extends AbstractModuleTest { protected void setUp() throws Exception { super.setUp(); - parser = (JrstParser) lookup(Parser.ROLE, "jrst"); + parser = lookup(Parser.ROLE, "jrst"); } public void testParse() throws Exception { diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index 40afcef..0a82c15 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -3,7 +3,7 @@ #%L JRst :: Site util %% - Copyright (C) 2012 - 2016 CodeLutin, Chemit tony + Copyright (C) 2012 - 2017 CodeLutin, Chemit tony %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -143,7 +143,6 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <!--<scope>runtime</scope>--> </dependency> <dependency> 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 fa68a7e..5eeb67a 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 - 2015 CodeLutin + * Copyright (C) 2012 - 2017 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 @@ -100,12 +100,11 @@ public abstract class AbstractJrstParser extends XdocParser { sourceFile = File.createTempFile("source", "rst"); } else { - File temporayDirectory = new File( + File tempDirectory = new File( mavenProject.getBasedir(), "target" + File.separator + "generated-jrst"); - sourceFile = new File(temporayDirectory, - renderingContext.getInputName()); + sourceFile = new File(tempDirectory, renderingContext.getInputName()); FileUtil.createDirectoryIfNecessary(sourceFile.getParentFile()); } diff --git a/pom.xml b/pom.xml index 1f91507..10130c3 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,8 @@ <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> <jaxxVersion>2.40</jaxxVersion> - <mavenVersion>3.3.9</mavenVersion> + <!-- tests fail with 3.3.x --> + <mavenVersion>3.2.5</mavenVersion> <!-- site configuration --> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.