- Maven-license-plugin-commits - mailman.cloud.codelutin.com

r1691 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 23:39:00 +0100 (Sun, 24 Jan 2010) New Revision: 1691 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release maven-license-plugin-2.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-24 22:35:21 UTC (rev 1690) +++ trunk/pom.xml 2010-01-24 22:39:00 UTC (rev 1691) @@ -14,7 +14,7 @@ </parent> <artifactId>maven-license-plugin</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.2</version> <dependencies> @@ -274,9 +274,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/tags/maven-license-p…</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/tags/maven-license-p…</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/tags/maven-l…</url> </scm>

1 0

r1690 - in trunk: . src/site src/site/rst
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 23:35:21 +0100 (Sun, 24 Jan 2010) New Revision: 1690 Removed: trunk/src/site/rst/Todo.rst Modified: trunk/pom.xml trunk/src/site/site_en.xml Log: use last site configuration + bump jredmine to 1.1.3 and nuiton skin to 1.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-24 22:24:41 UTC (rev 1689) +++ trunk/pom.xml 2010-01-24 22:35:21 UTC (rev 1690) @@ -289,12 +289,12 @@ <processor.version>1.0.2</processor.version> -   - <maven.site.locales>en</maven.site.locales> +  <jredmine.version>1.1.3</jredmine.version> <skin.version>1.0.2</skin.version> +  <siteLocales>en</siteLocales> </properties> @@ -334,6 +334,11 @@ <plugin> <artifactId>maven-site-plugin</artifactId> +  + <configuration> + <locales>${siteLocales}</locales> + <generateSitemap>true</generateSitemap> + </configuration> <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> Deleted: trunk/src/site/rst/Todo.rst =================================================================== --- trunk/src/site/rst/Todo.rst 2010-01-24 22:24:41 UTC (rev 1689) +++ trunk/src/site/rst/Todo.rst 2010-01-24 22:35:21 UTC (rev 1690) @@ -1,4 +0,0 @@ -TODO -==== - -Any idea ? Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-24 22:24:41 UTC (rev 1689) +++ trunk/src/site/site_en.xml 2010-01-24 22:35:21 UTC (rev 1690) @@ -46,6 +46,9 @@ <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu> + <menu name="Divers"> + <item name="Site map" href="./sitemap.html"/> + </menu> <menu ref="reports"/>

1 0

r1689 - trunk/src/main/java/org/nuiton/license/plugin
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 23:24:41 +0100 (Sun, 24 Jan 2010) New Revision: 1689 Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderMojo.java Log: remove log Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderMojo.java 2010-01-24 22:24:14 UTC (rev 1688) +++ trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderMojo.java 2010-01-24 22:24:41 UTC (rev 1689) @@ -364,9 +364,6 @@ getFilesToTreateForRoots(in, ex, testSourceRoots, filesToTreate, null); if (filesToTreate.isEmpty()) { - if (verbose) { - getLog().info("No file to treate"); - } return; }

1 0

r1688 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 23:24:14 +0100 (Sun, 24 Jan 2010) New Revision: 1688 Modified: trunk/pom.xml Log: use jredmine 1.0.3 (not available until mavenpom 2.0.3) use nuiton-skin 1.0.2 (not available until mavenpom 2.0.3) use new site configuration (compatible nuiton skin 1.0.2) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-24 22:22:40 UTC (rev 1687) +++ trunk/pom.xml 2010-01-24 22:24:14 UTC (rev 1688) @@ -291,7 +291,10 @@   - <maven.site.locales>en</maven.site.locales> + <maven.site.locales>en</maven.site.locales> + <jredmine.version>1.1.3</jredmine.version> + <skin.version>1.0.2</skin.version> + <siteLocales>en</siteLocales> </properties>

1 0

r1687 - trunk/src/site
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 23:22:40 +0100 (Sun, 24 Jan 2010) New Revision: 1687 Modified: trunk/src/site/site_en.xml Log: override skin in descriptor since this is a static resources from inheritance from mavempom4redmine Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-24 21:35:10 UTC (rev 1686) +++ trunk/src/site/site_en.xml 2010-01-24 22:22:40 UTC (rev 1687) @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> + <skin> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>${skin.version}</version> + </skin> + <bannerLeft> <name>${project.name}</name> <href>index.html</href>

1 0

r1686 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 22:35:10 +0100 (Sun, 24 Jan 2010) New Revision: 1686 Modified: trunk/pom.xml Log: change maven.site.locales to siteLocales to be compatible with mavenpom 2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-24 21:32:14 UTC (rev 1685) +++ trunk/pom.xml 2010-01-24 21:35:10 UTC (rev 1686) @@ -290,8 +290,10 @@ <processor.version>1.0.2</processor.version>  - <maven.site.locales>en</maven.site.locales> - +  + <maven.site.locales>en</maven.site.locales> + <siteLocales>en</siteLocales> + </properties> <build>

