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

r654 - trunk
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 05:30:57 +0100 (Thu, 07 Jan 2010) New Revision: 654 Modified: trunk/pom.xml Log: use mavenpom javadoc configuration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 03:25:55 UTC (rev 653) +++ trunk/pom.xml 2010-01-07 04:30:57 UTC (rev 654) @@ -329,263 +329,6 @@ </plugin> </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <taglets> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusComponentTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusConfigurationTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusRequirementTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <version>1.5</version> - </plugin> - - </plugins> - </pluginManagement> - </build> @@ -593,253 +336,6 @@ <plugins> <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <taglets> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusComponentTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusConfigurationTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusRequirementTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - <plugin> <artifactId>maven-plugin-plugin</artifactId> <version>2.5.1</version> </plugin>

1 0

r653 - trunk
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 04:25:55 +0100 (Thu, 07 Jan 2010) New Revision: 653 Modified: trunk/pom.xml Log: use mavenpom 1.1.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 20:15:25 UTC (rev 652) +++ trunk/pom.xml 2010-01-07 03:25:55 UTC (rev 653) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4</version> </parent>

1 0

r652 - in tags/maven-helper-plugin-1.2.0/src/it/collect-files: multi single
by tchemit＠users.nuiton.org Jan. 6, 2010

Jan. 6, 2010

Author: tchemit Date: 2010-01-06 21:15:25 +0100 (Wed, 06 Jan 2010) New Revision: 652 Modified: tags/maven-helper-plugin-1.2.0/src/it/collect-files/multi/verify.groovy tags/maven-helper-plugin-1.2.0/src/it/collect-files/single/verify.groovy Log: fix integration tests when a release is performing Modified: tags/maven-helper-plugin-1.2.0/src/it/collect-files/multi/verify.groovy =================================================================== --- tags/maven-helper-plugin-1.2.0/src/it/collect-files/multi/verify.groovy 2010-01-06 20:03:36 UTC (rev 651) +++ tags/maven-helper-plugin-1.2.0/src/it/collect-files/multi/verify.groovy 2010-01-06 20:15:25 UTC (rev 652) @@ -10,12 +10,12 @@ assert !new File(basedir, 'module2/target/collect').exists(); content = new File(basedir, 'target/collect.properties').text; -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/pom.xml' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/src/collect-files.txt' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/module1/target/module1-0.jar' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/module1/src/module1.txt' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/module2/target/module2-0.jar' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/module2/src/module2.txt' ); +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' ); // collect-files-2 assert new File(basedir, 'target/collect2.properties').exists(); @@ -35,12 +35,12 @@ 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( '/maven-helper-plugin/target/its/collect-files/multi/target/collect2/org.nuiton.test--collect-files-multi/pom.xml' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/target/collect2/org.nuiton.test--collect-files-multi/collect-files-2.txt' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/target/collect2/org.nuiton.test--module1/module1-0.jar' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/target/collect2/org.nuiton.test--module1/module1-2.txt' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/target/collect2/org.nuiton.test--module2/module2-0.jar' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/multi/target/collect2/org.nuiton.test--module2/module2-2.txt' ); +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' ); // collect-files-3 assert !new File(basedir, 'target/collect3.properties').exists(); Modified: tags/maven-helper-plugin-1.2.0/src/it/collect-files/single/verify.groovy =================================================================== --- tags/maven-helper-plugin-1.2.0/src/it/collect-files/single/verify.groovy 2010-01-06 20:03:36 UTC (rev 651) +++ tags/maven-helper-plugin-1.2.0/src/it/collect-files/single/verify.groovy 2010-01-06 20:15:25 UTC (rev 652) @@ -3,8 +3,8 @@ 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( '/maven-helper-plugin/target/its/collect-files/single/target/collect-files-single-0.jar' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/single/src/collect-files.txt' ); +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' ); // collect-files-2 assert new File(basedir, 'target/collect2.properties').exists(); @@ -13,8 +13,8 @@ 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( '/maven-helper-plugin/target/its/collect-files/single/target/collect2/org.nuiton.test--collect-files-single/collect-files-single-0.jar' ); -assert content.contains( '/maven-helper-plugin/target/its/collect-files/single/target/collect2/org.nuiton.test--collect-files-single/collect-files-2.txt' ); +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' ); // collect-files-3 assert !new File(basedir, 'target/collect3.properties').exists();

