- Processor-commits - mailman.cloud.codelutin.com

r358 - trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 16:18:35 +0100 (Thu, 11 Nov 2010) New Revision: 358 Url: http://nuiton.org/repositories/revision/processor/358 Log: make tests works on windows Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2010-11-11 15:09:43 UTC (rev 357) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2010-11-11 15:18:35 UTC (rev 358) @@ -35,6 +35,7 @@ import java.io.File; import java.io.IOException; +import java.net.URL; /** @author fdesbois */ public class StringFilterTest extends CommonTest { @@ -47,9 +48,10 @@ } @Test - public void testStringFilter() throws IOException { + public void testStringFilter() throws Exception { String fileName = "StringFilterTest.java2"; - String in = StringFilterTest.class.getResource(fileName).getFile(); + URL resource = getClass().getResource(fileName); + String in = new File(resource.toURI()).getAbsolutePath(); File out = getFile(testdir, fileName); Processor processor = new Processor(); processor.setInputFilter(new GeneratorTemplatesFilter()); @@ -61,7 +63,8 @@ } checkPattern("+\" int i = 0;\\n\"", true, out, encoding); fileName = "StringFilterTest_1.java2"; - in = StringFilterTest.class.getResource(fileName).getFile(); + resource = getClass().getResource(fileName); + in = new File(resource.toURI()).getAbsolutePath(); out = getFile(testdir, fileName); content = process(processor, in, out, encoding); if (log.isDebugEnabled()) {

1 0

r357 - in trunk: . ant-processor-task/src/license
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 16:09:43 +0100 (Thu, 11 Nov 2010) New Revision: 357 Url: http://nuiton.org/repositories/revision/processor/357 Log: do NOT use mavenpom dependencies since it does not work on windows os + update ant to 1.8.0 Modified: trunk/ant-processor-task/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/ant-processor-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-processor-task/src/license/THIRD-PARTY.properties 2010-10-29 13:38:48 UTC (rev 356) +++ trunk/ant-processor-task/src/license/THIRD-PARTY.properties 2010-11-11 15:09:43 UTC (rev 357) @@ -1,6 +1,7 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 @@ -8,6 +9,6 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:55:32 CEST 2010 -org.apache.ant--ant--1.7.1=The Apache Software License, Version 2.0 -org.apache.ant--ant-launcher--1.7.1=The Apache Software License, Version 2.0 +#Thu Nov 11 16:02:21 CET 2010 +org.apache.ant--ant--1.8.0=The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.8.0=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 13:38:48 UTC (rev 356) +++ trunk/pom.xml 2010-11-11 15:09:43 UTC (rev 357) @@ -50,10 +50,11 @@ <dependencyManagement> <dependencies> -  + <version>1.1.1</version> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -138,7 +139,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.7.1</version> + <version>1.8.0</version> <scope>compile</scope> </dependency> @@ -218,11 +219,12 @@ </exclusions> </dependency> -  + </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -238,10 +240,11 @@ <scope>provided</scope> </dependency> -  + <version>1.2.16</version> + </dependency> </dependencies> </dependencyManagement> @@ -266,6 +269,10 @@  <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> + +  + <mavenVersion>2.2.1</mavenVersion> + </properties>

1 0

