- Mavenpom-commits - mailman.cloud.codelutin.com

r660 - trunk
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 10:22:08 +0200 (Fri, 09 Oct 2009) New Revision: 660 Modified: trunk/pom.xml Log: bump maven-plugin-plugin version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-07 07:26:56 UTC (rev 659) +++ trunk/pom.xml 2009-10-09 08:22:08 UTC (rev 660) @@ -446,7 +446,7 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5</version> + <version>2.5.1</version> </plugin> <plugin>

1 0

r659 - trunk
by tchemit＠users.nuiton.org 07 Oct '09

07 Oct '09

Author: tchemit Date: 2009-10-07 09:26:56 +0200 (Wed, 07 Oct 2009) New Revision: 659 Modified: trunk/pom.xml Log: bump resources plugin version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-04 08:19:53 UTC (rev 658) +++ trunk/pom.xml 2009-10-07 07:26:56 UTC (rev 659) @@ -318,7 +318,7 @@ <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>2.3</version> + <version>2.4.1</version> <configuration> <encoding>${project.build.sourceEncoding}</encoding> </configuration>

1 0

r658 - trunk
by tchemit＠users.nuiton.org 04 Oct '09

04 Oct '09

Author: tchemit Date: 2009-10-04 10:19:53 +0200 (Sun, 04 Oct 2009) New Revision: 658 Modified: trunk/pom.xml Log: fix redmine url Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-03 09:13:43 UTC (rev 657) +++ trunk/pom.xml 2009-10-04 08:19:53 UTC (rev 658) @@ -254,7 +254,7 @@ <redmine.projectId>${projectId}</redmine.projectId> <redmine.xmlPath>${maven.gen.dir}/changes/changes.xml</redmine.xmlPath> <redmine.issueLinkTemplate>${redmine.url}/issues/show/%ISSUE%</redmine.issueLinkTemplate> - <redmine.versionLinkTemplate>${redmine.url}/issues/show/%VERSION%</redmine.versionLinkTemplate> + <redmine.versionLinkTemplate>${redmine.url}/versions/show/%VERSION%</redmine.versionLinkTemplate> <redmine.collectedFiles>target/collect.properties</redmine.collectedFiles>

1 0

r657 - trunk
by tchemit＠users.nuiton.org 03 Oct '09

03 Oct '09

Author: tchemit Date: 2009-10-03 11:13:43 +0200 (Sat, 03 Oct 2009) New Revision: 657 Modified: trunk/pom.xml Log: Evolution #70: aider l'utilisation de webstart (am?\195?\169lioration des configurations de plugin) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-01 20:52:52 UTC (rev 656) +++ trunk/pom.xml 2009-10-03 09:13:43 UTC (rev 657) @@ -1051,32 +1051,21 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> <executions> <execution> - <id>get-jnlp-keystore</id> + <id>get-keystore</id> <goals> <goal>share-server-secret</goal> </goals> <phase>package</phase> <configuration> <serverId>codelutin-keystore</serverId> - <usernameOut>keystorepath</usernameOut> + <privateKeyOut>keystorepath</privateKeyOut> <passwordOut>keystorepass</passwordOut> - </configuration> - </execution> - <execution> - <id>get-jnlp-key</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore-nuiton-key</serverId> <usernameOut>keyalias</usernameOut> - <passwordOut>keypass</passwordOut> + <passphraseOut>keypass</passphraseOut> </configuration> - </execution> + </execution> </executions> </plugin> @@ -1116,30 +1105,19 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> <executions> <execution> - <id>get-jnlp-keystore</id> + <id>get-keystore</id> <goals> <goal>share-server-secret</goal> </goals> <phase>package</phase> <configuration> <serverId>codelutin-keystore</serverId> - <usernameOut>keystorepath</usernameOut> + <privateKeyOut>keystorepath</privateKeyOut> <passwordOut>keystorepass</passwordOut> - </configuration> - </execution> - <execution> - <id>get-jnlp-key</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore-nuiton-key</serverId> <usernameOut>keyalias</usernameOut> - <passwordOut>keypass</passwordOut> + <passphraseOut>keypass</passphraseOut> </configuration> </execution> </executions> @@ -1170,7 +1148,7 @@ <activeByDefault>false</activeByDefault> </activation> <build> - <defaultGoal>compile</defaultGoal> + <defaultGoal>package</defaultGoal> <plugins> <plugin> <artifactId>maven-enforcer-plugin</artifactId>

1 0

r656 - trunk
by tchemit＠users.nuiton.org 01 Oct '09

01 Oct '09

