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

r21 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 15:23:22 +0200 (Sat, 10 Oct 2009) New Revision: 21 Modified: trunk/pom.xml Log: Anomalie #85: le client rest doit avoir un encoding (regle en version 1.1.0 de maven-helper-plugin) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 13:22:38 UTC (rev 20) +++ trunk/pom.xml 2009-10-10 13:23:22 UTC (rev 21) @@ -229,7 +229,7 @@ <maven.javadoc.skip>false</maven.javadoc.skip> <maven.version>2.2.1</maven.version> - <helper.version>1.0.3</helper.version> + <helper.version>1.1.0-SNAPSHOT</helper.version>  <license.licenseName>lgpl_v3</license.licenseName>

1 0

r20 - in trunk/maven-jredmine-plugin/src/it: multi single
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 15:22:38 +0200 (Sat, 10 Oct 2009) New Revision: 20 Modified: trunk/maven-jredmine-plugin/src/it/multi/pom.xml trunk/maven-jredmine-plugin/src/it/single/pom.xml Log: test description avec des accents Modified: trunk/maven-jredmine-plugin/src/it/multi/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/multi/pom.xml 2009-10-10 12:37:51 UTC (rev 19) +++ trunk/maven-jredmine-plugin/src/it/multi/pom.xml 2009-10-10 13:22:38 UTC (rev 20) @@ -129,6 +129,7 @@  <closeVersion>true</closeVersion> + <versionDescription>éàçè`a</versionDescription>  <filesFromProperties>${collectedFiles}</filesFromProperties> Modified: trunk/maven-jredmine-plugin/src/it/single/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/single/pom.xml 2009-10-10 12:37:51 UTC (rev 19) +++ trunk/maven-jredmine-plugin/src/it/single/pom.xml 2009-10-10 13:22:38 UTC (rev 20) @@ -105,19 +105,6 @@ <urlDownload>http://www.mynuiton.org/projects/list_files/one</urlDownload> </configuration> </execution> - <execution> <id>publish-redmine</id> @@ -131,10 +118,11 @@ <configuration>  - <dryRun>true</dryRun> +   <closeVersion>true</closeVersion> + <versionDescription>éàçè`a</versionDescription>  <filesFromProperties>${collectedFiles}</filesFromProperties>

1 0

r19 - tags/jredmine-1.0.0-rc-2/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 14:37:51 +0200 (Sat, 10 Oct 2009) New Revision: 19 Modified: tags/jredmine-1.0.0-rc-2/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java Log: fix encoding pb, must be fix before 1.0.0 Modified: tags/jredmine-1.0.0-rc-2/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java =================================================================== --- tags/jredmine-1.0.0-rc-2/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2009-10-10 10:30:30 UTC (rev 18) +++ tags/jredmine-1.0.0-rc-2/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2009-10-10 12:37:51 UTC (rev 19) @@ -179,6 +179,9 @@ this.releaseVersion = v; + // fix encoding bug, must be fix in RedmineService + releaseVersion.setDescription(null); + // prepare version if (needCreateVersion) { @@ -192,8 +195,7 @@ } else { // update version - getLog().info("udpate version " + releaseVersion.getName()); - + getLog().info("udpate version " + releaseVersion.getName()); if (!dryRun) { service.updateVersion(projectId, releaseVersion); }

1 0

r18 - tags/jredmine-1.0.0-rc-2
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 12:30:30 +0200 (Sat, 10 Oct 2009) New Revision: 18 Modified: tags/jredmine-1.0.0-rc-2/pom.xml Log: fix site url Modified: tags/jredmine-1.0.0-rc-2/pom.xml =================================================================== --- tags/jredmine-1.0.0-rc-2/pom.xml 2009-10-10 10:29:17 UTC (rev 17) +++ tags/jredmine-1.0.0-rc-2/pom.xml 2009-10-10 10:30:30 UTC (rev 18) @@ -144,7 +144,7 @@ <inceptionYear>2009</inceptionYear> - <url>http://maven-site.nuiton.org/sandbox/jredmine</url> + <url>http://maven-site.nuiton.org/jredmine</url> <licenses> <license>

1 0

r17 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 12:29:17 +0200 (Sat, 10 Oct 2009) New Revision: 17 Modified: trunk/pom.xml Log: fix site url Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 10:09:15 UTC (rev 16) +++ trunk/pom.xml 2009-10-10 10:29:17 UTC (rev 17) @@ -144,7 +144,7 @@ <inceptionYear>2009</inceptionYear> - <url>http://maven-site.nuiton.org/sandbox/jredmine</url> + <url>http://maven-site.nuiton.org/jredmine</url> <licenses> <license>

