- Jredmine-commits - mailman.cloud.codelutin.com

r203 - in trunk: . jredmine-client maven-jredmine-plugin
by tchemit＠users.nuiton.org 27 May '11

27 May '11

Author: tchemit Date: 2011-05-27 07:45:15 +0200 (Fri, 27 May 2011) New Revision: 203 Url: http://nuiton.org/repositories/revision/jredmine/203 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jredmine-client/pom.xml trunk/maven-jredmine-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2011-05-27 05:45:13 UTC (rev 202) +++ trunk/jredmine-client/pom.xml 2011-05-27 05:45:15 UTC (rev 203) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-05-27 05:45:13 UTC (rev 202) +++ trunk/maven-jredmine-plugin/pom.xml 2011-05-27 05:45:15 UTC (rev 203) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 05:45:13 UTC (rev 202) +++ trunk/pom.xml 2011-05-27 05:45:15 UTC (rev 203) @@ -38,7 +38,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> <modules> <module>jredmine-client</module> @@ -47,11 +47,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.2 + scm:svn:http://svn.nuiton.org/svn/jredmine/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.2</url> + <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> </scm> <dependencyManagement>

1 0

r202 - tags
by tchemit＠users.nuiton.org 27 May '11

27 May '11

Author: tchemit Date: 2011-05-27 07:45:13 +0200 (Fri, 27 May 2011) New Revision: 202 Url: http://nuiton.org/repositories/revision/jredmine/202 Log: [maven-release-plugin] copy for tag jredmine-1.2 Added: tags/jredmine-1.2/

1 0

r201 - in trunk: . jredmine-client maven-jredmine-plugin
by tchemit＠users.nuiton.org 27 May '11

27 May '11

Author: tchemit Date: 2011-05-27 07:45:11 +0200 (Fri, 27 May 2011) New Revision: 201 Url: http://nuiton.org/repositories/revision/jredmine/201 Log: [maven-release-plugin] prepare release jredmine-1.2 Modified: trunk/jredmine-client/pom.xml trunk/maven-jredmine-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2011-05-27 05:42:49 UTC (rev 200) +++ trunk/jredmine-client/pom.xml 2011-05-27 05:45:11 UTC (rev 201) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-05-27 05:42:49 UTC (rev 200) +++ trunk/maven-jredmine-plugin/pom.xml 2011-05-27 05:45:11 UTC (rev 201) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -36,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 05:42:49 UTC (rev 200) +++ trunk/pom.xml 2011-05-27 05:45:11 UTC (rev 201) @@ -38,7 +38,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <modules> <module>jredmine-client</module> @@ -47,11 +47,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/trunk + scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.2</url> </scm> <dependencyManagement>

1 0

r200 - trunk
by tchemit＠users.nuiton.org 27 May '11

27 May '11

Author: tchemit Date: 2011-05-27 07:42:49 +0200 (Fri, 27 May 2011) New Revision: 200 Url: http://nuiton.org/repositories/revision/jredmine/200 Log: twist pom to perform release of version 1.2 without redmine invocation (in first place...) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 05:42:17 UTC (rev 199) +++ trunk/pom.xml 2011-05-27 05:42:49 UTC (rev 200) @@ -48,7 +48,8 @@  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/jredmine/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> </scm> @@ -524,6 +525,10 @@ <test.verbose>false</test.verbose> <test.encoding>UTF-8</test.encoding> +  + <arguments>-Plicense-profile,release-profile,Pcentral-safe,Preporting,Prelease-sign-artifacts,analyze-dependencies</arguments> + </properties> <build>

1 0

r199 - trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 27 May '11

27 May '11

Author: tchemit Date: 2011-05-27 07:42:17 +0200 (Fri, 27 May 2011) New Revision: 199 Url: http://nuiton.org/repositories/revision/jredmine/199 Log: Anomalie #1555: Skipping generate-changes does not works Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2011-05-27 05:38:49 UTC (rev 198) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2011-05-27 05:42:17 UTC (rev 199) @@ -260,6 +260,12 @@ return; } } + + if (isGoalSkip()) { + getLog().warn("The goal is skip due to the skipGoal flag on"); + return; + } + super.init(); if (!safe && !initOk) { // we are in none safe mode but init is not ok...

1 0

r198 - trunk/src/site/apt
by tchemit＠users.nuiton.org 27 May '11

27 May '11