Author: tchemit Date: 2009-10-01 22:52:52 +0200 (Thu, 01 Oct 2009) New Revision: 656 Modified: trunk/pom.xml Log: Evolution #70: aider l'utilisation de webstart (isolation des configurations de plugin) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-01 20:46:26 UTC (rev 655) +++ trunk/pom.xml 2009-10-01 20:52:52 UTC (rev 656) @@ -495,32 +495,6 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version> - <executions> - <execution> - <id>get-jnlp-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <usernameOut>keystorepath</usernameOut> - <passwordOut>keystorepass</passwordOut> - </configuration> - </execution> - <execution> - <id>get-jnlp-key</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore-nuiton-key</serverId> - <usernameOut>keyalias</usernameOut> - <passwordOut>keypass</passwordOut> - </configuration> - </execution> - </executions> </plugin> <plugin> @@ -1077,12 +1051,31 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> <executions> <execution> <id>get-jnlp-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <usernameOut>keystorepath</usernameOut> + <passwordOut>keystorepass</passwordOut> + </configuration> </execution> <execution> <id>get-jnlp-key</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore-nuiton-key</serverId> + <usernameOut>keyalias</usernameOut> + <passwordOut>keypass</passwordOut> + </configuration> </execution> </executions> </plugin> @@ -1123,12 +1116,31 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> <executions> <execution> <id>get-jnlp-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <usernameOut>keystorepath</usernameOut> + <passwordOut>keystorepass</passwordOut> + </configuration> </execution> <execution> <id>get-jnlp-key</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore-nuiton-key</serverId> + <usernameOut>keyalias</usernameOut> + <passwordOut>keypass</passwordOut> + </configuration> </execution> </executions> </plugin>

1 0

r655 - trunk
by tchemit＠users.nuiton.org 01 Oct '09

01 Oct '09

Author: tchemit Date: 2009-10-01 22:46:26 +0200 (Thu, 01 Oct 2009) New Revision: 655 Modified: trunk/pom.xml Log: Evolution #70: aider l'utilisation de webstart Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-29 14:13:04 UTC (rev 654) +++ trunk/pom.xml 2009-10-01 20:46:26 UTC (rev 655) @@ -495,6 +495,32 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version> + <executions> + <execution> + <id>get-jnlp-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <usernameOut>keystorepath</usernameOut> + <passwordOut>keystorepass</passwordOut> + </configuration> + </execution> + <execution> + <id>get-jnlp-key</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore-nuiton-key</serverId> + <usernameOut>keyalias</usernameOut> + <passwordOut>keypass</passwordOut> + </configuration> + </execution> + </executions> </plugin> <plugin> @@ -521,6 +547,57 @@ <version>${license.version}</version> </plugin--> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + <configuration> + + <libPath>lib</libPath> + <makeArchive>false</makeArchive> + <verbose>false</verbose> + + <jnlp> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + +  +  + + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keyalias}</alias> + <keypass>${keypass}</keypass> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> + + </configuration> + </plugin> + </plugins> </pluginManagement> @@ -985,6 +1062,95 @@ </build> </profile> +  + <profile> + <id>webstart-profile</id> + <activation> + <property> + <name>doWebstart</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-jnlp-keystore</id> + </execution> + <execution> + <id>get-jnlp-key</id> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + +  + <profile> + <id>local-webstart-profile</id> + <activation> + <property> + <name>doLocalWebstart</name> + <value>true</value> + </property> + </activation> + <properties> + <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase> + </properties> + <build> + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-jnlp-keystore</id> + </execution> + <execution> + <id>get-jnlp-key</id> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp-local</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> +  <profile> <id>run</id>

1 0