1 0

r651 - trunk
by tchemit＠users.nuiton.org Jan. 6, 2010

Jan. 6, 2010

Author: tchemit Date: 2010-01-06 21:03:36 +0100 (Wed, 06 Jan 2010) New Revision: 651 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 20:03:34 UTC (rev 650) +++ trunk/pom.xml 2010-01-06 20:03:36 UTC (rev 651) @@ -16,7 +16,7 @@  <artifactId>maven-helper-plugin</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <dependencies> @@ -264,9 +264,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

r650 - in tags: . maven-helper-plugin-1.2.0
by tchemit＠users.nuiton.org Jan. 6, 2010

Jan. 6, 2010

Author: tchemit Date: 2010-01-06 21:03:34 +0100 (Wed, 06 Jan 2010) New Revision: 650 Added: tags/maven-helper-plugin-1.2.0/ Log: [maven-scm] copy for tag maven-helper-plugin-1.2.0 Property changes on: tags/maven-helper-plugin-1.2.0 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr *.iws Added: svn:mergeinfo +

1 0

r649 - trunk
by tchemit＠users.nuiton.org Jan. 6, 2010

Jan. 6, 2010

Author: tchemit Date: 2010-01-06 21:03:30 +0100 (Wed, 06 Jan 2010) New Revision: 649 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release maven-helper-plugin-1.2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 19:12:50 UTC (rev 648) +++ trunk/pom.xml 2010-01-06 20:03:30 UTC (rev 649) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -18,7 +16,7 @@  <artifactId>maven-helper-plugin</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0</version> <dependencies> @@ -266,9 +264,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

r648 - in trunk: . src/site src/site/apt
by tchemit＠users.nuiton.org Jan. 6, 2010

Jan. 6, 2010

