September 2010 - Maven-helper-plugin-commits - mailman.cloud.codelutin.com

r764 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:10:50 +0200 (Wed, 29 Sep 2010) New Revision: 764 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/764 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:30:23 UTC (rev 763) +++ trunk/pom.xml 2010-09-29 08:10:50 UTC (rev 764) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <artifactId>maven-helper-plugin</artifactId>

1 0

r763 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:30:23 +0200 (Thu, 09 Sep 2010) New Revision: 763 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/763 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 08:51:07 UTC (rev 762) +++ trunk/pom.xml 2010-09-09 09:30:23 UTC (rev 763) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <artifactId>maven-helper-plugin</artifactId>

1 0

r762 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 10:51:07 +0200 (Thu, 09 Sep 2010) New Revision: 762 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/762 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 08:51:06 UTC (rev 761) +++ trunk/pom.xml 2010-09-09 08:51:07 UTC (rev 762) @@ -39,7 +39,7 @@ <artifactId>maven-helper-plugin</artifactId> - <version>1.2.7</version> + <version>1.2.8-SNAPSHOT</version> <dependencies> @@ -302,9 +302,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> </scm>

1 0

r761 - in tags: . maven-helper-plugin-1.2.7
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 10:51:06 +0200 (Thu, 09 Sep 2010) New Revision: 761 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/761 Log: [maven-release-plugin] copy for tag maven-helper-plugin-1.2.7 Added: tags/maven-helper-plugin-1.2.7/ Property changes on: tags/maven-helper-plugin-1.2.7 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr *.iws Added: svn:mergeinfo +

1 0

r760 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 10:51:04 +0200 (Thu, 09 Sep 2010) New Revision: 760 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/760 Log: [maven-release-plugin] prepare release maven-helper-plugin-1.2.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 08:45:30 UTC (rev 759) +++ trunk/pom.xml 2010-09-09 08:51:04 UTC (rev 760) @@ -39,7 +39,7 @@ <artifactId>maven-helper-plugin</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> <dependencies> @@ -302,9 +302,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he…</url> </scm>

1 0

r759 - in trunk/src: it/check-auto-container/central it/check-auto-container/nuiton-other-releases it/check-auto-container/unsafe-central license main/java/org/nuiton/helper/plugin main/java/org/nuiton/plugin
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 10:45:30 +0200 (Thu, 09 Sep 2010) New Revision: 759 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/759 Log: fix svn:keywords Modified: trunk/src/it/check-auto-container/central/invoker.properties trunk/src/it/check-auto-container/central/pom.xml trunk/src/it/check-auto-container/central/verify.groovy trunk/src/it/check-auto-container/nuiton-other-releases/invoker.properties trunk/src/it/check-auto-container/nuiton-other-releases/pom.xml trunk/src/it/check-auto-container/nuiton-other-releases/verify.groovy trunk/src/it/check-auto-container/unsafe-central/invoker.properties trunk/src/it/check-auto-container/unsafe-central/pom.xml trunk/src/it/check-auto-container/unsafe-central/verify.groovy trunk/src/license/THIRD-PARTY.properties trunk/src/license/project.xml trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java trunk/src/main/java/org/nuiton/plugin/PluginWithEncoding.java Property changes on: trunk/src/it/check-auto-container/central/invoker.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/it/check-auto-container/central/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/it/check-auto-container/central/verify.groovy ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/it/check-auto-container/nuiton-other-releases/invoker.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/it/check-auto-container/nuiton-other-releases/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/it/check-auto-container/nuiton-other-releases/verify.groovy ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/it/check-auto-container/unsafe-central/invoker.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/it/check-auto-container/unsafe-central/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/it/check-auto-container/unsafe-central/verify.groovy ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/nuiton/plugin/PluginWithEncoding.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author

1 0

r758 - in trunk/src/it/collect-files: multi single
by tchemit＠users.nuiton.org 08 Sep '10

08 Sep '10