r356 - in trunk: . ant-processor-task ant-processor-task/src/main/java/org/nuiton/processor/ant ant-processor-task/src/site ant-processor-task/src/site/apt maven-processor-plugin maven-processor-plugin/src/main/java/org/nuiton/processor/plugin maven-processor-plugin/src/site maven-processor-plugin/src/site/apt nuiton-processor nuiton-processor/src/main/java/org/nuiton/processor nuiton-processor/src/main/java/org/nuiton/processor/filters nuiton-processor/src/site nuiton-processor/src/site
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 15:38:48 +0200 (Fri, 29 Oct 2010) New Revision: 356 Url: http://nuiton.org/repositories/revision/processor/356 Log: use default svn-keywords Modified: trunk/LICENSE.txt trunk/README.txt trunk/ant-processor-task/LICENSE.txt trunk/ant-processor-task/README.txt trunk/ant-processor-task/changelog.txt trunk/ant-processor-task/pom.xml trunk/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java trunk/ant-processor-task/src/site/apt/index.apt trunk/ant-processor-task/src/site/site_fr.xml trunk/changelog.txt trunk/maven-processor-plugin/LICENSE.txt trunk/maven-processor-plugin/README.txt trunk/maven-processor-plugin/changelog.txt trunk/maven-processor-plugin/pom.xml trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java trunk/maven-processor-plugin/src/site/apt/index.apt trunk/maven-processor-plugin/src/site/site_fr.xml trunk/nuiton-processor/LICENSE.txt trunk/nuiton-processor/README.txt trunk/nuiton-processor/changelog.txt trunk/nuiton-processor/pom.xml trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java trunk/nuiton-processor/src/site/apt/Todo.apt trunk/nuiton-processor/src/site/apt/index.apt trunk/nuiton-processor/src/site/site_fr.xml trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java trunk/nuiton-processor/src/test/resources/log4j.properties trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest.java2 trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest_1.java2 trunk/nuiton-processor/src/test/resources/org/nuiton/processor/filters/StringFilterTest.java2 trunk/nuiton-processor/src/test/resources/org/nuiton/processor/filters/StringFilterTest_1.java2 trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/site_fr.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-processor-task/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-processor-task/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-processor-task/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-processor-task/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-processor-task/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-processor-task/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-processor-plugin/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-processor-plugin/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-processor-plugin/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-processor-plugin/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-processor-plugin/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-processor-plugin/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java 2010-10-29 13:38:18 UTC (rev 355) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java 2010-10-29 13:38:48 UTC (rev 356) @@ -2,8 +2,8 @@ * #%L * Nuiton Processor :: Api * - * $Id: GeneratorTemplatesFilter.java 328 2010-04-15 14:26:01Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/processor/trunk/nuiton-processor/src/main/java/or… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% @@ -31,9 +31,9 @@ * * @author <pineau(a)codelutin.com> * Copyright Code Lutin - * @version $Revision: 328 $ + * @version $Revision$ * - * Mise a jour: $Date: 2010-04-15 16:26:01 +0200 (jeu. 15 avril 2010) $ + * Mise a jour: $Date$ * par : */ /** Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/site/apt/Todo.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest.java2 ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest_1.java2 ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/test/resources/org/nuiton/processor/filters/StringFilterTest.java2 ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-processor/src/test/resources/org/nuiton/processor/filters/StringFilterTest_1.java2 ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL

1 0

r355 - in trunk: . nuiton-processor/src/test/resources src
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 15:38:18 +0200 (Fri, 29 Oct 2010) New Revision: 355 Url: http://nuiton.org/repositories/revision/processor/355 Log: no more use of license project descriptor + update headers + do not add header on THIRD-PARTY.properties Removed: trunk/src/license/ Modified: trunk/nuiton-processor/src/test/resources/log4j.properties trunk/pom.xml Modified: trunk/nuiton-processor/src/test/resources/log4j.properties =================================================================== --- trunk/nuiton-processor/src/test/resources/log4j.properties 2010-10-29 08:29:37 UTC (rev 354) +++ trunk/nuiton-processor/src/test/resources/log4j.properties 2010-10-29 13:38:18 UTC (rev 355) @@ -1,3 +1,27 @@ +### +# #%L +# Nuiton Processor :: Api +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2002 - 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>. +# #L% +### # Global logging configuration log4j.rootLogger=ERROR, stdout # Console output... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:29:37 UTC (rev 354) +++ trunk/pom.xml 2010-10-29 13:38:18 UTC (rev 355) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -259,10 +261,10 @@ <packaging>pom</packaging> <properties> -  +  <projectId>processor</projectId> -  +  <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> </properties> @@ -274,9 +276,27 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/processor/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/processor/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> + <build> + <pluginManagement> + <plugins> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/THIRD-PARTY.properties</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </project>

1 0

r354 - trunk
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 10:29:37 +0200 (Fri, 29 Oct 2010) New Revision: 354 Url: http://nuiton.org/repositories/revision/processor/354 Log: Update mavenpom4redmineAndCentral to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:57:29 UTC (rev 353) +++ trunk/pom.xml 2010-10-29 08:29:37 UTC (rev 354) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <artifactId>processor</artifactId>

1 0

r353 - trunk
by tchemit＠users.nuiton.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 14:57:29 +0200 (Tue, 26 Oct 2010) New Revision: 353 Url: http://nuiton.org/repositories/revision/processor/353 Log: fix build (use inheritance from mavenpom for commons libs) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:12:32 UTC (rev 352) +++ trunk/pom.xml 2010-10-26 12:57:29 UTC (rev 353) @@ -50,10 +50,10 @@ <dependencyManagement> <dependencies> - <dependency> +  <dependency> <groupId>org.nuiton</groupId> @@ -218,11 +218,11 @@ </exclusions> </dependency> - <dependency> +  <dependency> <groupId>org.apache.maven</groupId> @@ -238,10 +238,10 @@ <scope>provided</scope> </dependency> - <dependency> +  </dependencies> </dependencyManagement>

1 0

r352 - trunk
by tchemit＠users.nuiton.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 14:12:32 +0200 (Tue, 26 Oct 2010) New Revision: 352 Url: http://nuiton.org/repositories/revision/processor/352 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-25 06:53:53 UTC (rev 351) +++ trunk/pom.xml 2010-10-26 12:12:32 UTC (rev 352) @@ -53,8 +53,6 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> </dependency> <dependency> @@ -223,7 +221,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> @@ -244,7 +241,6 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> </dependency> </dependencies>