Author: tchemit Date: 2010-01-06 20:12:50 +0100 (Wed, 06 Jan 2010) New Revision: 648 Added: trunk/src/site/site_en.xml Removed: trunk/src/site/site.xml Modified: trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/apt/mojo-framework.apt trunk/src/site/apt/mojo-usages.apt Log: - Evolution #186: Utilisation de mavenpom - update site documentation Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-03 11:32:36 UTC (rev 647) +++ trunk/pom.xml 2010-01-06 19:12:50 UTC (rev 648) @@ -9,7 +9,13 @@   - <groupId>org.nuiton</groupId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.1.3</version> + </parent> + +  <artifactId>maven-helper-plugin</artifactId> <version>1.2.0-SNAPSHOT</version> @@ -79,6 +85,7 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> <version>1.0-alpha-9-stable-1</version> + <scope>provided</scope> </dependency> <dependency> @@ -241,19 +248,6 @@ <inceptionYear>2009</inceptionYear> <url>http://maven-site.nuiton.org/maven-helper-plugin</url> - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - - <licenses> - <license> - <name>Lesser General Public License (LGPL)</name> - <url>${project.basedir}/LICENSE.txt</url> - <distribution>local</distribution> - </license> - </licenses> - <developers> <developer> <name>Tony Chemit</name> @@ -271,85 +265,12 @@   - <mailingLists> - <mailingList> - <name>maven-helper-plugin-commits</name> - <subscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-commits - </subscribe> - <unsubscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-commits - </unsubscribe> - <post>maven-helper-plugin-commits(a)list.nuiton.org</post> - <archive> - http://list.nuiton.org/pipermail/maven-helper-plugin-commits/ - </archive> - </mailingList> - - <mailingList> - <name>maven-helper-plugin-devel</name> - <subscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-devel - </subscribe> - <unsubscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-devel - </unsubscribe> - <post>maven-helper-plugin-devel(a)list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/maven-helper-plugin-devel/ - </archive> - </mailingList> - - <mailingList> - <name>maven-helper-plugin-users</name> - <subscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-users - </subscribe> - <unsubscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-users - </unsubscribe> - <post>maven-helper-plugin-users(a)list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/maven-helper-plugin-users/ - </archive> - </mailingList> - </mailingLists> - <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/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> - <issueManagement> - <system>Redmine</system> - <url>http://www.nuiton.org/projects/maven-helper-plugin/issues/</url> - </issueManagement> - - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url> - scpexe://nuiton.org/var/lib/redmine-nuiton/project-site/maven-helper-plugin - </url> - </site> - </distributionManagement> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.nuiton.org/hudson/job/maven-helper-plugin</url> - </ciManagement> -    @@ -358,46 +279,14 @@ <properties> - <platform>nuiton.org</platform> - <listId>maven-helper-plugin</listId> - - <license.version>2.0.0</license.version> - <jredmine.version>1.0.0</jredmine.version> - <maven.version>2.2.1</maven.version> <plexusMailSender.version>1.0-alpha-2</plexusMailSender.version> - <javadoc.version>2.6</javadoc.version> - <maven.src.dir>${basedir}/src</maven.src.dir> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8 - </project.reporting.outputEncoding> - - <maven.test.skip>false</maven.test.skip> - <maven.javadoc.skip>false</maven.javadoc.skip> - -  - <maven.reports.generate>true</maven.reports.generate> - - <license.licenseName>lgpl_v3</license.licenseName> - - <repository.home.url>http://maven.nuiton.org/release - </repository.home.url> - -  - <redmine.safe>false</redmine.safe> - <redmine.url>http://www.${platform}</redmine.url> - <redmine.projectId>maven-helper-plugin</redmine.projectId> - <redmine.xmlPath>${basedir}/target/generated-sources/changes/changes.xml - </redmine.xmlPath> - <redmine.issueLinkTemplate>${redmine.url}/issues/show/%ISSUE% - </redmine.issueLinkTemplate> - <redmine.versionLinkTemplate>${redmine.url}/versions/show/%VERSION% - </redmine.versionLinkTemplate> - <redmine.collectedFiles>target/collect.properties - </redmine.collectedFiles> +  + <maven.site.locales>en</maven.site.locales> + </properties> <build> @@ -443,55 +332,11 @@ </plugins> <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.3</version> - <configuration> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <skip>${maven.test.skip}</skip> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>2.1</version> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> - </plugin> - - <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> - <docencoding>${project.reporting.outputEncoding} - </docencoding> - <encoding>${project.reporting.outputEncoding}</encoding> - <charset>${project.reporting.outputEncoding}</charset> - <quiet>true</quiet> - <skip>${maven.javadoc.skip}</skip> <taglets> <taglet> <tagletClass> @@ -736,100 +581,23 @@ </plugin> <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - <configuration> - <locales>fr</locales> - <siteDirectory>src/site</siteDirectory> - <inputEncoding>${project.reporting.outputEncoding} - </inputEncoding> - <outputEncoding>${project.reporting.outputEncoding} - </outputEncoding> - <generateReports>${maven.reports.generate} - </generateReports> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - </plugin> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> - </plugin> - - <plugin> <artifactId>maven-invoker-plugin</artifactId> - <version>1.4</version> + <version>1.5</version> </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <version>${license.version}</version> - </plugin> - - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredmine.version}</version> - </plugin> - + </plugins> </pluginManagement> + </build> <reporting> <plugins> -  <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.1.2</version> - <configuration> - <dependencyDetailsEnabled> - ${maven.reports.dependencyDetailsEnabled} - </dependencyDetailsEnabled> - <dependencyLocationsEnabled> - ${maven.reports.dependencyLocationsEnabled} - </dependencyLocationsEnabled> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>plugin-management</report> - <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> - <quiet>true</quiet> - <skip>${maven.javadoc.skip}</skip> - <docencoding>${project.build.sourceEncoding}</docencoding> - <encoding>${project.build.sourceEncoding}</encoding> - <charset>${project.reporting.outputEncoding}</charset> - <excludePackageNames>${maven.javadoc.excludePackageNames} - </excludePackageNames> <taglets> <taglet> <tagletClass> @@ -1071,75 +839,9 @@ </taglet> </taglets> </configuration> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - <report>test-javadoc</report> - </reports> - </reportSet> - </reportSets> </plugin> -  <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <version>2.1</version> - </plugin> - -  - <plugin> - <artifactId>maven-changes-plugin</artifactId> - <version>2.3</version> - <configuration> - <issueLinkTemplatePerSystem> - <redmine>${redmine.issueLinkTemplate}</redmine> - </issueLinkTemplatePerSystem> - <xmlPath>${redmine.xmlPath}</xmlPath> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> - <configuration> - <encoding>${project.reporting.outputEncoding}</encoding> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkXRef>true</linkXRef> - <sourceEncoding>${project.reporting.outputEncoding} - </sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>${maven.compile.target}</targetJdk> - </configuration> - - </plugin> - - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - </plugin> - - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> - - <plugin> <artifactId>maven-plugin-plugin</artifactId> <version>2.5.1</version> </plugin> @@ -1195,314 +897,32 @@ </executions> </plugin> -  +  <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> + <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>attach-licenses</id> + <id>create-assemblies</id> + <phase>package</phase> <goals> - <goal>add-license</goal> - <goal>add-third-party</goal> + <goal>single</goal> </goals> </execution> </executions> - </plugin> - - </plugins> - </build> - </profile> - -  - <profile> - <id>redmine-pre-release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <properties> - <redmine.safe>true</redmine.safe> - </properties> - - <reporting> - <plugins> - - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredmine.version}</version> <configuration> - <columnNames> - key,summary,status,assignee,tracker,priority,version,category,createdOn - </columnNames> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> </configuration> - <reportSets> - <reportSet> - <reports> - <report>issues-report</report> - </reports> - </reportSet> - </reportSets> </plugin> </plugins> - </reporting> - <build> - - <plugins> - -  - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>1.1.0</version> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>initialize</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <execution> - <id>get-redmine-login-site</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>pre-site</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <execution> - <id>collect-files</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>install</phase> - <configuration> - <extraFiles/> - <descriptionFile>${redmine.collectedFiles} - </descriptionFile> - </configuration> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <executions> - <execution> - <id>jredmine-generate</id> - <goals> - <goal>generate-changes</goal> - <goal>generate-news-announcement</goal> - <goal>generate-email-announcement</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - <configuration> - -  - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2</actionMapping> - <statusIds>3,4,5</statusIds> - -  - <urlDownload> - ${redmine.url}/projects/list_files/maven-helper-plugin - </urlDownload> - -  -  -  - </configuration> - </plugin> - - </plugins> - </build> </profile> -  <profile> - <id>redmine-release-profile</id> - <activation> - <property> - <name>performRedmineRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - <dryRun>true</dryRun> - <redmine.dryRun>${dryRun}</redmine.dryRun> - </properties> - <build> - - <plugins> - -  - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>1.1.0</version> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>validate</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <execution> - <id>send-release-email</id> - <goals> - <goal>send-email</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <configuration> - -  - <runOnce>true</runOnce> - - <emailTitle>[ANNOUNCEMENT] - ${project.artifactId} - ${project.version} released - </emailTitle> - <emailContentFile> - target/generated-sources/announcement/release-email-announcement.vm - </emailContentFile> - <mailSender> - <name>${platform} Release Notification</name> - <email>noreply@${platform}</email> - </mailSender> - <toAddresses> - <item>${listId}-users(a)list.${platform}</item> - <item>${listId}-devel(a)list.${platform}</item> - <item>dev(a)codelutin.com</item> - </toAddresses> - <smtpHost>smtp</smtpHost> - </configuration> - </plugin> - -  - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <executions> - <execution> - <id>jredmine-release</id> - <goals> - <goal>update-version</goal> - <goal>publish-attachments</goal> - <goal>publish-news</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <configuration> - -  - <runOnce>true</runOnce> - -  - <closeVersion>true</closeVersion> - -  - <filesFromProperties>${redmine.collectedFiles} - </filesFromProperties> - -  - <newsContentFile> - target/generated-sources/announcement/release-news-announcement.vm - </newsContentFile> - <newsSummary>${project.description}</newsSummary> - <newsTitle>${project.artifactId} ${project.version} - released - </newsTitle> - - </configuration> - </plugin> - - </plugins> - - </build> - </profile> - -  - <profile> - <id>notests</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - </profile> -  - <profile> - <id>noreports</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.generate>false</maven.reports.generate> - </properties> - </profile> -  - <profile> - <id>nodepdetails</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.dependencyDetailsEnabled>false - </maven.reports.dependencyDetailsEnabled> - </properties> - </profile> -  - <profile> - <id>nodeplocations</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.dependencyLocationsEnabled>false - </maven.reports.dependencyLocationsEnabled> - </properties> - </profile> - - <profile> <id>run-its</id> <activation> <property> @@ -1516,21 +936,15 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>collect-files/single/pom.xml - </pomInclude> - <pomInclude>collect-files/multi/pom.xml - </pomInclude> - <pomInclude>send-email/single/pom.xml - </pomInclude> - <pomInclude>share-server-secret/single/pom.xml - </pomInclude> + <pomInclude>collect-files/single/pom.xml</pomInclude> + <pomInclude>collect-files/multi/pom.xml</pomInclude> + <pomInclude>send-email/single/pom.xml</pomInclude> + <pomInclude>share-server-secret/single/pom.xml</pomInclude> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo - </localRepositoryPath> + <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its - </cloneProjectsTo> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> </configuration> <executions> <execution> @@ -1539,7 +953,6 @@ <goal>install</goal> <goal>run</goal> </goals> - <phase>integration-test</phase> </execution> </executions> </plugin> Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-01-03 11:32:36 UTC (rev 647) +++ trunk/src/site/apt/index.apt 2010-01-06 19:12:50 UTC (rev 648) @@ -29,8 +29,6 @@ * {{{share-server-secret-mojo.html} helper:share-server-secret}} to expose a server secret data in project. - * {{{generate-site-index-mojo.html} helper:generate-site-index}} to generate a simple redirect index.html page when using the symetric layout in site plugin. - Consult the {{{mojo-usages.html}usages}} page to have more details of mojos. Consult the {{{mojo-examples.html}examples}} page to have some examples of mojos. Modified: trunk/src/site/apt/mojo-framework.apt =================================================================== --- trunk/src/site/apt/mojo-framework.apt 2010-01-03 11:32:36 UTC (rev 647) +++ trunk/src/site/apt/mojo-framework.apt 2010-01-06 19:12:50 UTC (rev 648) @@ -27,11 +27,19 @@ There is some filtering methods : * <<checkPackaging>> to test if can perform mojo for the project's packaging. + - * <<init>> : initialize the mojo, and return <<true>> if can execute the mojo. + * <<init>> : initialize the mojo, throw an error if any problem. + * <<checkSkip>> to test if can skip mojo execution (since 1.2.0) + The core method is the <<doAction>> one, put there your logic. + Note: since version 1.2.0 the <<doAction>> method will only be executed if the + mojo must be executed. you should no more do some tests here to know if the + mojo can be skip. + + Usefull methods The <<org.nuiton.plugin.AbstractPlugin>> contains some usefull methods to work Modified: trunk/src/site/apt/mojo-usages.apt =================================================================== --- trunk/src/site/apt/mojo-usages.apt 2010-01-03 11:32:36 UTC (rev 647) +++ trunk/src/site/apt/mojo-usages.apt 2010-01-06 19:12:50 UTC (rev 648) @@ -130,26 +130,3 @@ </executions> </plugin> ------------------------------------------------------------------------------ - -generate-site-index - - This goal generate a simple redirect index.html page when using the symetric layout in site. - - This will generates by default a index.html in <<target/site>> directory which will redirect to the default locale site. - ------------------------------------------------------------------------------- -<plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate-site-index</goal> - </goals> - <configuration> - <locales>${maven.site.locales}</locales> - </configuration> - </execution> - </executions> -</plugin> ------------------------------------------------------------------------------- Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-01-03 11:32:36 UTC (rev 647) +++ trunk/src/site/site.xml 2010-01-06 19:12:50 UTC (rev 648) @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - </poweredBy> - - <body> - <links> - <item name="Chorem" href="http://www.chorem.org"/> - <item name="Nuiton" href="http://www.nuiton.org"/> - <item name="Labs" href="http://labs.libre-entreprise.org"/> - <item name="${project.organization.name}" href="${project.organization.url}"/> - <item name="Dépôt maven" href="${repository.home.url}"/> - </links> - - <breadcrumbs> - <item name="Nuiton" href="http://www.nuiton.org" /> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu name="Utilisateur"> - <item name="Introduction" href="index.html"/> - <item name="Goals" href="plugin-info.html"> - <item name="collect-files" href="collect-files-mojo.html"/> - <item name="share-server-secret" href="share-server-secret-mojo.html"/> - <item name="send-email" href="send-email-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - <item name="Mojo usages" href="mojo-usages.html"/> - <item name="Mojo examples" href="mojo-examples.html"/> - </menu> - - <menu name="Développeur"> - <item name="Mojo framework" href="mojo-framework.html"/> - <item name="Mojo test framework" href="mojo-testFramework.html"/> - <item name="A faire" href="Todo.html"/> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-tests.jar" - name="Test Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-test-javadoc.jar" - name="Test Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-test-sources.jar" - name="Test Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/src/site/site_en.xml (from rev 647, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_en.xml (rev 0) +++ trunk/src/site/site_en.xml 2010-01-06 19:12:50 UTC (rev 648) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu name="User"> + <item name="Introduction" href="index.html"/> + <item name="Goals" href="plugin-info.html"> + <item name="collect-files" href="collect-files-mojo.html"/> + <item name="share-server-secret" href="share-server-secret-mojo.html"/> + <item name="send-email" href="send-email-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + <item name="Mojo usages" href="mojo-usages.html"/> + <item name="Mojo examples" href="mojo-examples.html"/> + </menu> + + <menu name="Developer"> + <item name="Mojo framework" href="mojo-framework.html"/> + <item name="Mojo test framework" href="mojo-testFramework.html"/> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu name="Download"> + <item href="http://nuiton.org/projects/list_files/maven-helper-plugin" name="Sources bundles"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-tests.jar" + name="Test Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-test-javadoc.jar" + name="Test Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-test-sources.jar" + name="Test Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project>

1 0

r647 - trunk/src/main/java/org/nuiton/io/rest
by tchemit＠users.nuiton.org Jan. 3, 2010

Jan. 3, 2010

Author: tchemit Date: 2010-01-03 12:32:36 +0100 (Sun, 03 Jan 2010) New Revision: 647 Modified: trunk/src/main/java/org/nuiton/io/rest/RestClientConfiguration.java Log: javadoc Modified: trunk/src/main/java/org/nuiton/io/rest/RestClientConfiguration.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestClientConfiguration.java 2010-01-03 10:42:16 UTC (rev 646) +++ trunk/src/main/java/org/nuiton/io/rest/RestClientConfiguration.java 2010-01-03 11:32:36 UTC (rev 647) @@ -87,7 +87,7 @@ /** * - * @param anonymous the flat anonymous to set + * @param anonymous the flag anonymous to set */ void setAnonymous(boolean anonymous); }

1 0

r646 - trunk/src/main/java/org/nuiton/io/rest
by tchemit＠users.nuiton.org Jan. 3, 2010

Jan. 3, 2010

Author: tchemit Date: 2010-01-03 11:42:16 +0100 (Sun, 03 Jan 2010) New Revision: 646 Modified: trunk/src/main/java/org/nuiton/io/rest/DefaultRestClientConfiguration.java trunk/src/main/java/org/nuiton/io/rest/RestClientConfiguration.java trunk/src/main/java/org/nuiton/io/rest/RestSession.java Log: add a flag anonymous in RestClientConfiguration add better log reformat Modified: trunk/src/main/java/org/nuiton/io/rest/DefaultRestClientConfiguration.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/DefaultRestClientConfiguration.java 2010-01-03 10:09:05 UTC (rev 645) +++ trunk/src/main/java/org/nuiton/io/rest/DefaultRestClientConfiguration.java 2010-01-03 10:42:16 UTC (rev 646) @@ -20,11 +20,11 @@ */ package org.nuiton.io.rest; -import java.net.URL; - import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import java.net.URL; + /** * Default implementation of a {@link RestClientConfiguration}. * @@ -37,6 +37,7 @@ String restUsername; String restPassword; boolean verbose; + boolean anonymous; String encoding; @Override @@ -89,12 +90,25 @@ this.verbose = verbose; } + public boolean isAnonymous() { + return anonymous; + } + + public void setAnonymous(boolean anonymous) { + this.anonymous = anonymous; + } + @Override public String toString() { ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE); b.append("redmineUrl", restUrl); - b.append("redmineUsername", restUsername); - b.append("redminePassword", "***"); + if (anonymous) { + + b.append("anonymous", anonymous); + } else { + b.append("redmineUsername", restUsername); + b.append("redminePassword", "***"); + } b.append("encoding", encoding); b.append("verbose", verbose); return b.toString(); Modified: trunk/src/main/java/org/nuiton/io/rest/RestClientConfiguration.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestClientConfiguration.java 2010-01-03 10:09:05 UTC (rev 645) +++ trunk/src/main/java/org/nuiton/io/rest/RestClientConfiguration.java 2010-01-03 10:42:16 UTC (rev 646) @@ -55,6 +55,12 @@ boolean isVerbose(); /** + * + * @return {@code true} if rest client does not need login + */ + boolean isAnonymous(); + + /** * @param restUrl the url of server to set */ void setRestUrl(URL restUrl); @@ -78,4 +84,10 @@ * @param verbose the flag verbose to set */ void setVerbose(boolean verbose); + + /** + * + * @param anonymous the flat anonymous to set + */ + void setAnonymous(boolean anonymous); } Modified: trunk/src/main/java/org/nuiton/io/rest/RestSession.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2010-01-03 10:09:05 UTC (rev 645) +++ trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2010-01-03 10:42:16 UTC (rev 646) @@ -100,7 +100,7 @@ } if (statusCode != HttpStatus.SC_OK) { - log.error(gm.getResponseBodyAsString()); + log.error("Error = "+gm.getResponseBodyAsString()); releaseConnection(getConnection()); throw new RestException("Got error code <" + statusCode + ":" + sl.getReasonPhrase() + "> on " + gm.getPath()); }

1 0

r645 - trunk/src/main/java/org/nuiton/io/xpp3
by tchemit＠users.nuiton.org Jan. 3, 2010

Jan. 3, 2010

Author: tchemit Date: 2010-01-03 11:09:05 +0100 (Sun, 03 Jan 2010) New Revision: 645 Modified: trunk/src/main/java/org/nuiton/io/xpp3/Xpp3Helper.java Log: add log in Xpp3Helper Modified: trunk/src/main/java/org/nuiton/io/xpp3/Xpp3Helper.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/Xpp3Helper.java 2010-01-01 18:47:47 UTC (rev 644) +++ trunk/src/main/java/org/nuiton/io/xpp3/Xpp3Helper.java 2010-01-03 10:09:05 UTC (rev 645) @@ -25,6 +25,8 @@ import java.beans.Introspector; import java.beans.PropertyDescriptor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -55,8 +57,11 @@ * @since 1.0.3 */ public class Xpp3Helper { - /** + * Logger + */ + private static final Log log = LogFactory.getLog(Xpp3Helper.class); + /** * les readers enregistres via un {@link ServiceLoader} * sur le contrat {@link Xpp3Reader}. */ @@ -97,7 +102,9 @@ IOUtil.copy(reader, sWriter); String rawInput = sWriter.toString(); - + if (log.isDebugEnabled()) { + log.debug("content to read : \n"+rawInput); + } StringReader sReader = new StringReader(rawInput); result = modelReader.read(sReader); @@ -144,7 +151,9 @@ IOUtil.copy(reader, sWriter); String rawInput = sWriter.toString(); - + if (log.isDebugEnabled()) { + log.debug("content to read : \n"+rawInput); + } StringReader sReader = new StringReader(rawInput); result = modelReader.readArray(sReader);

1 0