Author: tchemit Date: 2011-05-27 07:38:49 +0200 (Fri, 27 May 2011) New Revision: 198 Url: http://nuiton.org/repositories/revision/jredmine/198 Log: update doc Modified: trunk/src/site/apt/index.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2011-05-22 14:33:34 UTC (rev 197) +++ trunk/src/site/apt/index.apt 2011-05-27 05:38:49 UTC (rev 198) @@ -52,4 +52,13 @@ [] +Notes + +* Version 1.2 + + Avant la version <<1.2>>, on ne pouvait pas communiquer avec un <<redmine>> + <<1.1>>, désormais cela est possible. Cependant, la rétro-compatibilité n'a + pas été testée pour le moment, il est donc possible que cela ne fonctionne + pas :( + Pour plus d'informations, voir la documentation des deux modules.

1 0

r197 - trunk
by tchemit＠users.nuiton.org 22 May '11

22 May '11

Author: tchemit Date: 2011-05-22 16:33:34 +0200 (Sun, 22 May 2011) New Revision: 197 Url: http://nuiton.org/repositories/revision/jredmine/197 Log: remove release plugin definition (this is done in mavenpom) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-21 00:03:50 UTC (rev 196) +++ trunk/pom.xml 2011-05-22 14:33:34 UTC (rev 197) @@ -545,12 +545,6 @@ </configuration> </plugin> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.1</version> - </plugin> - - </plugins> </pluginManagement>

1 0

r196 - in trunk: . maven-jredmine-plugin maven-jredmine-plugin/src/license
by tchemit＠users.nuiton.org 21 May '11

21 May '11

Author: tchemit Date: 2011-05-21 02:03:50 +0200 (Sat, 21 May 2011) New Revision: 196 Url: http://nuiton.org/repositories/revision/jredmine/196 Log: final optimize of dependencies Modified: trunk/maven-jredmine-plugin/pom.xml trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-05-20 22:56:38 UTC (rev 195) +++ trunk/maven-jredmine-plugin/pom.xml 2011-05-21 00:03:50 UTC (rev 196) @@ -75,6 +75,11 @@ </dependency> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + </dependency> + + <dependency> <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> </dependency> @@ -141,13 +146,14 @@ <artifactId>plexus-velocity</artifactId> </dependency> +  + <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-i18n</artifactId> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <scope>provided</scope> </dependency> -  - <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-site-renderer</artifactId> @@ -163,11 +169,6 @@ <artifactId>doxia-sink-api</artifactId> </dependency> -  -  <dependency> Modified: trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-20 22:56:38 UTC (rev 195) +++ trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-21 00:03:50 UTC (rev 196) @@ -13,13 +13,11 @@ # Please fill the missing licenses for dependencies : # # -#Sat May 21 00:54:09 CEST 2011 +#Sat May 21 01:46:54 CEST 2011 classworlds--classworlds--1.1--jar=http\://classworlds.codehaus.org/license… commons-digester--commons-digester--1.6--jar=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-classworlds--1.2-alpha-7--jar=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-component-api--1.0-alpha-20--jar=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-i18n--1.0-beta-10--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-i18n--1.0-beta-7--jar=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 org.sonatype.plexus--plexus-build-api--0.0.4--jar=The Apache Software License, Version 2.0 oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-20 22:56:38 UTC (rev 195) +++ trunk/pom.xml 2011-05-21 00:03:50 UTC (rev 196) @@ -169,16 +169,16 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> - <version>1.0-beta-10</version> + <version>1.0-beta-7</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.7</version> - </dependency> - - <dependency> <groupId>velocity</groupId> <artifactId>velocity</artifactId> <version>1.5</version> @@ -346,23 +346,11 @@ </dependency> <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-xhtml</artifactId> - <version>${doxiaVersion}</version> - </dependency> - - <dependency> <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> <version>1.4</version> </dependency> -  -  -  -  -  - <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> @@ -385,6 +373,10 @@ <artifactId>plexus-container-default</artifactId> </exclusion> <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + </exclusion> + <exclusion> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </exclusion>

1 0

r195 - trunk
by tchemit＠users.nuiton.org 20 May '11

20 May '11

Author: tchemit Date: 2011-05-21 00:56:38 +0200 (Sat, 21 May 2011) New Revision: 195 Url: http://nuiton.org/repositories/revision/jredmine/195 Log: update some dependencies (doxia, m-changes-p, plexus components) + optimize them Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-20 22:55:40 UTC (rev 194) +++ trunk/pom.xml 2011-05-20 22:56:38 UTC (rev 195) @@ -137,6 +137,11 @@ <artifactId>plexus-sec-dispatcher</artifactId> </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> </dependency> @@ -153,18 +158,24 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> <version>1.1.8</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> - <version>1.0-beta-7</version> + <version>1.0-beta-10</version> </dependency> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.5</version> + <version>1.7</version> </dependency> <dependency> @@ -222,6 +233,12 @@ </dependency> <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + <version>2.0.5</version> + </dependency> + + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>${mavenVersion}</version> @@ -290,8 +307,30 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxiaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-site-renderer</artifactId> <version>${doxiaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -327,20 +366,24 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> <exclusions> <exclusion> - <groupId>plexus</groupId> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-mail-sender-simple</artifactId> </exclusion> <exclusion> - <groupId>plexus</groupId> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-mail-sender-api</artifactId> </exclusion> <exclusion> - <groupId>plexus</groupId> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-mail-sender-javamail</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> <exclusion> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> @@ -477,7 +520,7 @@  <jredminePluginVersion>1.1.4</jredminePluginVersion> - <doxiaVersion>1.0</doxiaVersion> + <doxiaVersion>1.2</doxiaVersion>  <siteSourcesType>apt</siteSourcesType>