1 0

r16 - in trunk: . jredmine-client maven-jredmine-plugin
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 12:09:15 +0200 (Sat, 10 Oct 2009) New Revision: 16 Modified: trunk/jredmine-client/pom.xml trunk/maven-jredmine-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2009-10-10 10:09:09 UTC (rev 15) +++ trunk/jredmine-client/pom.xml 2009-10-10 10:09:15 UTC (rev 16) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.0-rc-2</version> + <version>1.0.0-rc-3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2009-10-10 10:09:09 UTC (rev 15) +++ trunk/maven-jredmine-plugin/pom.xml 2009-10-10 10:09:15 UTC (rev 16) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.0-rc-2</version> + <version>1.0.0-rc-3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 10:09:09 UTC (rev 15) +++ trunk/pom.xml 2009-10-10 10:09:15 UTC (rev 16) @@ -9,7 +9,7 @@ <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.0-rc-2</version> + <version>1.0.0-rc-3-SNAPSHOT</version> <modules> <module>jredmine-client</module> @@ -909,9 +909,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.0.0-rc-2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.0.0-rc-2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.0.0-rc-2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> </scm> <profiles>

1 0

r15 - tags
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 12:09:09 +0200 (Sat, 10 Oct 2009) New Revision: 15 Added: tags/jredmine-1.0.0-rc-2/ Log: [maven-scm] copy for tag jredmine-1.0.0-rc-2

1 0

r14 - in trunk: . jredmine-client maven-jredmine-plugin
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 12:08:56 +0200 (Sat, 10 Oct 2009) New Revision: 14 Modified: trunk/jredmine-client/pom.xml trunk/maven-jredmine-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release jredmine-1.0.0-rc-2 Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2009-10-10 10:00:15 UTC (rev 13) +++ trunk/jredmine-client/pom.xml 2009-10-10 10:08:56 UTC (rev 14) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.0-rc-2-SNAPSHOT</version> + <version>1.0.0-rc-2</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2009-10-10 10:00:15 UTC (rev 13) +++ trunk/maven-jredmine-plugin/pom.xml 2009-10-10 10:08:56 UTC (rev 14) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.0-rc-2-SNAPSHOT</version> + <version>1.0.0-rc-2</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 10:00:15 UTC (rev 13) +++ trunk/pom.xml 2009-10-10 10:08:56 UTC (rev 14) @@ -9,7 +9,7 @@ <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.0.0-rc-2-SNAPSHOT</version> + <version>1.0.0-rc-2</version> <modules> <module>jredmine-client</module> @@ -909,9 +909,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.0.0-rc-2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.0.0-rc-2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.0.0-rc-2</url> </scm> <profiles>

1 0