1 0

r351 - in trunk: . ant-processor-task maven-processor-plugin
by tchemit＠users.nuiton.org Oct. 25, 2010

Oct. 25, 2010

Author: tchemit Date: 2010-10-25 08:53:53 +0200 (Mon, 25 Oct 2010) New Revision: 351 Url: http://nuiton.org/repositories/revision/processor/351 Log: Evolution #498: Use mavenpom4redmine 2.4 Evolution #500: Use maven-license-plugin 2.4.1 Evolution #725: Use maven-helper-plugin 1.3 Evolution #982: Optimize dependencies Evolution #983: Use new maven-license-plugin mecanism to update file headers reformat poms Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2010-10-17 01:38:42 UTC (rev 350) +++ trunk/ant-processor-task/pom.xml 2010-10-25 06:53:53 UTC (rev 351) @@ -24,56 +24,43 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>processor</artifactId> + <version>1.0.4-SNAPSHOT</version> + </parent> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> - </parent> + <groupId>org.nuiton.processor</groupId> + <artifactId>ant-processor-task</artifactId> - <groupId>org.nuiton.processor</groupId> - <artifactId>ant-processor-task</artifactId> + <dependencies> - <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-processor</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>nuiton-processor</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  + </dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <name>Nuiton Processor :: Ant task</name> + <inceptionYear>2009</inceptionYear> - </dependencies> - -  -  -  - <name>Nuiton Processor :: Ant task</name> - <inceptionYear>2009</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - </project> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2010-10-17 01:38:42 UTC (rev 350) +++ trunk/maven-processor-plugin/pom.xml 2010-10-25 06:53:53 UTC (rev 351) @@ -24,80 +24,83 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>processor</artifactId> + <version>1.0.4-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> - <dependencies> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>nuiton-processor</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-processor</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + </dependency> -  - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> +  +  -  +  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> - </dependencies> + </dependencies> -  -  -  - <name>Nuiton Processor :: Maven plugin</name> - <inceptionYear>2006</inceptionYear> +  +  +  + <name>Nuiton Processor :: Maven plugin</name> + <inceptionYear>2006</inceptionYear> -  -  -  +  +  +  - <packaging>maven-plugin</packaging> + <packaging>maven-plugin</packaging> <profiles>  Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:38:42 UTC (rev 350) +++ trunk/pom.xml 2010-10-25 06:53:53 UTC (rev 351) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -33,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>processor</artifactId> @@ -58,7 +60,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -97,20 +99,10 @@ <exclusion> <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> <artifactId>plexus-mail-sender-api</artifactId> </exclusion> <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> - - <exclusion> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </exclusion> @@ -125,22 +117,16 @@ <artifactId>plexus-sec-dispatcher</artifactId> </exclusion> - <exclusion> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </exclusion> <exclusion> - <groupId>org.apache.velocity</groupId> + <groupId>velocity</groupId> <artifactId>velocity</artifactId> </exclusion> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - </exclusion> - </exclusions> </dependency> @@ -149,7 +135,6 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>1.5.15</version> - <scope>compile</scope> </dependency> <dependency> @@ -164,7 +149,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>test</scope> <classifier>tests</classifier> <exclusions> @@ -204,20 +189,10 @@ <exclusion> <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> <artifactId>plexus-mail-sender-api</artifactId> </exclusion> <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> - - <exclusion> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </exclusion> @@ -238,15 +213,10 @@ </exclusion> <exclusion> - <groupId>org.apache.velocity</groupId> + <groupId>velocity</groupId> <artifactId>velocity</artifactId> </exclusion> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - </exclusion> - </exclusions> </dependency> @@ -260,21 +230,21 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>1.2.16</version> </dependency> </dependencies> @@ -298,6 +268,8 @@  <projectId>processor</projectId> +  + <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> </properties>  @@ -308,7 +280,8 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</developerConnection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/processor/trunk + </developerConnection> <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm>

1 0

r350 - trunk
by tchemit＠users.nuiton.org Oct. 17, 2010

Oct. 17, 2010

Author: tchemit Date: 2010-10-17 03:38:42 +0200 (Sun, 17 Oct 2010) New Revision: 350 Url: http://nuiton.org/repositories/revision/processor/350 Log: Update mavenpom4redmineAndCentral to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-08 23:50:57 UTC (rev 349) +++ trunk/pom.xml 2010-10-17 01:38:42 UTC (rev 350) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>processor</artifactId>

1 0

r349 - trunk
by tchemit＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: tchemit Date: 2010-10-09 01:50:57 +0200 (Sat, 09 Oct 2010) New Revision: 349 Url: http://nuiton.org/repositories/revision/processor/349 Log: Update mavenpom4redmineAndCentral to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:53:21 UTC (rev 348) +++ trunk/pom.xml 2010-10-08 23:50:57 UTC (rev 349) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <artifactId>processor</artifactId>

1 0