Scmwebeditor-commits

Download

scmwebeditor-commits@list.nuiton.org

November 2012

1 participants
2 discussions

r270 - trunk/src/main/java/org/nuiton/scmwebeditor
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 21:22:39 +0100 (Sun, 11 Nov 2012) New Revision: 270 Url: http://nuiton.org/repositories/revision/scmwebeditor/270 Log: fixes #838: Updates to nuiton-utils 2.6.4 Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java 2012-11-11 20:12:55 UTC (rev 269) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java 2012-11-11 20:22:39 UTC (rev 270) @@ -24,6 +24,7 @@ */ package org.nuiton.scmwebeditor; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -162,7 +163,7 @@ SVNDiffClient diffClient = new SVNDiffClient(getManager(), getSvnOption()); - FileUtil.writeString(pathToFile, text, "UTF-8"); + FileUtils.writeStringToFile(pathToFile, text, "UTF-8"); ByteArrayOutputStream diff = new ByteArrayOutputStream(); @@ -187,7 +188,7 @@ SVNDiffClient diffClient = new SVNDiffClient(getManager(), getSvnOption()); - FileUtil.writeString(pathToFile, text, "UTF-8"); + FileUtils.writeStringToFile(pathToFile, text, "UTF-8"); ByteArrayOutputStream diff = new ByteArrayOutputStream();

1 0

r269 - trunk
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 21:12:55 +0100 (Sun, 11 Nov 2012) New Revision: 269 Url: http://nuiton.org/repositories/revision/scmwebeditor/269 Log: fixes #2397: Update to struts 2.3.4.1 fixes #2398: Update to struts2-jquery-plugin 3.4.0 fixes #2399: Update to shiro 1.2.1 fixes #2400: Update to tika 1.2 fixes #2402: Update to nuiton-i18n 2.5 fixes #2403: Update to nuiton-struts2 1.12 fixes #2404: Update to svnkit 1.7.6 refs #2401: Update to nuiton-utils 2.6.3 refs #2431: Update to jrst 2.0.1 refs #2430: Update to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 07:45:02 UTC (rev 268) +++ trunk/pom.xml 2012-11-11 20:12:55 UTC (rev 269) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.3</version> + <version>3.4.4-SNAPSHOT</version> </parent> <artifactId>scmwebeditor</artifactId> @@ -49,7 +49,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.3.5</version> + <version>1.7.6</version> </dependency> <dependency> @@ -88,13 +88,13 @@ <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>0.9</version> + <version>1.2</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>1.1.0</version> + <version>1.2.1</version> </dependency> @@ -165,32 +165,31 @@ <developers> <developer> - <name>Geoffroy Lorieux</name> - <id>glorieux</id> - <email>glorieux(a)codelutin.com</email> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit at codelutin dot com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> - <role>Developpeur</role> + <role>Developer</role> </roles> </developer> <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit(a)codelutin.com</email> + <name>Yannick Martel</name> + <id>ymartel</id> + <email>martel at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> </roles> </developer> <developer> - <name>Martel Yannick</name> - <id>ymartel</id> - <email>martel(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> + <name>Geoffroy Lorieux</name> + <id>glorieux</id> + <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> </roles> @@ -198,9 +197,7 @@ <developer> <name>Kevin Cardineaud</name> <id>kcardineaud</id> - <email>cardineaud(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> </roles> @@ -226,13 +223,12 @@  <siteLocales>fr,en</siteLocales> - <struts2Version>2.2.3</struts2Version> - <struts2jqueryVersion>3.1.0</struts2jqueryVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.2</nuitonUtilsVersion> - <nuitonWebVersion>1.3</nuitonWebVersion> - <jrstPluginVersion>1.4</jrstPluginVersion> - + <struts2Version>2.3.4.1</struts2Version> + <struts2jqueryVersion>3.4.0</struts2jqueryVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> +  <i18n.bundles>fr_FR,en_GB</i18n.bundles> @@ -246,7 +242,6 @@ target/${project.artifactId}-${project.version}.war </redmine.releaseFiles> -  </properties> @@ -276,12 +271,10 @@ </dependencies> </plugin> - <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> - </plugin> </plugins> @@ -290,11 +283,10 @@ <plugins> - <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> @@ -307,7 +299,6 @@ </plugin> - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> @@ -315,12 +306,6 @@ <webAppConfig> <contextPath>/${project.artifactId}</contextPath> </webAppConfig> - -  </configuration> </plugin>

1 0