Author: tchemit Date: 2010-09-08 15:40:15 +0200 (Wed, 08 Sep 2010) New Revision: 758 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/758 Log: Anomalie #857: Can not execute tests on windows os Modified: trunk/src/it/collect-files/multi/verify.groovy trunk/src/it/collect-files/single/verify.groovy Modified: trunk/src/it/collect-files/multi/verify.groovy =================================================================== --- trunk/src/it/collect-files/multi/verify.groovy 2010-09-08 12:43:36 UTC (rev 757) +++ trunk/src/it/collect-files/multi/verify.groovy 2010-09-08 13:40:15 UTC (rev 758) @@ -1,4 +1,3 @@ - // collect-files assert new File(basedir, 'target/collect.properties').exists(); assert !new File(basedir, 'target/collect').exists(); @@ -10,13 +9,17 @@ assert !new File(basedir, 'module2/target/collect').exists(); content = new File(basedir, 'target/collect.properties').text; -assert content.contains( 'target/its/collect-files/multi/pom.xml' ); -assert content.contains( 'target/its/collect-files/multi/src/collect-files.txt' ); -assert content.contains( 'target/its/collect-files/multi/module1/target/module1-0.jar' ); -assert content.contains( 'target/its/collect-files/multi/module1/src/module1.txt' ); -assert content.contains( 'target/its/collect-files/multi/module2/target/module2-0.jar' ); -assert content.contains( 'target/its/collect-files/multi/module2/src/module2.txt' ); +separ = File.separator +prefix = 'target' + separ + 'its' + separ + 'collect-files' + separ + 'multi' + separ; + +assert content.contains(prefix + 'pom.xml'); +assert content.contains(prefix + 'src' + separ + 'collect-files.txt'); +assert content.contains(prefix + 'module1' + separ + 'target' + separ + 'module1-0.jar'); +assert content.contains(prefix + 'module1' + separ + 'src' + separ + 'module1.txt'); +assert content.contains(prefix + 'module2' + separ + 'target' + separ + 'module2-0.jar'); +assert content.contains(prefix + 'module2' + separ + 'src' + separ + 'module2.txt'); + // collect-files-2 assert new File(basedir, 'target/collect2.properties').exists(); assert new File(basedir, 'target/collect2').exists(); @@ -35,13 +38,16 @@ assert new File(basedir, 'target/collect2/org.nuiton.test--module2/module2-2.txt').exists(); content = new File(basedir, 'target/collect2.properties').text; -assert content.contains( 'target/its/collect-files/multi/target/collect2/org.nuiton.test--collect-files-multi/pom.xml' ); -assert content.contains( 'target/its/collect-files/multi/target/collect2/org.nuiton.test--collect-files-multi/collect-files-2.txt' ); -assert content.contains( 'target/its/collect-files/multi/target/collect2/org.nuiton.test--module1/module1-0.jar' ); -assert content.contains( 'target/its/collect-files/multi/target/collect2/org.nuiton.test--module1/module1-2.txt' ); -assert content.contains( 'target/its/collect-files/multi/target/collect2/org.nuiton.test--module2/module2-0.jar' ); -assert content.contains( 'target/its/collect-files/multi/target/collect2/org.nuiton.test--module2/module2-2.txt' ); +prefix = 'target' + separ + 'its' + separ + 'collect-files' + separ + 'multi' + separ + 'target' + separ + 'collect2' + separ; + +assert content.contains(prefix + 'org.nuiton.test--collect-files-multi' + separ + 'pom.xml'); +assert content.contains(prefix + 'org.nuiton.test--collect-files-multi' + separ + 'collect-files-2.txt'); +assert content.contains(prefix + 'org.nuiton.test--module1' + separ + 'module1-0.jar'); +assert content.contains(prefix + 'org.nuiton.test--module1' + separ + 'module1-2.txt'); +assert content.contains(prefix + 'org.nuiton.test--module2' + separ + 'module2-0.jar'); +assert content.contains(prefix + 'org.nuiton.test--module2' + separ + 'module2-2.txt'); + // collect-files-3 assert !new File(basedir, 'target/collect3.properties').exists(); assert new File(basedir, 'target/collect3').exists(); Modified: trunk/src/it/collect-files/single/verify.groovy =================================================================== --- trunk/src/it/collect-files/single/verify.groovy 2010-09-08 12:43:36 UTC (rev 757) +++ trunk/src/it/collect-files/single/verify.groovy 2010-09-08 13:40:15 UTC (rev 758) @@ -1,11 +1,14 @@ - // collect-files assert new File(basedir, 'target/collect.properties').exists(); assert !new File(basedir, 'target/collect').exists(); content = new File(basedir, 'target/collect.properties').text; -assert content.contains( 'target/its/collect-files/single/target/collect-files-single-0.jar' ); -assert content.contains( 'target/its/collect-files/single/src/collect-files.txt' ); +separ = File.separator +prefix = 'target' + separ + 'its' + separ + 'collect-files' + separ + 'single' + separ; + +assert content.contains(prefix + 'target' + separ + 'collect-files-single-0.jar'); +assert content.contains(prefix + 'src' + separ + 'collect-files.txt'); + // collect-files-2 assert new File(basedir, 'target/collect2.properties').exists(); assert new File(basedir, 'target/collect2').exists(); @@ -13,9 +16,12 @@ assert new File(basedir, 'target/collect2/org.nuiton.test--collect-files-single/collect-files-2.txt').exists(); content = new File(basedir, 'target/collect2.properties').text; -assert content.contains( 'target/its/collect-files/single/target/collect2/org.nuiton.test--collect-files-single/collect-files-single-0.jar' ); -assert content.contains( 'target/its/collect-files/single/target/collect2/org.nuiton.test--collect-files-single/collect-files-2.txt' ); +prefix = 'target' + separ + 'its' + separ + 'collect-files' + separ + 'single' + separ + 'target' + separ + 'collect2' + separ; + +assert content.contains(prefix + 'org.nuiton.test--collect-files-single' + separ + 'collect-files-single-0.jar'); +assert content.contains(prefix + 'org.nuiton.test--collect-files-single' + separ + 'collect-files-2.txt'); + // collect-files-3 assert !new File(basedir, 'target/collect3.properties').exists(); assert new File(basedir, 'target/collect3').exists(); @@ -25,7 +31,6 @@ assert !new File(basedir, 'target/collect4.properties').exists(); assert !new File(basedir, 'target/collect4').exists(); - // collect-files-5 assert !new File(basedir, 'target/collect5.properties').exists(); assert new File(basedir, 'target/collect5').exists(); @@ -38,7 +43,6 @@ assert !new File(basedir, 'target/collect6.properties').exists(); assert !new File(basedir, 'target/collect6').exists(); - // collect-files-7 assert !new File(basedir, 'target/collect7.properties').exists(); assert !new File(basedir, 'target/collect7').exists();

