Author: tchemit Date: 2010-01-25 00:48:23 +0100 (Mon, 25 Jan 2010) New Revision: 73 Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java Log: utilidation de mavenpom4redmine-2.0.3 + clean pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 17:35:00 UTC (rev 72) +++ trunk/pom.xml 2010-01-24 23:48:23 UTC (rev 73) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </parent> <artifactId>scmwebeditor</artifactId> @@ -27,7 +27,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency> @@ -73,6 +73,7 @@ </dependencies> <repositories> + <!-- TODO remove this repo soon --> <repository> <id>codelutin-repository</id> <name>CodeLutinRepository</name> @@ -86,7 +87,7 @@ <checksumPolicy>warn</checksumPolicy> </releases> </repository> - <repository> + <!--repository> <id>nuiton.release</id> <name>NuitonReleaseRepository</name> <url>http://maven.nuiton.org/release</url> @@ -98,18 +99,18 @@ <checksumPolicy>warn</checksumPolicy> </releases> </repository> - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository--> </repositories> <!-- ************************************************************* --> @@ -121,14 +122,6 @@ <inceptionYear>2009</inceptionYear> <url>http://maven-site.nuiton.org/${project.artifactId}</url> - <licenses> - <license> - <name>Lesser General Public License (LGPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> - <developers> <developer> <name>Geoffroy Lorieux</name> @@ -141,6 +134,16 @@ <role>Developpeur</role> </roles> </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> </developers> <organization> @@ -156,22 +159,17 @@ <packaging>war</packaging> <properties> - <!-- redmine configuration --> - <platform>nuiton.org</platform> <projectId>${project.artifactId}</projectId> <!--Multilanguage maven-site --> - <maven.site.locales>fr,en</maven.site.locales> - <defaultLocale>fr</defaultLocale> + <siteLocales>fr,en</siteLocales> - <!-- format des fichier source du site du projet --> - <sourcesType>rst</sourcesType> + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - <skin.version>1.0.2-SNAPSHOT</skin.version> </properties> <build> - <defaultGoal>install</defaultGoal> <pluginManagement> <plugins> Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2010-01-19 17:35:00 UTC (rev 72) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2010-01-24 23:48:23 UTC (rev 73) @@ -49,8 +49,6 @@ private static final Log log = LogFactory.getLog(ScmWebEditorMainServlet.class); -// protected static CodepageDetectorProxy detector; - /** * Handles the HTTP <code>GET</code> method. * Do checkout on a private or not scm and call modification jsp page