r654 - trunk
by tchemit＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: tchemit Date: 2009-09-29 16:13:04 +0200 (Tue, 29 Sep 2009) New Revision: 654 Modified: trunk/pom.xml Log: - use maven-helper-plugin 1.1.0 - remove goal check-project-files invocation m(aven-helper-plugin) since now with mvn > 2.2.0 plugin execution id are fine and does no more mix up with the default one (moreover each maven must be independant, so each file should required a changelog.txt...) - [Evolution #68] utilisation du framework mojo maven-helper-plugin Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-26 01:32:51 UTC (rev 653) +++ trunk/pom.xml 2009-09-29 14:13:04 UTC (rev 654) @@ -236,8 +236,10 @@ <maven.javadoc.skip>false</maven.javadoc.skip> <maven.version>2.2.1</maven.version> - <helper.version>1.0.3-SNAPSHOT</helper.version> + <helper.version>1.1.0-SNAPSHOT</helper.version> <jredmine.version>1.0.0-SNAPSHOT</jredmine.version> +  +  <jrst.version>1.0.0</jrst.version>  @@ -279,23 +281,35 @@ </resources> <plugins> + <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>maven-enforcer-plugin</artifactId> <executions> -  <execution> <id>check-project-files</id> <goals> - <goal>check-project-files</goal> + <goal>enforce</goal> </goals> + <phase>initialize</phase> <configuration> - <verbose>true</verbose> + <rules> + <requireFilesExist> + <files> + <file>LICENSE.txt</file> + <file>README.txt</file> + <file>changelog.txt</file> + </files> + </requireFilesExist> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + </configuration> </execution> </executions> </plugin> - + </plugins> <pluginManagement> @@ -500,6 +514,13 @@ <version>${jredmine.version}</version> </plugin> +  +  + </plugins> </pluginManagement> @@ -783,8 +804,6 @@ </execution> </executions> <configuration> -  -   <generateOnce>true</generateOnce> @@ -825,6 +844,7 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <executions> +  <execution> <id>attach-licenses</id> <goals> @@ -832,7 +852,7 @@ <goal>add-third-party</goal> </goals> </execution> - +  <execution> <id>collect-files</id> <goals> @@ -848,7 +868,23 @@ </executions> </plugin> - + + +  +  </plugins> </build> @@ -901,7 +937,7 @@ <filesFromProperties>${redmine.collectedFiles}</filesFromProperties>  - <newsContentFile>target/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle> @@ -929,7 +965,7 @@ <runOnce>true</runOnce> <emailTitle>[ANNOUNCEMENT] - ${project.name} ${project.version} released</emailTitle> - <emailContentFile>target/announcement/release-email-announcement.vm</emailContentFile> + <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm</emailContentFile> <mailSender> <name>${platform} Release Notification</name> <email>noreply@${platform}</email> @@ -962,7 +998,7 @@ <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> - <id>run</id> + <id>check-run</id> <goals> <goal>enforce</goal> </goals>

1 0

r653 - trunk
by tchemit＠users.nuiton.org 26 Sep '09

26 Sep '09

Author: tchemit Date: 2009-09-26 03:32:51 +0200 (Sat, 26 Sep 2009) New Revision: 653 Modified: trunk/pom.xml Log: fix javadoc report encoding to UTF-8 via the charset property Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-25 23:43:51 UTC (rev 652) +++ trunk/pom.xml 2009-09-26 01:32:51 UTC (rev 653) @@ -529,6 +529,7 @@ <quiet>true</quiet> <docencoding>${project.build.sourceEncoding}</docencoding> <encoding>${project.build.sourceEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> </configuration> </plugin>

1 0

r652 - trunk
by tchemit＠users.nuiton.org 25 Sep '09

25 Sep '09

Author: tchemit Date: 2009-09-26 01:43:51 +0200 (Sat, 26 Sep 2009) New Revision: 652 Modified: trunk/pom.xml Log: uniform dryRun properties like in redmine-release-profile Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-25 22:33:47 UTC (rev 651) +++ trunk/pom.xml 2009-09-25 23:43:51 UTC (rev 652) @@ -862,6 +862,11 @@ <value>true</value> </property> </activation> + + <properties> + <dryRun>true</dryRun> + <redmine.dryRun>${dryRun}</redmine.dryRun> + </properties> <build> <plugins> @@ -883,7 +888,7 @@ </executions> <configuration>  - <dryRun>true</dryRun> +   <runOnce>true</runOnce> @@ -917,7 +922,7 @@ </executions> <configuration>  - <dryRun>true</dryRun> +   <runOnce>true</runOnce> @@ -929,9 +934,10 @@ <email>noreply@${platform}</email> </mailSender> <toAddresses> - <item>${listId}-users(a)list.${platform}</item> - <item>lutin(a)codelutin.com</item> - <item>dev(a)codelutin.com</item> +  +  +  + <item>chemit(a)codelutin.com</item> </toAddresses> <smtpHost>smtp</smtpHost> </configuration>

1 0

r651 - in trunk: . src/site/apt
by tchemit＠users.nuiton.org 25 Sep '09

25 Sep '09

Author: tchemit Date: 2009-09-26 00:33:47 +0200 (Sat, 26 Sep 2009) New Revision: 651 Modified: trunk/pom.xml trunk/src/site/apt/index.apt Log: [EVOLUTION #62] : passage en maven 2.2.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-21 14:06:22 UTC (rev 650) +++ trunk/pom.xml 2009-09-25 22:33:47 UTC (rev 651) @@ -235,7 +235,7 @@  <maven.javadoc.skip>false</maven.javadoc.skip> - <maven.version>2.1.0</maven.version> + <maven.version>2.2.1</maven.version> <helper.version>1.0.3-SNAPSHOT</helper.version> <jredmine.version>1.0.0-SNAPSHOT</jredmine.version> <jrst.version>1.0.0</jrst.version> Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2009-09-21 14:06:22 UTC (rev 650) +++ trunk/src/site/apt/index.apt 2009-09-25 22:33:47 UTC (rev 651) @@ -100,7 +100,7 @@ * maven.version - La version de l'api de maven utilisée (principalement dans les plugins maven) + La version de l'api de maven utilisée (principalement dans les plugins maven) : <<2.2.1>> * helper.version

1 0