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

r365 - trunk
by tchemit＠users.nuiton.org Nov. 21, 2010

Nov. 21, 2010

Author: tchemit Date: 2010-11-21 15:30:50 +0100 (Sun, 21 Nov 2010) New Revision: 365 Url: http://nuiton.org/repositories/revision/processor/365 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 11:32:43 UTC (rev 364) +++ trunk/pom.xml 2010-11-21 14:30:50 UTC (rev 365) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <artifactId>processor</artifactId>

1 0

r364 - in trunk: . ant-processor-task/src/license maven-processor-plugin/src/license
by tchemit＠users.nuiton.org Nov. 19, 2010

Nov. 19, 2010

Author: tchemit Date: 2010-11-19 12:32:43 +0100 (Fri, 19 Nov 2010) New Revision: 364 Url: http://nuiton.org/repositories/revision/processor/364 Log: regenerate thrid-party with m-license-p 3.0 + reuse ibraries version from mavenpom Modified: trunk/ant-processor-task/src/license/THIRD-PARTY.properties trunk/maven-processor-plugin/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-11-11 17:08:46 UTC (rev 363) +++ trunk/ant-processor-task/src/license/THIRD-PARTY.properties 2010-11-19 11:32:43 UTC (rev 364) @@ -9,6 +9,6 @@ # Please fill the missing licenses for dependencies : # # -#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 +#Fri Nov 19 12:31:48 CET 2010 +org.apache.ant--ant--1.8.0--jar=The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.8.0--jar=The Apache Software License, Version 2.0 Modified: trunk/maven-processor-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-processor-plugin/src/license/THIRD-PARTY.properties 2010-11-11 17:08:46 UTC (rev 363) +++ trunk/maven-processor-plugin/src/license/THIRD-PARTY.properties 2010-11-19 11:32:43 UTC (rev 364) @@ -1,14 +1,16 @@ # 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 # - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:54:47 CEST 2010 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 +#Fri Nov 19 12:31:40 CET 2010 +classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 17:08:46 UTC (rev 363) +++ trunk/pom.xml 2010-11-19 11:32:43 UTC (rev 364) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <artifactId>processor</artifactId> @@ -49,12 +49,6 @@ <dependencies> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helperPluginVersion}</version> @@ -137,7 +131,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.8.0</version> + <version>${antVersion}</version> <scope>compile</scope> </dependency> @@ -218,13 +212,6 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.2</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>${mavenVersion}</version> @@ -238,12 +225,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - </dependencies> </dependencyManagement> @@ -264,12 +245,6 @@ <properties>  <projectId>processor</projectId> - -  - <helperPluginVersion>1.2.9</helperPluginVersion> - -  - <mavenVersion>2.2.1</mavenVersion> </properties>

1 0

r363 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 18:08:46 +0100 (Thu, 11 Nov 2010) New Revision: 363 Url: http://nuiton.org/repositories/revision/processor/363 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2010-11-11 17:08:45 UTC (rev 362) +++ trunk/ant-processor-task/pom.xml 2010-11-11 17:08:46 UTC (rev 363) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2010-11-11 17:08:45 UTC (rev 362) +++ trunk/maven-processor-plugin/pom.xml 2010-11-11 17:08:46 UTC (rev 363) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2010-11-11 17:08:45 UTC (rev 362) +++ trunk/nuiton-processor/pom.xml 2010-11-11 17:08:46 UTC (rev 363) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 17:08:45 UTC (rev 362) +++ trunk/pom.xml 2010-11-11 17:08:46 UTC (rev 363) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.0.4</version> + <version>1.1-SNAPSHOT</version> <modules> <module>nuiton-processor</module> @@ -280,11 +280,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.4</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.4 + scm:svn:http://svn.nuiton.org/svn/processor/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.0.4</url> + <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> <build>

1 0

r362 - tags
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 18:08:45 +0100 (Thu, 11 Nov 2010) New Revision: 362 Url: http://nuiton.org/repositories/revision/processor/362 Log: [maven-release-plugin] copy for tag processor-1.0.4 Added: tags/processor-1.0.4/

1 0

r361 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 18:08:42 +0100 (Thu, 11 Nov 2010) New Revision: 361 Url: http://nuiton.org/repositories/revision/processor/361 Log: [maven-release-plugin] prepare release processor-1.0.4 Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2010-11-11 16:48:24 UTC (rev 360) +++ trunk/ant-processor-task/pom.xml 2010-11-11 17:08:42 UTC (rev 361) @@ -24,16 +24,14 @@ #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> <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2010-11-11 16:48:24 UTC (rev 360) +++ trunk/maven-processor-plugin/pom.xml 2010-11-11 17:08:42 UTC (rev 361) @@ -24,9 +24,7 @@ #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> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2010-11-11 16:48:24 UTC (rev 360) +++ trunk/nuiton-processor/pom.xml 2010-11-11 17:08:42 UTC (rev 361) @@ -24,9 +24,7 @@ #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> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 16:48:24 UTC (rev 360) +++ trunk/pom.xml 2010-11-11 17:08:42 UTC (rev 361) @@ -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> @@ -39,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> <modules> <module>nuiton-processor</module> @@ -282,11 +280,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.4</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/trunk + scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.4 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> + <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.0.4</url> </scm> <build>

1 0

r360 - trunk
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 17:48:24 +0100 (Thu, 11 Nov 2010) New Revision: 360 Url: http://nuiton.org/repositories/revision/processor/360 Log: use m-helper-plugin stable version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 15:40:20 UTC (rev 359) +++ trunk/pom.xml 2010-11-11 16:48:24 UTC (rev 360) @@ -268,7 +268,7 @@ <projectId>processor</projectId>  - <helperPluginVersion>1.2.9-SNAPSHOT</helperPluginVersion> + <helperPluginVersion>1.2.9</helperPluginVersion>  <mavenVersion>2.2.1</mavenVersion>

1 0

r359 - trunk
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 16:40:20 +0100 (Thu, 11 Nov 2010) New Revision: 359 Url: http://nuiton.org/repositories/revision/processor/359 Log: go back tyo maven-helper-plugin 1.2.9 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 15:18:35 UTC (rev 358) +++ trunk/pom.xml 2010-11-11 15:40:20 UTC (rev 359) @@ -268,7 +268,7 @@ <projectId>processor</projectId>  - <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> + <helperPluginVersion>1.2.9-SNAPSHOT</helperPluginVersion>  <mavenVersion>2.2.1</mavenVersion>

1 0

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