1 0

r757 - trunk/src/test/java/org/nuiton/plugin
by tchemit＠users.nuiton.org 08 Sep '10

08 Sep '10

Author: tchemit Date: 2010-09-08 14:43:36 +0200 (Wed, 08 Sep 2010) New Revision: 757 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/757 Log: Anomalie #857: Can not execute tests on windows os Modified: trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java trunk/src/test/java/org/nuiton/plugin/PluginHelperTest.java trunk/src/test/java/org/nuiton/plugin/TestHelper.java Modified: trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2010-08-29 14:20:23 UTC (rev 756) +++ trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2010-09-08 12:43:36 UTC (rev 757) @@ -145,8 +145,8 @@ // package with existing class name. String rep = getClass().getPackage().getName() + "." + Introspector.decapitalize(getClass().getSimpleName()); - rep = rep.replaceAll("\\.", File.separator); - File testDir = new File(getTestBasedir(), rep); + String[] paths = rep.split("\\."); + File testDir = TestHelper.getFile(getTestBasedir(), paths); if (isVerbose()) { log.info("test dir = " + getRelativePathFromBasedir(testDir)); } else if (log.isDebugEnabled()) { Modified: trunk/src/test/java/org/nuiton/plugin/PluginHelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/PluginHelperTest.java 2010-08-29 14:20:23 UTC (rev 756) +++ trunk/src/test/java/org/nuiton/plugin/PluginHelperTest.java 2010-09-08 12:43:36 UTC (rev 757) @@ -25,10 +25,13 @@ package org.nuiton.plugin; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; import java.io.File; +import java.net.URISyntaxException; import java.net.URL; /** @@ -39,11 +42,20 @@ */ public class PluginHelperTest { + /** Logger */ + static private Log log = LogFactory.getLog(PluginHelperTest.class); + + protected File getFile() throws URISyntaxException { + URL resource = getClass().getResource("urls.txt"); + File file = new File(resource.toURI().getPath()); + log.info("file to read " + file); + Assert.assertTrue("Could not find file " + file, file.exists()); + return file; + } + @Test public void testGetLines() throws Exception { - URL resource = getClass().getResource("urls.txt"); - File file = new File(resource.getFile()); - Assert.assertTrue(file.exists()); + File file = getFile(); String[] lines = PluginHelper.getLines(file); Assert.assertNotNull(lines); Assert.assertEquals(1, lines.length); @@ -52,9 +64,7 @@ @Test public void testGetLinesAsURL() throws Exception { - URL resource = getClass().getResource("urls.txt"); - File file = new File(resource.getFile()); - Assert.assertTrue(file.exists()); + File file = getFile(); URL[] urls = PluginHelper.getLinesAsURL(file); Assert.assertNotNull(urls); Assert.assertEquals(1, urls.length); @@ -63,9 +73,7 @@ @Test public void testGetLinesAsFiles() throws Exception { - URL resource = getClass().getResource("urls.txt"); - File file = new File(resource.getFile()); - Assert.assertTrue(file.exists()); + File file = getFile(); File[] files = PluginHelper.getLinesAsFiles(file); Assert.assertNotNull(files); Assert.assertEquals(1, files.length); Modified: trunk/src/test/java/org/nuiton/plugin/TestHelper.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/TestHelper.java 2010-08-29 14:20:23 UTC (rev 756) +++ trunk/src/test/java/org/nuiton/plugin/TestHelper.java 2010-09-08 12:43:36 UTC (rev 757) @@ -72,11 +72,10 @@ } public static File getTestDir(Class<?> type, String prefix) { - String rep = type.getName(); - rep = rep.replaceAll("\\.", File.separator); - File f = new File(getBasedir(), prefix); - File testDir = new File(f, rep); + String rep = type.getName(); + String[] paths = rep.split("\\."); + File testDir = getFile(f, paths); return testDir; }

1 0