r13 - in trunk: . maven-jredmine-plugin/src/it/multi maven-jredmine-plugin/src/it/single
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 12:00:15 +0200 (Sat, 10 Oct 2009) New Revision: 13 Modified: trunk/maven-jredmine-plugin/src/it/multi/pom.xml trunk/maven-jredmine-plugin/src/it/multi/verify.groovy trunk/maven-jredmine-plugin/src/it/single/pom.xml trunk/maven-jredmine-plugin/src/it/single/verify.groovy trunk/pom.xml Log: - fix integration tests - use javadoc 2.5 (2.6 has a lot of strange behaviours or is not well used...) Modified: trunk/maven-jredmine-plugin/src/it/multi/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/multi/pom.xml 2009-10-10 09:46:45 UTC (rev 12) +++ trunk/maven-jredmine-plugin/src/it/multi/pom.xml 2009-10-10 10:00:15 UTC (rev 13) @@ -32,7 +32,7 @@  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.changeFile>target/changes/changes.xml</maven.changeFile> + <maven.changeFile>target/generated-sources/changes/changes.xml</maven.changeFile> <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE%</maven.redmine.issue.url> <redmine.serverId>redmine-local</redmine.serverId> <redmine.projectId>one</redmine.projectId> @@ -54,6 +54,12 @@ <artifactId>maven-jredmine-plugin</artifactId> <version>${pluginVersion}</version> </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.0.3</version> + </plugin> </plugins> </pluginManagement> @@ -61,6 +67,27 @@ <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> +  + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <extraFiles>${releaseFiles}</extraFiles> + <descriptionFile>${collectedFiles}</descriptionFile> +  + </configuration> + </execution> + + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> <executions> @@ -98,7 +125,7 @@ <configuration>  - <dryRun>true</dryRun> +   <closeVersion>true</closeVersion> @@ -107,7 +134,7 @@ <filesFromProperties>${collectedFiles}</filesFromProperties>  - <newsContentFile>target/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle> Modified: trunk/maven-jredmine-plugin/src/it/multi/verify.groovy =================================================================== --- trunk/maven-jredmine-plugin/src/it/multi/verify.groovy 2009-10-10 09:46:45 UTC (rev 12) +++ trunk/maven-jredmine-plugin/src/it/multi/verify.groovy 2009-10-10 10:00:15 UTC (rev 13) @@ -17,17 +17,17 @@ * specific language governing permissions and limitations * under the License. */ -assert new File(basedir, 'target/changes/changes.xml').exists(); -assert new File(basedir, 'target/announcement/release-news-announcement.vm').exists(); -assert new File(basedir, 'target/announcement/release-email-announcement.vm').exists(); +assert new File(basedir, 'target/generated-sources/changes/changes.xml').exists(); +assert new File(basedir, 'target/generated-sources/announcement/release-news-announcement.vm').exists(); +assert new File(basedir, 'target/generated-sources/announcement/release-email-announcement.vm').exists(); assert new File(basedir, 'target/collect.properties').exists(); -assert !new File(basedir, 'module1/target/announcement/release-news-announcement.vm').exists(); -assert !new File(basedir, 'module1/target/announcement/release-email-announcement.vm').exists(); +assert !new File(basedir, 'module1/target/generated-sources/announcement/release-news-announcement.vm').exists(); +assert !new File(basedir, 'module1/target/generated-sources/announcement/release-email-announcement.vm').exists(); assert !new File(basedir, 'module1/target/collect.properties').exists(); -assert !new File(basedir, 'module2/target/announcement/release-news-announcement.vm').exists(); -assert !new File(basedir, 'module2/target/announcement/release-email-announcement.vm').exists(); +assert !new File(basedir, 'module2/target/generated-sources/announcement/release-news-announcement.vm').exists(); +assert !new File(basedir, 'module2/target/generated-sources/announcement/release-email-announcement.vm').exists(); assert !new File(basedir, 'module2/target/collect.properties').exists(); assert new File(basedir, 'target/collect/org.nuiton.jredmine.test.multi--pom/pom.xml').exists(); @@ -37,7 +37,7 @@ assert new File(basedir, 'target/collect/org.nuiton.jredmine.test.multi--module2/module2-0.jar').exists(); assert new File(basedir, 'target/collect/org.nuiton.jredmine.test.multi--module2/module2.txt').exists(); -//content = new File(basedir, 'target/announcement/announcement.vm').text; +//content = new File(basedir, 'target/generated-sources/announcement/announcement.vm').text; //assert content.contains( 'Test report.' ); Modified: trunk/maven-jredmine-plugin/src/it/single/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/single/pom.xml 2009-10-10 09:46:45 UTC (rev 12) +++ trunk/maven-jredmine-plugin/src/it/single/pom.xml 2009-10-10 10:00:15 UTC (rev 13) @@ -26,7 +26,7 @@  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.changeFile>target/changes/changes.xml</maven.changeFile> + <maven.changeFile>target/generated-sources/changes/changes.xml</maven.changeFile> <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE%</maven.redmine.issue.url> <redmine.serverId>redmine-local</redmine.serverId> <redmine.projectId>one</redmine.projectId> @@ -48,12 +48,39 @@ <artifactId>maven-jredmine-plugin</artifactId> <version>${pluginVersion}</version> </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.0.3</version> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> +  + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <extraFiles>${releaseFiles}</extraFiles> + <descriptionFile>${collectedFiles}</descriptionFile> +  + </configuration> + </execution> + + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> <executions> @@ -113,7 +140,7 @@ <filesFromProperties>${collectedFiles}</filesFromProperties>  - <newsContentFile>target/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle>  <maven.reports.dependencyLocationsEnabled>true</maven.reports.dependencyLocationsEnabled> - <javadoc.version>2.6</javadoc.version> + <javadoc.version>2.5</javadoc.version>  <maven.javadoc.skip>false</maven.javadoc.skip>

1 0

r12 - trunk/jredmine-client/src/main/redmine/jredmine/app/controllers
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 11:46:45 +0200 (Sat, 10 Oct 2009) New Revision: 12 Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb Log: fix rails bug (old code used) Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-10 09:02:45 UTC (rev 11) +++ trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-10 09:46:45 UTC (rev 12) @@ -283,7 +283,7 @@ :description => attachment['description'].to_s.strip, :author => User.current) end - if !attached.empty? && Setting.notified_events.include?('file_added') + if a.save && Setting.notified_events.include?('file_added') array =[] array << a Mailer.deliver_attachments_added(array)

1 0