1 0

r1685 - trunk/src/main/java/org/nuiton/license/plugin/header/generator
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 22:32:14 +0100 (Sun, 24 Jan 2010) New Revision: 1685 Added: trunk/src/main/java/org/nuiton/license/plugin/header/generator/AptLicenseHeaderGeneratorImpl.java Log: Evolution #268: Add apt license generator Copied: trunk/src/main/java/org/nuiton/license/plugin/header/generator/AptLicenseHeaderGeneratorImpl.java (from rev 1682, trunk/src/main/java/org/nuiton/license/plugin/header/generator/XmlLicenseHeaderGeneratorImpl.java) =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/header/generator/AptLicenseHeaderGeneratorImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/license/plugin/header/generator/AptLicenseHeaderGeneratorImpl.java 2010-01-24 21:32:14 UTC (rev 1685) @@ -0,0 +1,51 @@ +/* + * *##% + * Maven License Plugin + * Copyright (C) 2008 - 2010 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package org.nuiton.license.plugin.header.generator; + +import org.nuiton.processor.filters.LicenseFilter; + +/** + * Le generateur de header pour des fichiers apt. + * + * @author chemit + * @since 1.0.1 + * + * @plexus.component role-hint="license-apt" + */ +public class AptLicenseHeaderGeneratorImpl extends LicenseHeaderGenerator { + + public static final String GENERATOR_NAME = "license-apt"; + public static final String GENERATOR_DESCRIPTION = "generator with apt comment style"; + + public AptLicenseHeaderGeneratorImpl() { + super("~~~ ", "\n", "\n", LicenseFilter.HEADER, LicenseFilter.FOOTER); + } + + @Override + public String getName() { + return GENERATOR_NAME; + } + + @Override + public String getDescription() { + return GENERATOR_DESCRIPTION; + } +} \ No newline at end of file

1 0

r1684 - trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 22:31:49 +0100 (Sun, 24 Jan 2010) New Revision: 1684 Modified: trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/bug_28.xml trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/java.xml trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/properties.xml trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/xml.xml Log: Anomalie #267: can not configure compileSourceRoots on update-header goal Modified: trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/bug_28.xml =================================================================== --- trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/bug_28.xml 2010-01-24 21:31:26 UTC (rev 1683) +++ trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/bug_28.xml 2010-01-24 21:31:49 UTC (rev 1684) @@ -27,7 +27,7 @@ <compileSourceRoots> <dir>target/test-classes/org/nuiton/license/plugin/UpdateHeaderPluginTest/bug_28</dir> </compileSourceRoots> - <testCompileSourceRoots/> + <testSourceRoots/> <includes>**/*.java2</includes> <verbose>true</verbose> </configuration> Modified: trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/java.xml =================================================================== --- trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/java.xml 2010-01-24 21:31:26 UTC (rev 1683) +++ trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/java.xml 2010-01-24 21:31:49 UTC (rev 1684) @@ -27,7 +27,7 @@ <compileSourceRoots> <dir>target/test-classes/org/nuiton/license/plugin/UpdateHeaderPluginTest/java</dir> </compileSourceRoots> - <testCompileSourceRoots/> + <testSourceRoots/> <includes>**/*.java2,**/*.css</includes> <verbose>true</verbose> </configuration> Modified: trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/properties.xml =================================================================== --- trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/properties.xml 2010-01-24 21:31:26 UTC (rev 1683) +++ trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/properties.xml 2010-01-24 21:31:49 UTC (rev 1684) @@ -24,10 +24,8 @@ <licenseName>lgpl_v3</licenseName> <generatorName>license-properties</generatorName> <template>/license/defaultHeader.vm</template> - <compileSourceRoots> - <dir>target/test-classes/org/nuiton/license/plugin/UpdateHeaderPluginTest/properties</dir> - </compileSourceRoots> - <testCompileSourceRoots/> + <compileSourceRoots>target/test-classes/org/nuiton/license/plugin/UpdateHeaderPluginTest/properties</compileSourceRoots> + <testSourceRoots/> <includes>**/*.properties,**/*.sh</includes> <verbose>true</verbose> </configuration> Modified: trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/xml.xml =================================================================== --- trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/xml.xml 2010-01-24 21:31:26 UTC (rev 1683) +++ trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderMojoTest/xml.xml 2010-01-24 21:31:49 UTC (rev 1684) @@ -27,7 +27,7 @@ <compileSourceRoots> <dir>target/test-classes/org/nuiton/license/plugin/UpdateHeaderPluginTest/xml</dir> </compileSourceRoots> - <testCompileSourceRoots/> + <testSourceRoots/> <includes>**/*.xml,**/*.html</includes> <verbose>true</verbose> </configuration>

