Author: tchemit Date: 2009-08-16 10:46:34 +0200 (Sun, 16 Aug 2009) New Revision: 1624 Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/AbstractUpdateHeaderPlugin.java trunk/src/main/java/org/nuiton/license/plugin/SwitchLicensePlugin.java trunk/src/site/site.xml Log: bump versions + update skin Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-06-22 15:25:58 UTC (rev 1623) +++ trunk/pom.xml 2009-08-16 08:46:34 UTC (rev 1624) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-rc-2</version> + <version>1.0.0-rc-5-SNAPSHOT</version> </parent> <artifactId>maven-license-plugin</artifactId> @@ -87,10 +87,6 @@ <packaging>maven-plugin</packaging> - <properties> - <helper.version>1.0.0-rc-3-SNAPSHOT</helper.version> - </properties> - <build> <defaultGoal>install</defaultGoal> Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractUpdateHeaderPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractUpdateHeaderPlugin.java 2009-06-22 15:25:58 UTC (rev 1623) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractUpdateHeaderPlugin.java 2009-08-16 08:46:34 UTC (rev 1624) @@ -34,7 +34,7 @@ import org.nuiton.license.License; import org.nuiton.license.LicenseFactory; import org.nuiton.processor.LicenseProcessor; -import org.nuiton.util.FileUtil; +import org.nuiton.util.PluginHelper; /** * Le modele de goal a utiliser pour mettre a jour l'entete d'un fichier. @@ -317,7 +317,7 @@ protected void addHeaderToFile(File sourceFile, File processFile) throws IOException { getLog().warn("no license header was found on file " + processFile + ", adding one"); - String content = FileUtil.readAsString(sourceFile, encoding); + String content = PluginHelper.readAsString(sourceFile, encoding); content = getGenerator().getHeader(licenseHeaderContent) + content; writeFile(processFile, content, encoding); } Modified: trunk/src/main/java/org/nuiton/license/plugin/SwitchLicensePlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/SwitchLicensePlugin.java 2009-06-22 15:25:58 UTC (rev 1623) +++ trunk/src/main/java/org/nuiton/license/plugin/SwitchLicensePlugin.java 2009-08-16 08:46:34 UTC (rev 1624) @@ -20,8 +20,6 @@ import org.apache.maven.plugin.MojoExecutionException; -import org.nuiton.util.FileUtil; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -39,6 +37,7 @@ import org.nuiton.processor.filters.LicenseFilter; import org.nuiton.util.FileUpdaterHelper; import org.nuiton.util.MirroredFileUpdater; +import org.nuiton.util.PluginHelper; /** * Le goal pour switcher les licenses de tous les sources java d'un module @@ -315,14 +314,14 @@ protected void addLicenseToJavaSourceFile(File sourceFile, File processFile) throws IOException { getLog().warn("no license was found on file " + sourceFile + ", adding one"); - String content = FileUtil.readAsString(sourceFile, encoding); + String content = PluginHelper.readAsString(sourceFile, encoding); content = "/**\n * " + LicenseFilter.HEADER + " " + licenseHeaderContent + " " + LicenseFilter.FOOTER + "\n */\n" + content; writeFile(processFile, content, encoding); } protected void addLicenseToXmlSourceFile(File sourceFile, File processFile) throws IOException { getLog().warn("no license was found on file " + sourceFile + ", adding one"); - String content = FileUtil.readAsString(sourceFile, encoding); + String content = PluginHelper.readAsString(sourceFile, encoding); content = "<!--\n\n/**\n * " + LicenseFilter.HEADER + " " + licenseHeaderContent + " " + LicenseFilter.FOOTER + "\n */\n" + content + " \n\n-->"; writeFile(processFile, content, encoding); } Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-06-22 15:25:58 UTC (rev 1623) +++ trunk/src/site/site.xml 2009-08-16 08:46:34 UTC (rev 1624) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft>