Author: tchemit Date: 2010-06-19 16:22:59 +0200 (Sat, 19 Jun 2010) New Revision: 723 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/723 Log: - improve documentation - improve its - finalize check-auto-container goal Added: trunk/src/it/check-auto-container/ trunk/src/it/check-auto-container/central/ 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/ 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/ 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 Modified: trunk/pom.xml trunk/src/it/collect-files/multi/pom.xml trunk/src/it/collect-files/single/pom.xml trunk/src/it/send-email/single/pom.xml trunk/src/it/settings.xml trunk/src/it/share-server-secret/single/pom.xml trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java trunk/src/site/apt/index.apt trunk/src/site/apt/mojo-examples.apt trunk/src/site/apt/mojo-usages.apt trunk/src/site/site_en.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/pom.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -328,13 +328,11 @@ <plexusMailSender.version>1.0-alpha-2</plexusMailSender.version> - <javadoc.version>2.7</javadoc.version> - <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> <!-- documention is in english --> - <siteLocales>en</siteLocales> + <locales>en</locales> <!-- documentation is in apt --> <siteSourcesType>apt</siteSourcesType> @@ -470,6 +468,7 @@ </activation> <build> + <defaultGoal>package</defaultGoal> <plugins> <!-- build release zip files --> @@ -508,12 +507,16 @@ </property> </activation> <build> + <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> <!--<pomInclude>**/pom.xml</pomInclude>--> + <pomInclude>check-auto-container/unsafe-central/pom.xml</pomInclude> + <pomInclude>check-auto-container/central/pom.xml</pomInclude> + <pomInclude>check-auto-container/nuiton-other-releases/pom.xml</pomInclude> <pomInclude>collect-files/multi/pom.xml</pomInclude> <pomInclude>collect-files/single/pom.xml</pomInclude> <pomInclude>send-email/single/pom.xml</pomInclude> Added: trunk/src/it/check-auto-container/central/invoker.properties =================================================================== --- trunk/src/it/check-auto-container/central/invoker.properties (rev 0) +++ trunk/src/it/check-auto-container/central/invoker.properties 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=validate + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=its,jdk15 + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Property changes on: trunk/src/it/check-auto-container/central/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/check-auto-container/central/pom.xml =================================================================== --- trunk/src/it/check-auto-container/central/pom.xml (rev 0) +++ trunk/src/it/check-auto-container/central/pom.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,72 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>check-auto-container-central</artifactId> + <version>0</version> + + <name>check-auto-container-central</name> + <description>check all dependencies are in central.</description> + + <url>http://www.foo.com</url> + + <properties> + + <pluginVersion>@pom.version@</pluginVersion> + + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + </properties> + + <dependencies> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + + </dependencies> + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${pluginVersion}</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <phase>validate</phase> + <configuration> + <addMavenCentral>true</addMavenCentral> + <failIfNotSafe>true</failIfNotSafe> + <verbose>true</verbose> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + +</project> Property changes on: trunk/src/it/check-auto-container/central/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/check-auto-container/central/verify.groovy =================================================================== --- trunk/src/it/check-auto-container/central/verify.groovy (rev 0) +++ trunk/src/it/check-auto-container/central/verify.groovy 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,2 @@ + +return true; Property changes on: trunk/src/it/check-auto-container/central/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/check-auto-container/nuiton-other-releases/invoker.properties =================================================================== --- trunk/src/it/check-auto-container/nuiton-other-releases/invoker.properties (rev 0) +++ trunk/src/it/check-auto-container/nuiton-other-releases/invoker.properties 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=validate + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +invoker.profiles=nuiton-other-releases + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Property changes on: trunk/src/it/check-auto-container/nuiton-other-releases/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/check-auto-container/nuiton-other-releases/pom.xml =================================================================== --- trunk/src/it/check-auto-container/nuiton-other-releases/pom.xml (rev 0) +++ trunk/src/it/check-auto-container/nuiton-other-releases/pom.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,83 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>check-auto-container-nuiton-other-releases</artifactId> + <version>0</version> + + <name>check-auto-container-nuiton-other-releases</name> + <description>check a dependencies is not in central.</description> + + <url>http://www.foo.com</url> + + <properties> + + <pluginVersion>@pom.version@</pluginVersion> + + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + </properties> + + <dependencies> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + + <dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>jregex</artifactId> + <version>1.2_01</version> + </dependency> + + </dependencies> + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${pluginVersion}</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <phase>validate</phase> + <configuration> + <addMavenCentral>true</addMavenCentral> + <failIfNotSafe>true</failIfNotSafe> + <verbose>true</verbose> + <repositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-other-releases + </nuiton-central-releases> + </repositories> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + +</project> Property changes on: trunk/src/it/check-auto-container/nuiton-other-releases/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/check-auto-container/nuiton-other-releases/verify.groovy =================================================================== --- trunk/src/it/check-auto-container/nuiton-other-releases/verify.groovy (rev 0) +++ trunk/src/it/check-auto-container/nuiton-other-releases/verify.groovy 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,2 @@ + +return true; Property changes on: trunk/src/it/check-auto-container/nuiton-other-releases/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/check-auto-container/unsafe-central/invoker.properties =================================================================== --- trunk/src/it/check-auto-container/unsafe-central/invoker.properties (rev 0) +++ trunk/src/it/check-auto-container/unsafe-central/invoker.properties 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=validate + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +invoker.profiles=nuiton-other-releases + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +invoker.buildResult=failure + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Property changes on: trunk/src/it/check-auto-container/unsafe-central/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/check-auto-container/unsafe-central/pom.xml =================================================================== --- trunk/src/it/check-auto-container/unsafe-central/pom.xml (rev 0) +++ trunk/src/it/check-auto-container/unsafe-central/pom.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,79 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>check-auto-container-unsafe-central</artifactId> + <version>0</version> + + <name>check-auto-container-unsafe-central</name> + <description>check all dependencies are in central.</description> + + <url>http://www.foo.com</url> + + <properties> + + <pluginVersion>@pom.version@</pluginVersion> + + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + </properties> + + + <dependencies> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + + <dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>jregex</artifactId> + <version>1.2_01</version> + </dependency> + + </dependencies> + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${pluginVersion}</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <phase>validate</phase> + <configuration> + <verbose>true</verbose> + <addMavenCentral>true</addMavenCentral> + <failIfNotSafe>true</failIfNotSafe> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + +</project> Property changes on: trunk/src/it/check-auto-container/unsafe-central/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/check-auto-container/unsafe-central/verify.groovy =================================================================== --- trunk/src/it/check-auto-container/unsafe-central/verify.groovy (rev 0) +++ trunk/src/it/check-auto-container/unsafe-central/verify.groovy 2010-06-19 14:22:59 UTC (rev 723) @@ -0,0 +1,2 @@ + +return true; Property changes on: trunk/src/it/check-auto-container/unsafe-central/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/it/collect-files/multi/pom.xml =================================================================== --- trunk/src/it/collect-files/multi/pom.xml 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/it/collect-files/multi/pom.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -28,14 +28,15 @@ </properties> + <distributionManagement> <repository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/release</url> + <id>demo</id> + <url>scpexe://nuiton.org/yo/release</url> </repository> <snapshotRepository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/snapshot</url> + <id>demo</id> + <url>scpexe://nuiton.org/yo/snapshot</url> </snapshotRepository> </distributionManagement> Modified: trunk/src/it/collect-files/single/pom.xml =================================================================== --- trunk/src/it/collect-files/single/pom.xml 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/it/collect-files/single/pom.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -1,161 +1,161 @@ <?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"> + 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> - <groupId>org.nuiton.test</groupId> - <artifactId>collect-files-single</artifactId> - <version>0</version> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>collect-files-single</artifactId> + <version>0</version> - <name>Collect-files single</name> - <packaging>jar</packaging> - <description>collect-files Test plugin for a single module.</description> - - <url>http://www.foo.com</url> - - <properties> + <name>Collect-files single</name> + <packaging>jar</packaging> + <description>collect-files Test plugin for a single module.</description> - <pluginVersion>@pom.version@</pluginVersion> + <url>http://www.foo.com</url> - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <properties> - </properties> + <pluginVersion>@pom.version@</pluginVersion> - <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> - </distributionManagement> + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <build> + </properties> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${pluginVersion}</version> - </plugin> - </plugins> - </pluginManagement> + <distributionManagement> + <repository> + <id>demo</id> + <url>scpexe://nuiton.org/yo/release</url> + </repository> + <snapshotRepository> + <id>demo</id> + <url>scpexe://nuiton.org/yo/snapshot</url> + </snapshotRepository> + </distributionManagement> - <plugins> + <build> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>collect-files</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <verbose>true</verbose> - <extraFiles>${basedir}/src/collect-files.txt</extraFiles> - <descriptionFile>target/collect.properties</descriptionFile> - <copyFiles>false</copyFiles> - </configuration> - </execution> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${pluginVersion}</version> + </plugin> + </plugins> + </pluginManagement> - <execution> - <id>collect-files-2</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <extraFiles>${basedir}/src/collect-files-2.txt</extraFiles> - <outputDirectory>target/collect2</outputDirectory> - <descriptionFile>target/collect2.properties</descriptionFile> - <copyFiles>true</copyFiles> - </configuration> - </execution> + <plugins> - <execution> - <id>collect-files-3</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <outputDirectory>target/collect3</outputDirectory> - <copyFiles>true</copyFiles> - </configuration> - </execution> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <verbose>true</verbose> + <extraFiles>${basedir}/src/collect-files.txt</extraFiles> + <descriptionFile>target/collect.properties</descriptionFile> + <copyFiles>false</copyFiles> + </configuration> + </execution> - <execution> - <id>collect-files-4</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>compile</phase> - <configuration> - <outputDirectory>target/collect3</outputDirectory> - <copyFiles>true</copyFiles> - </configuration> - </execution> + <execution> + <id>collect-files-2</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <extraFiles>${basedir}/src/collect-files-2.txt</extraFiles> + <outputDirectory>target/collect2</outputDirectory> + <descriptionFile>target/collect2.properties</descriptionFile> + <copyFiles>true</copyFiles> + </configuration> + </execution> - <execution> - <id>collect-files-5</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <includeAttached>false</includeAttached> - <outputDirectory>target/collect5</outputDirectory> - <extraFiles>${basedir}/src/collect-files.txt, - ${basedir}/src/collect-files-2.txt - </extraFiles> - <copyFiles>true</copyFiles> - </configuration> - </execution> + <execution> + <id>collect-files-3</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <outputDirectory>target/collect3</outputDirectory> + <copyFiles>true</copyFiles> + </configuration> + </execution> - <execution> - <id>collect-files-6</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <dryRun>true</dryRun> - <outputDirectory>target/collect6</outputDirectory> - <extraFiles>${basedir}/src/collect-files.txt, - ${basedir}/src/collect-files-2.txt - </extraFiles> - <copyFiles>true</copyFiles> - </configuration> - </execution> + <execution> + <id>collect-files-4</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>compile</phase> + <configuration> + <outputDirectory>target/collect3</outputDirectory> + <copyFiles>true</copyFiles> + </configuration> + </execution> - <execution> - <id>collect-files-7</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <skip>true</skip> - <outputDirectory>target/collect7</outputDirectory> - <extraFiles>${basedir}/src/collect-files.txt, - ${basedir}/src/collect-files-2.txt - </extraFiles> - <copyFiles>true</copyFiles> - </configuration> - </execution> - </executions> - </plugin> + <execution> + <id>collect-files-5</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <includeAttached>false</includeAttached> + <outputDirectory>target/collect5</outputDirectory> + <extraFiles>${basedir}/src/collect-files.txt, + ${basedir}/src/collect-files-2.txt + </extraFiles> + <copyFiles>true</copyFiles> + </configuration> + </execution> - </plugins> + <execution> + <id>collect-files-6</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <dryRun>true</dryRun> + <outputDirectory>target/collect6</outputDirectory> + <extraFiles>${basedir}/src/collect-files.txt, + ${basedir}/src/collect-files-2.txt + </extraFiles> + <copyFiles>true</copyFiles> + </configuration> + </execution> - </build> - + <execution> + <id>collect-files-7</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <skip>true</skip> + <outputDirectory>target/collect7</outputDirectory> + <extraFiles>${basedir}/src/collect-files.txt, + ${basedir}/src/collect-files-2.txt + </extraFiles> + <copyFiles>true</copyFiles> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </project> Modified: trunk/src/it/send-email/single/pom.xml =================================================================== --- trunk/src/it/send-email/single/pom.xml 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/it/send-email/single/pom.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -1,55 +1,56 @@ <?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"> + 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> - <groupId>org.nuiton.test</groupId> - <artifactId>single</artifactId> - <version>0</version> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>single</artifactId> + <version>0</version> - <name>Maven-helper-plugin single</name> - <packaging>jar</packaging> - <description>Maven helper plugin for a single module.</description> - - <url>http://www.foo.com</url> - - <properties> + <name>Maven-helper-plugin single</name> + <packaging>jar</packaging> + <description>Maven helper plugin for a single module.</description> - <pluginVersion>@pom.version@</pluginVersion> + <url>http://www.foo.com</url> - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - </properties> - - <build> + <properties> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${pluginVersion}</version> - <configuration> - <!-- Send nothing ! --> - <dryRun>true</dryRun> + <pluginVersion>@pom.version@</pluginVersion> - <emailTitle>[TEST] - ${project.name} ${project.version} send-email</emailTitle> - <emailContentFile>emailContent.txt</emailContentFile> - <mailSender> - <name>Nuiton Release Notification</name> - <email>noreply@noway.fr</email> - </mailSender> - <toAddresses> - <item>try@noway.fr</item> - </toAddresses> - <smtpHost>smtp</smtpHost> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </build> - + </properties> + + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${pluginVersion}</version> + <configuration> + <!-- Send nothing ! --> + <dryRun>true</dryRun> + + <emailTitle>[TEST] - ${project.name} ${project.version} send-email + </emailTitle> + <emailContentFile>emailContent.txt</emailContentFile> + <mailSender> + <name>Nuiton Release Notification</name> + <email>noreply@noway.fr</email> + </mailSender> + <toAddresses> + <item>try@noway.fr</item> + </toAddresses> + <smtpHost>smtp</smtpHost> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + </build> + </project> Modified: trunk/src/it/settings.xml =================================================================== --- trunk/src/it/settings.xml 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/it/settings.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -21,56 +21,75 @@ <settings> - <servers> + <servers> - <server> - <id>serverOne</id> - <username>serverOne-username</username> - <password>serverOne-password</password> - <passphrase>serverOne-passphrase</passphrase> - <privateKey>serverOne-privateKey</privateKey> - </server> + <server> + <id>serverOne</id> + <username>serverOne-username</username> + <password>serverOne-password</password> + <passphrase>serverOne-passphrase</passphrase> + <privateKey>serverOne-privateKey</privateKey> + </server> - <server> - <id>serverTwo</id> - <username>serverTwo-username</username> - <password>serverTwo-password</password> - <passphrase>serverTwo-passphrase</passphrase> - <privateKey>serverTwo-privateKey</privateKey> - </server> + <server> + <id>serverTwo</id> + <username>serverTwo-username</username> + <password>serverTwo-password</password> + <passphrase>serverTwo-passphrase</passphrase> + <privateKey>serverTwo-privateKey</privateKey> + </server> - </servers> + </servers> + + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> - <profiles> - <profile> - <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>local.central</id> - <url>file:///@localRepository@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>local.central</id> - <url>file:///@localRepository@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> + <profile> + <id>nuiton-other-releases</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + + <repositories> + <repository> + <id>nuiton-other-releases</id> + <url> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-other-releases + </url> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + </profile> + </profiles> </settings> Modified: trunk/src/it/share-server-secret/single/pom.xml =================================================================== --- trunk/src/it/share-server-secret/single/pom.xml 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/it/share-server-secret/single/pom.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -1,100 +1,100 @@ <?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"> + 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> - <groupId>org.nuiton.test</groupId> - <artifactId>single</artifactId> - <version>0</version> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>single</artifactId> + <version>0</version> - <name>Maven-helper-plugin single</name> - <packaging>pom</packaging> - <description>Maven helper plugin for a single module.</description> + <name>Maven-helper-plugin single</name> + <packaging>pom</packaging> + <description>Maven helper plugin for a single module.</description> - <url>http://www.foo.com</url> + <url>http://www.foo.com</url> - <properties> + <properties> - <pluginVersion>@pom.version@</pluginVersion> + <pluginVersion>@pom.version@</pluginVersion> - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + </properties> - <build> + <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${pluginVersion}</version> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${pluginVersion}</version> + </plugin> + </plugins> + </pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-server-one</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <configuration> - <serverId>serverOne</serverId> - <usernameOut>username</usernameOut> - <passwordOut>password</passwordOut> - <passphraseOut>passphrase</passphraseOut> - <privateKeyOut>privateKey</privateKeyOut> - </configuration> - </execution> - <execution> - <id>get-server-two</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <configuration> - <serverId>serverTwo</serverId> - <usernameOut>username2</usernameOut> - <passwordOut>password2</passwordOut> - <passphraseOut>passphrase2</passphraseOut> - <privateKeyOut>privateKey2</privateKeyOut> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <phase>initialize</phase> - <configuration> - <tasks> - <echo message="username = ${username}"/> - <echo message="password = ${password}"/> - <echo message="passphrase = ${passphrase}"/> - <echo message="privateKey = ${privateKey}"/> - <echo message="username2 = ${username2}"/> - <echo message="password2 = ${password2}"/> - <echo message="passphrase2 = ${passphrase2}"/> - <echo message="privateKey2 = ${privateKey2}"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-server-one</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <configuration> + <serverId>serverOne</serverId> + <usernameOut>username</usernameOut> + <passwordOut>password</passwordOut> + <passphraseOut>passphrase</passphraseOut> + <privateKeyOut>privateKey</privateKeyOut> + </configuration> + </execution> + <execution> + <id>get-server-two</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <configuration> + <serverId>serverTwo</serverId> + <usernameOut>username2</usernameOut> + <passwordOut>password2</passwordOut> + <passphraseOut>passphrase2</passphraseOut> + <privateKeyOut>privateKey2</privateKeyOut> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <phase>initialize</phase> + <configuration> + <tasks> + <echo message="username = ${username}"/> + <echo message="password = ${password}"/> + <echo message="passphrase = ${passphrase}"/> + <echo message="privateKey = ${privateKey}"/> + <echo message="username2 = ${username2}"/> + <echo message="password2 = ${password2}"/> + <echo message="passphrase2 = ${passphrase2}"/> + <echo message="privateKey2 = ${privateKey2}"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> - - </plugins> - </build> + </plugins> + </build> + </project> Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2010-06-19 14:22:59 UTC (rev 723) @@ -54,9 +54,10 @@ import java.util.TreeMap; /** - * Check all dependencies are in central repository. + * Check all dependencies are auto contained in the given repositories. * * @author tchemit <chemit@codelutin.com> + * @version $Id$ * @goal check-auto-container * @phase validate * @requiresProject true @@ -67,7 +68,7 @@ public class CheckAutoContainerPlugin extends AbstractPlugin { /** - * Map of remote repositories to use. + * Map of repositories to use. * <p/> * Keys are repository id and Values are repository url. * @@ -77,7 +78,7 @@ protected Map<String, String> repositories; /** - * A flag to add as maven central remote repository http://repo1.maven.org/maven2 + * A flag to add the maven central repository http://repo1.maven.org/maven2 * to {@link #repositories}. * * @parameter expression="${addMavenCentral}" default-value="false" @@ -86,7 +87,7 @@ protected boolean addMavenCentral; /** - * A flag to fail if project is not central safe. + * A flag to fail if project is not auto container. * * @parameter expression="${helper.failIfNotSafe}" default-value="false" * @since 1.2.5 @@ -112,7 +113,7 @@ protected MavenProject project; /** - * The projects in the reactor (used to detected sibling dependencies). + * The projects in reactor (used to detected sibling dependencies). * * @parameter expression="${reactorProjects}" * @readonly @@ -121,7 +122,7 @@ protected List<?> reactorProjects; /** - * Active proxy from settings. + * Active proxy from settings (if any). * * @parameter default-value="${settings.activeProxy}" * @required @@ -131,7 +132,7 @@ protected Proxy proxy; /** - * Local Repository. + * Local repository. * * @parameter expression="${localRepository}" * @required @@ -141,30 +142,40 @@ protected ArtifactRepository localRepository; /** + * Artifact repository factory component. + * * @component + * @required * @readonly * @since 1.2.5 */ protected ArtifactRepositoryFactory artifactRepositoryFactory; /** - * Artifact Factory component. + * Artifact factory component. * * @component + * @required * @readonly * @since 1.2.5 */ protected ArtifactFactory factory; /** + * Artifact resolver component. + * * @component + * @required * @readonly * @since 1.2.5 */ protected ArtifactResolver resolver; /** + * Wagon manager component. + * * @component + * @required * @readonly * @since 1.2.5 */ @@ -282,7 +293,7 @@ if (found.isEmpty()) { message = "No artifact resolved by the repository " + url; } else { - message = found.size() + " artifact(s) resolved by repository " + url; + message = String.format("%1$4s artifact(s) resolved by repository %2$s", found.size(), url); } log.info(message); artifacts.removeAll(found); Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/site/apt/index.apt 2010-06-19 14:22:59 UTC (rev 723) @@ -54,6 +54,8 @@ * {{{./share-server-secret-mojo.html} helper:share-server-secret}} to expose a server secret data in project. + * {{{./check-auto-container-mojo.html} helper:check-auto-container}} to check if project is auto-contained in some repositories. + 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-examples.apt =================================================================== --- trunk/src/site/apt/mojo-examples.apt 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/site/apt/mojo-examples.apt 2010-06-19 14:22:59 UTC (rev 723) @@ -32,12 +32,149 @@ collect-files - <<todo>> + Collects the <<LICENSE.txt>> file and store reference in + <<target/collects.txt>>. -send-email +------------------------------------------------------------------------------ +<plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <extraFiles>LICENSE.txt</extraFiles> + <descriptionFile>target/collects.txt</descriptionFile> + </configuration> + </execution> - <<todo>> + </executions> +</plugin> +------------------------------------------------------------------------------ share-server-secret - <<todo>> + Shares the secret of <<yourserverId>> says : + + * <<privateKey>> + + * <<password>> + + * <<username>> + + * <<passphrase>> + +------------------------------------------------------------------------------ +<plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>validate</phase> + <configuration> + <serverId>yourServerId</serverId> + <privateKeyOut>privateKey</privateKeyOut> + <passwordOut>password</passwordOut> + <usernameOut>username</usernameOut> + <passphraseOut>passphrase</passphraseOut> + </configuration> + </execution> + </executions> +</plugin> +------------------------------------------------------------------------------ + +send-email + + Sends a email from <<noreply@noway.fr>> to <<receiver@noway.com>>. + + the content of the email is in <<target/emailContent.txt>>. + +------------------------------------------------------------------------------ +<plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>send-email</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <!-- for a multi-module just run on root project --> + <runOnce>true</runOnce> + + <emailTitle>Title of email</emailTitle> + <emailContentFile>target/emailContent.txt</emailContentFile> + <mailSender> + <email>noreply@noway.fr</email> + </mailSender> + <toAddresses> + <item>receiver@noway.com</item> + </toAddresses> + <smtpHost>smtp</smtpHost> + </configuration> +</plugin> +------------------------------------------------------------------------------ + +check-auto-container + + To test if all depencies of a project are in maven central repository : + +-------------------------------------------------------------------------------- +<plugin> +<groupId>org.nuiton</groupId> +<artifactId>maven-helper-plugin</artifactId> +<executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <phase>validate</phase> + <configuration> + <addMavenCentral>true</addMavenCentral> + </configuration> + </execution> +</executions> +</plugin> +-------------------------------------------------------------------------------- + + To test if all depencies of a project are in the repository : + + * id : <<nuiton-central-releases>> + + * url : <<http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases>> + +-------------------------------------------------------------------------------- +<plugin> +<groupId>org.nuiton</groupId> +<artifactId>maven-helper-plugin</artifactId> +<executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <phase>validate</phase> + <configuration> + <repositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases + </nuiton-central-releases> + </repositories> + </configuration> + </execution> +</executions> +</plugin> +-------------------------------------------------------------------------------- Modified: trunk/src/site/apt/mojo-usages.apt =================================================================== --- trunk/src/site/apt/mojo-usages.apt 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/site/apt/mojo-usages.apt 2010-06-19 14:22:59 UTC (rev 723) @@ -52,60 +52,15 @@ projects in the reactor, and only keep all collected files in the root project. ------------------------------------------------------------------------------- -<plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>collect-files</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>install</phase> - <configuration> - <extraFiles>LICENSE.txt</extraFiles> - <descriptionFile>target/collects.txt</descriptionFile> - </configuration> - </execution> - </executions> -</plugin> ------------------------------------------------------------------------------- + See {{{./mojo-examples.html#collect-files}examples page}}. send-email This goal sends an email with a content coming from a file. ------------------------------------------------------------------------------- -<plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>send-email</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <configuration> - <!-- for a multi-module just run on root project --> - <runOnce>true</runOnce> + See {{{./mojo-examples.html#send-email}examples page}}. - <emailTitle>Title of email</emailTitle> - <emailContentFile>target/emailContent.txt</emailContentFile> - <mailSender> - <email>noreply@noway.fr</email> - </mailSender> - <toAddresses> - <item>receiver@noway.com</item> - </toAddresses> - <smtpHost>smtp</smtpHost> - </configuration> -</plugin> ------------------------------------------------------------------------------- - share-server-secret This goal shares servers informations (from your <settings.xml>) @@ -134,24 +89,23 @@ * After the execution of the mojo, the exported parameters will be available for other mojo via (for example the <${username}> maven property). ------------------------------------------------------------------------------- -<plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>yourServerId</serverId> - <privateKeyOut>privateKey</privateKeyOut> - <passwordOut>password</passwordOut> - <usernameOut>username</usernameOut> - <passphraseOut>passphrase</passphraseOut> - </configuration> - </execution> - </executions> -</plugin> ------------------------------------------------------------------------------- + + See {{{./mojo-examples.html#share-server-secret}examples page}}. + +check-auto-container + + This mojo permits to test if all dependencies of a project are auto-contained + in given repositories. + + To use the mojo : + + * fill <<addCentralMaven>> to add central maven repository. + + * fill <<repositoriess>> to add more repositories to test. + + * use <<failIfNotSafe>> to fail build if there is some unsafe dependencies. + + [] + + See {{{./mojo-examples.html#check-auto-container}examples page}}. + \ No newline at end of file Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-06-19 12:14:08 UTC (rev 722) +++ trunk/src/site/site_en.xml 2010-06-19 14:22:59 UTC (rev 723) @@ -48,6 +48,7 @@ <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="check-auto-container" href="check-auto-container-mojo.html"/> <item name="help" href="help-mojo.html"/> </item> <item name="Mojo usages" href="mojo-usages.html"/>