1 0

r1683 - trunk/src/main/java/org/nuiton/license/plugin
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 22:31:26 +0100 (Sun, 24 Jan 2010) New Revision: 1683 Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderMojo.java Log: Anomalie #267: can not configure compileSourceRoots on update-header goal Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderMojo.java 2010-01-21 12:54:10 UTC (rev 1682) +++ trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderMojo.java 2010-01-24 21:31:26 UTC (rev 1683) @@ -138,21 +138,52 @@ */ protected String excludes; /** - * Repertoires des fichiers sources a traiter. + * Compile source directory roots to inspect. * + * Can use it a a comma separated string : + * + * <pre><compileSourceRoots>src/site,src.target/extra-site</compileSourceRoots> </pre> + * + * or a list : + * + * <pre> + * <compileSourceRoots> + * <root>src/site</root> </pre> + * <root>src/target/extra-site</root> </pre> + * </compileSourceRoots> + * </pre> + * + * <b>Note:</b> If not set, will use the build compile roots. + * * @parameter expression="${license.compileSourceRoots}" default-value="${project.compileSourceRoots}" * @required * @since 1.0.0 */ protected List<String> compileSourceRoots; /** - * Repertoires des fichiers sources de test a traiter. + * Test source directory roots to inspect. * - * @parameter expression="${license.testCompileSourceRoots}" default-value="${project.testCompileSourceRoots}" + * Can use it a a comma separated string : + * + * <pre><testSourceRoots>src/test1,src/test2</testSourceRoots> </pre> + * + * or a list : + * + * <pre> + * <testSourceRoots> + * <root>src/site</root> </pre> + * <root>src/target/extra-site</root> </pre> + * </testSourceRoots> + * </pre> + * + * <b>Note:</b> If not set, will use the build test roots. + * + * + * @parameter expression="${license.testSourceRoots}" default-value="${project.testCompileSourceRoots}" * @required * @since 1.0.0 */ - protected List<String> testCompileSourceRoots; + protected List<String> testSourceRoots; /** * Un resolver externe * @@ -259,6 +290,24 @@ return true; } + public void setCompileSourceRoots(String root) { + String[] roots = PluginHelper.splitAndTrim(root, ","); + setCompileSourceRoots(Arrays.asList(roots)); + } + + public void setCompileSourceRoots(List<String> compileSourceRoots) { + this.compileSourceRoots = compileSourceRoots; + } + + public void setTestSourceRoots(String root) { + String[] roots = PluginHelper.splitAndTrim(root, ","); + setTestSourceRoots(Arrays.asList(roots)); + } + + public void setTestSourceRoots(List<String> testSourceRoots) { + this.testSourceRoots = testSourceRoots; + } + @Override protected boolean checkSkip() { if (skipUpdateHeader) { @@ -289,6 +338,16 @@ Entry<String, HeaderGenerator> next = stringHeaderGeneratorEntry; getLog().info("config - available generator : " + next.getKey()); } + if (compileSourceRoots!=null) { + for (String root : compileSourceRoots) { + getLog().info("config - compile source root : " + root); + } + } + if (testSourceRoots!=null) { + for (String root : testSourceRoots) { + getLog().info("config - test source root : " + root); + } + } } if (!_generators.containsKey(generatorName.trim())) { @@ -302,9 +361,12 @@ String[] in = includes.split(","); String[] ex = excludes == null ? null : excludes.split(","); getFilesToTreateForRoots(in, ex, compileSourceRoots, filesToTreate, null); - getFilesToTreateForRoots(in, ex, testCompileSourceRoots, filesToTreate, null); + getFilesToTreateForRoots(in, ex, testSourceRoots, filesToTreate, null); if (filesToTreate.isEmpty()) { + if (verbose) { + getLog().info("No file to treate"); + } return; }

1 0

r1682 - trunk
by tchemit＠users.nuiton.org 21 Jan '10

21 Jan '10

Author: tchemit Date: 2010-01-21 13:54:10 +0100 (Thu, 21 Jan 2010) New Revision: 1682 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-21 12:54:08 UTC (rev 1681) +++ trunk/pom.xml 2010-01-21 12:54:10 UTC (rev 1682) @@ -14,7 +14,7 @@ </parent> <artifactId>maven-license-plugin</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> <dependencies> @@ -274,9 +274,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/tags/maven-license-p…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/tags/maven-license-p…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/tags/maven-l…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/trunk</url> </scm>

1 0