1 0

r194 - in trunk/maven-jredmine-plugin: . src/license src/main/java/org/nuiton/jredmine/plugin src/main/java/org/nuiton/jredmine/plugin/report
by tchemit＠users.nuiton.org 20 May '11

20 May '11

Author: tchemit Date: 2011-05-21 00:55:40 +0200 (Sat, 21 May 2011) New Revision: 194 Url: http://nuiton.org/repositories/revision/jredmine/194 Log: - optimize dependencies - improve code Modified: trunk/maven-jredmine-plugin/pom.xml trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/pom.xml 2011-05-20 22:55:40 UTC (rev 194) @@ -116,6 +116,11 @@ </dependency> <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + </dependency> + + <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> </dependency> @@ -158,10 +163,10 @@ <artifactId>doxia-sink-api</artifactId> </dependency> - <dependency> +   @@ -237,7 +242,7 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> + <version>${pluginPluginVersion}</version> </plugin> </plugins> Modified: trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-20 22:55:40 UTC (rev 194) @@ -1,23 +1,25 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License # - Apache Public License 2.0 +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 +# - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:57:33 CEST 2010 -classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html -commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0 -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 -commons-digester--commons-digester--1.6=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-i18n--1.0-beta-7=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-velocity--1.1.7=The Apache Software License, Version 2.0 -org.sonatype.plexus--plexus-build-api--0.0.4=The Apache Software License, Version 2.0 -oro--oro--2.0.8=The Apache Software License, Version 2.0 +#Sat May 21 00:54:09 CEST 2011 +classworlds--classworlds--1.1--jar=http\://classworlds.codehaus.org/license.html +commons-digester--commons-digester--1.6--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-classworlds--1.2-alpha-7--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-component-api--1.0-alpha-20--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-i18n--1.0-beta-10--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 +org.sonatype.plexus--plexus-build-api--0.0.4--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2011-05-20 22:55:40 UTC (rev 194) @@ -78,7 +78,7 @@ protected boolean sortById; /** - * Flag to know if anonymùous connexion to redmine server is required. + * Flag to know if anonymous connexion to redmine server is required. * <p/> * For this goal, the default value is {@code true} * <p/> Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2011-05-20 22:55:40 UTC (rev 194) @@ -32,7 +32,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.site.decoration.Body; import org.apache.maven.doxia.site.decoration.DecorationModel; @@ -44,10 +43,9 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; +import org.apache.maven.reporting.sink.SinkFactory; import org.codehaus.plexus.i18n.I18N; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.plugin.AbstractRedmineMojo; -import org.nuiton.plugin.Plugin; import java.io.File; import java.io.FileWriter; @@ -65,7 +63,7 @@ * @requiresReports true * @since 1.0.0 */ -public abstract class AbstractRedmineReport extends AbstractRedmineMojo implements MavenReport, Plugin, RestClientConfiguration { +public abstract class AbstractRedmineReport extends AbstractRedmineMojo implements MavenReport { /** * Flag to know if anonymùous connexion to redmine server is required. @@ -184,17 +182,24 @@ SiteRenderingContext siteContext = siteRenderer.createContextForSkin(getSkinArtifactFile(), attributes, model, getName(currentLocale), currentLocale); - RenderingContext context = new RenderingContext(outputDirectory, getOutputName() + ".html"); + createDirectoryIfNecessary(outputDirectory); - SiteRendererSink newSink = new SiteRendererSink(context); - generate(newSink, currentLocale); + String filename = getOutputName() + ".html"; + File file = new File(outputDirectory, filename); - createDirectoryIfNecessary(outputDirectory); + SiteRendererSink sink = SinkFactory.createSink(outputDirectory, filename); - Writer writer = new FileWriter(new File(outputDirectory, getOutputName() + ".html")); + generate(sink, currentLocale); - siteRenderer.generateDocument(writer, newSink, siteContext); + Writer writer = new FileWriter(file); + try { + siteRenderer.generateDocument(writer, sink, siteContext); + } finally { + + writer.close(); + } + siteRenderer.copyResources(siteContext, new File(project.getBasedir(), "src/site/resources"), outputDirectory);

1 0