Maven-license-plugin-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- 268 discussions
r1671 - trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest
by tchemit＠users.nuiton.org Jan. 7, 2010
by tchemit＠users.nuiton.org Jan. 7, 2010
Jan. 7, 2010
Author: tchemit
Date: 2010-01-07 05:38:38 +0100 (Thu, 07 Jan 2010)
New Revision: 1671
Modified:
trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml
trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml
Log:
fix test failed
Modified: trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml
===================================================================
--- trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml 2010-01-07 04:23:57 UTC (rev 1670)
+++ trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml 2010-01-07 04:38:38 UTC (rev 1671)
@@ -17,7 +17,6 @@
<licenseName>lgpl_v3</licenseName>
<licenseFile>licenseOne.txt</licenseFile>
<!--<outputDirectory>test</outputDirectory>-->
- <force>true</force>
<verbose>true</verbose>
</configuration>
<executions>
Modified: trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml
===================================================================
--- trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml 2010-01-07 04:23:57 UTC (rev 1670)
+++ trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml 2010-01-07 04:38:38 UTC (rev 1671)
@@ -18,7 +18,6 @@
<encoding>UTF-8</encoding>
<licenseName>lgpl_v3</licenseName>
<licenseFile>licenseTwo.txt</licenseFile>
- <force>true</force>
<!--<outputDirectory>test</outputDirectory>-->
<verbose>true</verbose>
</configuration>
1
0
r1670 - in trunk: . src/main/java/org/nuiton/license/plugin src/site src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest
by tchemit＠users.nuiton.org Jan. 7, 2010
by tchemit＠users.nuiton.org Jan. 7, 2010
Jan. 7, 2010
Author: tchemit
Date: 2010-01-07 05:23:57 +0100 (Thu, 07 Jan 2010)
New Revision: 1670
Added:
trunk/src/site/site_en.xml
Removed:
trunk/src/site/site.xml
Modified:
trunk/pom.xml
trunk/src/main/java/org/nuiton/license/plugin/GeneratorListPlugin.java
trunk/src/main/java/org/nuiton/license/plugin/LicenseListPlugin.java
trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml
trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml
Log:
Evolution #192: Use mavenpom
Evolution #193: Use maven-helper-plugin 1.2.0 with revisited AbstractPlugin api
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-01 17:27:34 UTC (rev 1669)
+++ trunk/pom.xml 2010-01-07 04:23:57 UTC (rev 1670)
@@ -8,7 +8,12 @@
<!-- *** POM Relationships *************************************** -->
<!-- ************************************************************* -->
- <groupId>org.nuiton</groupId>
+ <parent>
+ <groupId>org.nuiton</groupId>
+ <artifactId>mavenpom</artifactId>
+ <version>1.1.4</version>
+ </parent>
+
<artifactId>maven-license-plugin</artifactId>
<version>2.0.1-SNAPSHOT</version>
@@ -250,19 +255,6 @@
<inceptionYear>2008</inceptionYear>
<url>http://maven-site.nuiton.org/maven-license-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>
@@ -281,32 +273,6 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
- <mailingLists>
- <mailingList>
- <name>maven-license-plugin-commits</name>
- <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-commits</subscribe>
- <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-commits</unsubscribe>
- <post>maven-license-plugin-commits(a)list.nuiton.org</post>
- <archive>http://list.nuiton.org/pipermail/maven-license-plugin-commits/</archive>
- </mailingList>
-
- <mailingList>
- <name>maven-license-plugin-devel</name>
- <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-devel</subscribe>
- <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-devel</unsubscribe>
- <post>maven-license-plugin-devel(a)list.nuiton.org</post>
- <archive>http://list.nuiton.org/pipermail/maven-license-plugin-devel/</archive>
- </mailingList>
-
- <mailingList>
- <name>maven-license-plugin-users</name>
- <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-users</subscribe>
- <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-users</unsubscribe>
- <post>maven-license-plugin-users(a)list.nuiton.org</post>
- <archive>http://list.nuiton.org/pipermail/maven-license-plugin-users/</archive>
- </mailingList>
- </mailingLists>
-
<!-- Source control management. -->
<scm>
<connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</connection>
@@ -314,31 +280,6 @@
<url>http://www.nuiton.org/repositories/browse/maven-license-plugin/trunk</url>
</scm>
- <issueManagement>
- <system>Redmine</system>
- <url>http://www.nuiton.org/projects/maven-license-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-license-plugin</url>
- </site>
- </distributionManagement>
-
- <ciManagement>
- <system>hudson</system>
- <url>http://hudson.nuiton.org/hudson/job/maven-license-plugin</url>
- </ciManagement>
-
<!-- ************************************************************* -->
<!-- *** Build Settings ****************************************** -->
<!-- ************************************************************* -->
@@ -347,55 +288,11 @@
<properties>
- <platform>nuiton.org</platform>
+ <processor.version>1.0.2</processor.version>
- <!-- a proprerty to define the id of the project, in a multi-module
- project, you must use a hard-cored value, otherwise for modules
- the artifactId will be expanded , otherwise, no need to override it
- -->
- <projectId>${project.artifactId}</projectId>
-
- <!-- a property to define list id -->
- <listId>${projectId}</listId>
-
- <maven.src.dir>${basedir}/src</maven.src.dir>
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- <maven.test.skip>false</maven.test.skip>
-
- <!-- to activate generation of reports and javadoc when doing a site -->
- <maven.reports.generate>true</maven.reports.generate>
-
- <license.licenseName>lgpl_v3</license.licenseName>
-
- <repository.home.url>http://maven.nuiton.org/release</repository.home.url>
-
- <helper.version>1.2.0-SNAPSHOT</helper.version>
- <jredmine.version>1.0.0</jredmine.version>
- <processor.version>1.0.1</processor.version>
- <jrst.version>1.0.0</jrst.version>
-
- <maven.version>2.2.1</maven.version>
- <!-- javadoc 2.6 ne fonctionne pas avec doxia-jrst + maven-helper-plugin -->
- <javadoc.version>2.5</javadoc.version>
-
- <!-- redmine configuration -->
- <redmine.safe>false</redmine.safe>
- <redmine.url>http://www.${platform}</redmine.url>
- <redmine.serverId>redmine-${platform}</redmine.serverId>
- <redmine.projectId>maven-license-plugin</redmine.projectId>
- <redmine.xmlPath>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>
-
- <!-- extra files to include in release -->
- <redmine.releaseFiles/>
-
+ <!-- documention is in english -->
+ <maven.site.locales>en</maven.site.locales>
+
</properties>
<build>
@@ -448,296 +345,8 @@
</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>
- <!-- uniquement a partir de javadoc 2.5 -->
- <!--skip>${maven.javadoc.skip}</skip-->
- <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-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>
<dependencies>
<dependency>
<groupId>org.nuiton.jrst</groupId>
@@ -753,33 +362,6 @@
</dependencies>
</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.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
- <version>${helper.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.nuiton.jredmine</groupId>
- <artifactId>maven-jredmine-plugin</artifactId>
- <version>${jredmine.version}</version>
- </plugin>
-
</plugins>
</pluginManagement>
@@ -787,359 +369,12 @@
<reporting>
<plugins>
- <!-- The Project Info Reports Plugin has twelve goals:
- see http://maven.apache.org/plugins/maven-project-info-reports-plugin
- -->
- <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>true</skip>-->
- <docencoding>${project.build.sourceEncoding}</docencoding>
- <encoding>${project.build.sourceEncoding}</encoding>
- <charset>${project.reporting.outputEncoding}</charset>
- <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames>
- <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>
- <reportSets>
- <reportSet>
- <reports>
- <report>javadoc</report>
- <report>test-javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <!-- changelog:changelog
- changelog:dev-activity
- changelog:file-activity -->
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>2.1</version>
- </plugin>
-
- <!-- Implicit add of reportSet to not generate jira reports -->
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.2</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>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
@@ -1150,340 +385,7 @@
</reporting>
<profiles>
- <!-- perform only on a release stage when using the maven-release-plugin -->
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
-
- <!-- add license and third-party files to build -->
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>2.0.0</version>
- <executions>
- <execution>
- <id>attach-licenses</id>
- <goals>
- <goal>add-license</goal>
- <goal>add-third-party</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- always compute source jar -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- always compute javadoc jar -->
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <!-- perform only on a release stage when using the maven-release-plugin -->
- <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>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>issues-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- </plugins>
- </reporting>
- <build>
-
- <plugins>
-
- <!--
- - obtain redmine login
- - collect files for jredmine release
- -->
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
- <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>${redmine.releaseFiles}</extraFiles>
- <descriptionFile>${redmine.collectedFiles}</descriptionFile>
- <!--<copyFiles>false</copyFiles>-->
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- generate the changes.xml from redmine -->
- <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>
-
- <!-- generate-changes -->
- <generateOnce>true</generateOnce>
- <actionMapping>fix:1, add:2</actionMapping>
- <statusIds>3,4,5</statusIds>
-
- <!-- generate announcements -->
- <urlDownload>${redmine.url}/projects/list_files/${projectId}</urlDownload>
-
- <!--<changesTitle>Release note of Maven pom project</changesTitle>-->
- <!--<releaseDescription>Description of first release</releaseDescription>-->
- <!--<verbose>true</verbose>-->
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
- </profile>
-
- <!-- perform a redmine release after a successfull release -->
- <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>
-
-
- <!--
- - obtain redmine login
- - send release email
- -->
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
- <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>
-
- <!-- for a multi-module just run on root project -->
- <runOnce>true</runOnce>
-
- <emailTitle>[ANNOUNCEMENT] - ${project.name} ${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>
-
- <!--
- - update version in redmine
- - publish release files to redmine
- - publish a release news in redmine
- -->
- <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>
-
- <!-- for a multi-module just run on root project -->
- <runOnce>true</runOnce>
-
- <!-- update-version -->
- <closeVersion>true</closeVersion>
-
- <!-- publish-attachments -->
- <filesFromProperties>${redmine.collectedFiles}</filesFromProperties>
-
- <!-- publish-news -->
- <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm
- </newsContentFile>
- <newsSummary>${project.description}</newsSummary>
- <newsTitle>${project.name} ${project.version} released</newsTitle>
-
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
- </profile>
-
- <!-- do not execute tests (generaly a bad idea...) -->
- <profile>
- <id>notests</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
- </profile>
- <!-- do not build reports (speedup site generation in dev) -->
- <profile>
- <id>noreports</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <maven.reports.generate>false</maven.reports.generate>
- </properties>
- </profile>
- <!-- do not build dependencies detail in maven-project-info-report (speedup site generation in dev) -->
- <profile>
- <id>nodepdetails</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <maven.reports.dependencyDetailsEnabled>false</maven.reports.dependencyDetailsEnabled>
- </properties>
- </profile>
- <!-- do not build locations of dependencies in maven-project-info-report (speedup site generation in dev) -->
- <profile>
- <id>nodeplocations</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <maven.reports.dependencyLocationsEnabled>false</maven.reports.dependencyLocationsEnabled>
- </properties>
- </profile>
-
<!--profile>
<id>run-its</id>
<build>
Modified: trunk/src/main/java/org/nuiton/license/plugin/GeneratorListPlugin.java
===================================================================
--- trunk/src/main/java/org/nuiton/license/plugin/GeneratorListPlugin.java 2010-01-01 17:27:34 UTC (rev 1669)
+++ trunk/src/main/java/org/nuiton/license/plugin/GeneratorListPlugin.java 2010-01-07 04:23:57 UTC (rev 1670)
@@ -29,7 +29,7 @@
import org.nuiton.license.plugin.header.generator.HeaderGenerator;
/**
- * The goal display all the knwon generators.
+ * Displays all the available generators.
*
* @author chemit
*
Modified: trunk/src/main/java/org/nuiton/license/plugin/LicenseListPlugin.java
===================================================================
--- trunk/src/main/java/org/nuiton/license/plugin/LicenseListPlugin.java 2010-01-01 17:27:34 UTC (rev 1669)
+++ trunk/src/main/java/org/nuiton/license/plugin/LicenseListPlugin.java 2010-01-07 04:23:57 UTC (rev 1670)
@@ -31,7 +31,7 @@
import org.nuiton.license.plugin.repository.LicenseRepositoryFactory;
/**
- * Le goal pour afficher dans la console les differentes licenses connues.
+ * Display all available licenses.
*
* @author chemit
* @goal license-list
Deleted: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2010-01-01 17:27:34 UTC (rev 1669)
+++ trunk/src/site/site.xml 2010-01-07 04:23:57 UTC (rev 1670)
@@ -1,67 +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"/>
- <logo href="http://maven-nuiton.org/jrst" name="JRst" img="images/jrst-logo.png"/>
- <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText"
- img="images/restructuredtext-logo.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="${project.name}" href="${project.url}" />
- </breadcrumbs>
-
- <menu name="Utilisateur">
- <item name="Introduction" href="index.html"/>
- <item name="Usage" href="usage.html"/>
- <item name="Goals" href="plugin-info.html">
- <item name="update-header" href="update-header-mojo.html"/>
- <item name="generator-list" href="generator-list-mojo.html"/>
- <item name="license-list" href="license-list-mojo.html"/>
- <item name="help" href="help-mojo.html"/>
- </item>
- </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)"/>
- </menu>
-
- <menu ref="reports"/>
-
- </body>
-</project>
Copied: trunk/src/site/site_en.xml (from rev 1669, trunk/src/site/site.xml)
===================================================================
--- trunk/src/site/site_en.xml (rev 0)
+++ trunk/src/site/site_en.xml 2010-01-07 04:23:57 UTC (rev 1670)
@@ -0,0 +1,47 @@
+<?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"/>
+ <logo href="http://maven-nuiton.org/jrst" name="JRst" img="images/jrst-logo.png"/>
+ <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText"
+ img="images/restructuredtext-logo.png"/>
+ </poweredBy>
+
+ <body>
+
+ <breadcrumbs>
+ <item name="${project.name}" href="index.html" />
+ </breadcrumbs>
+
+ <menu name="User">
+ <item name="Introduction" href="index.html"/>
+ <item name="Usage" href="usage.html"/>
+ <item name="Goals" href="plugin-info.html">
+ <item name="add-license" href="add-license-mojo.html"/>
+ <item name="add-third-party" href="add-third-party-mojo.html"/>
+ <item name="update-header" href="update-header-mojo.html"/>
+ <item name="generator-list" href="generator-list-mojo.html"/>
+ <item name="license-list" href="license-list-mojo.html"/>
+ <item name="help" href="help-mojo.html"/>
+ </item>
+ </menu>
+
+ <menu name="Downloads">
+ <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)"/>
+ </menu>
+
+ <menu ref="reports"/>
+
+ </body>
+</project>
Modified: trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml
===================================================================
--- trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml 2010-01-01 17:27:34 UTC (rev 1669)
+++ trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml 2010-01-07 04:23:57 UTC (rev 1670)
@@ -17,6 +17,7 @@
<licenseName>lgpl_v3</licenseName>
<licenseFile>licenseOne.txt</licenseFile>
<!--<outputDirectory>test</outputDirectory>-->
+ <force>true</force>
<verbose>true</verbose>
</configuration>
<executions>
Modified: trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml
===================================================================
--- trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml 2010-01-01 17:27:34 UTC (rev 1669)
+++ trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml 2010-01-07 04:23:57 UTC (rev 1670)
@@ -18,6 +18,7 @@
<encoding>UTF-8</encoding>
<licenseName>lgpl_v3</licenseName>
<licenseFile>licenseTwo.txt</licenseFile>
+ <force>true</force>
<!--<outputDirectory>test</outputDirectory>-->
<verbose>true</verbose>
</configuration>
1
0
Author: tchemit
Date: 2010-01-01 18:27:34 +0100 (Fri, 01 Jan 2010)
New Revision: 1669
Modified:
trunk/pom.xml
Log:
update javadoc taglets
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-01 16:52:22 UTC (rev 1668)
+++ trunk/pom.xml 2010-01-01 17:27:34 UTC (rev 1669)
@@ -487,106 +487,147 @@
<!--skip>${maven.javadoc.skip}</skip-->
<taglets>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet
+ <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.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ <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.4.2</version>
+ <groupId>org.apache.maven.plugin-tools
+ </groupId>
+ <artifactId>maven-plugin-tools-javadoc
+ </artifactId>
+ <version>2.5.1</version>
</tagletArtifact>
</taglet>
<taglet>
@@ -594,9 +635,11 @@
org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <groupId>org.apache.maven.plugin-tools
+ </groupId>
+ <artifactId>maven-plugin-tools-javadoc
+ </artifactId>
+ <version>2.5.1</version>
</tagletArtifact>
</taglet>
<taglet>
@@ -604,61 +647,81 @@
org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ <tagletClass>
+ org.codehaus.plexus.javadoc.PlexusComponentTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
+ <artifactId>plexus-component-javadoc
+ </artifactId>
+ <version>1.3.0</version>
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass>
+ <tagletClass>
+ org.codehaus.plexus.javadoc.PlexusConfigurationTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
+ <artifactId>plexus-component-javadoc
+ </artifactId>
+ <version>1.3.0</version>
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass>
+ <tagletClass>
+ org.codehaus.plexus.javadoc.PlexusRequirementTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
+ <artifactId>plexus-component-javadoc
+ </artifactId>
+ <version>1.3.0</version>
</tagletArtifact>
</taglet>
</taglets>
@@ -766,102 +829,147 @@
<excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames>
<taglets>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass>
+ <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.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ <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.4.2</version>
+ <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>
+ <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.4.2</version>
+ <groupId>org.apache.maven.plugin-tools
+ </groupId>
+ <artifactId>maven-plugin-tools-javadoc
+ </artifactId>
+ <version>2.5.1</version>
</tagletArtifact>
</taglet>
<taglet>
@@ -869,70 +977,93 @@
org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet
</tagletClass>
<tagletArtifact>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.4.2</version>
+ <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>
+ <tagletClass>
+ org.codehaus.plexus.javadoc.PlexusComponentTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
+ <artifactId>plexus-component-javadoc
+ </artifactId>
+ <version>1.3.0</version>
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass>
+ <tagletClass>
+ org.codehaus.plexus.javadoc.PlexusConfigurationTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
+ <artifactId>plexus-component-javadoc
+ </artifactId>
+ <version>1.3.0</version>
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass>
+ <tagletClass>
+ org.codehaus.plexus.javadoc.PlexusRequirementTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
+ <artifactId>plexus-component-javadoc
+ </artifactId>
+ <version>1.3.0</version>
</tagletArtifact>
</taglet>
</taglets>
1
0
r1668 - in trunk: . src/main/java/org/nuiton/license/plugin src/main/java/org/nuiton/license/plugin/repository
by tchemit＠users.nuiton.org Jan. 1, 2010
by tchemit＠users.nuiton.org Jan. 1, 2010
Jan. 1, 2010
Author: tchemit
Date: 2010-01-01 17:52:22 +0100 (Fri, 01 Jan 2010)
New Revision: 1668
Modified:
trunk/pom.xml
trunk/src/main/java/org/nuiton/license/plugin/AddLicenseFilePlugin.java
trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyFilePlugin.java
trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderPlugin.java
trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseRepositoryFactory.java
Log:
- use last version of mavenpom and maven-helper-plugin new api
- reformat code
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-25 07:49:08 UTC (rev 1667)
+++ trunk/pom.xml 2010-01-01 16:52:22 UTC (rev 1668)
@@ -374,7 +374,7 @@
<repository.home.url>http://maven.nuiton.org/release</repository.home.url>
- <helper.version>1.1.0</helper.version>
+ <helper.version>1.2.0-SNAPSHOT</helper.version>
<jredmine.version>1.0.0</jredmine.version>
<processor.version>1.0.1</processor.version>
<jrst.version>1.0.0</jrst.version>
Modified: trunk/src/main/java/org/nuiton/license/plugin/AddLicenseFilePlugin.java
===================================================================
--- trunk/src/main/java/org/nuiton/license/plugin/AddLicenseFilePlugin.java 2009-11-25 07:49:08 UTC (rev 1667)
+++ trunk/src/main/java/org/nuiton/license/plugin/AddLicenseFilePlugin.java 2010-01-01 16:52:22 UTC (rev 1668)
@@ -21,7 +21,6 @@
package org.nuiton.license.plugin;
-import java.io.File;
import org.apache.maven.project.MavenProject;
import org.nuiton.license.plugin.repository.License;
import org.nuiton.license.plugin.repository.LicenseRepository;
@@ -29,6 +28,8 @@
import org.nuiton.plugin.AbstractPlugin;
import org.nuiton.plugin.PluginHelper;
+import java.io.File;
+
/**
* Le goal pour ajouter le fichier LICENSE.txt dans le classpath (et le generer s'il n'existe pas).
*
@@ -72,7 +73,7 @@
/**
* Repertoire de sortie des sources.
*
- * @parameter expression="${helper.outputDirectory}" default-value="target/generated-sources/resources"
+ * @parameter expression="${helper.outputDirectory}" default-value="target/generated-sources/license"
* @required
* @since 1.0.0
*/
@@ -115,7 +116,7 @@
protected boolean verbose;
/**
* Un flag pour faire une copie nommée dans META-INF (prefixe avec le nom de l'artifact).
- *
+ * <p/>
* Cette option n'est utilisable que sur des modules avec un class-path (pas pour un pom)
*
* @parameter expression="${helper.copyToMETA_INF}" default-value="false"
@@ -131,22 +132,23 @@
protected String[] extraResolver;
protected License license;
- public AddLicenseFilePlugin() {
- super("all files are up-to-date.");
- }
+// public AddLicenseFilePlugin() {
+// super("all files are up-to-date.");
+// }
protected boolean hasClassPath() {
return rejectPackaging(Packaging.pom);
}
// @Override
// protected boolean ensurePackaging() {
-// return false;
+ // return false;
//// return project != null && ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging()));
// }
boolean doGenerate;
@Override
- protected boolean init() throws Exception {
+ protected void init() throws Exception {
+// protected boolean init() throws Exception {
// must generate if file does not exist
doGenerate = true;
@@ -166,7 +168,7 @@
licenseFilename = licenseName;
}
// always execute the mojo ?
- return true;
+// return true;
}
@Override
@@ -183,8 +185,9 @@
getLog().info("backup " + licenseFile);
}
// copy it to backup file
- File backup = new File(licenseFile.getAbsolutePath() + "~");
- licenseFile.renameTo(backup);
+ backupFile(licenseFile);
+// File backup = new File(licenseFile.getAbsolutePath() + "~");
+// licenseFile.renameTo(backup);
}
}
@@ -201,9 +204,11 @@
copyFile(licenseFile, target);
if (copyToMETA_INF) {
- copyFile(licenseFile, PluginHelper.getFile(outputDirectory, "META-INF", project.getArtifactId() + "-" + licenseFile.getName()));
+ File destFile = PluginHelper.getFile(outputDirectory, "META-INF", project.getArtifactId() + "-" + licenseFile.getName());
+ copyFile(licenseFile, destFile);
}
- addResourceDir(outputDirectory.getAbsolutePath());
+ addResourceDir(outputDirectory, "**/*.txt");
+// addResourceDir(outputDirectory.getAbsolutePath());
}
}
Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyFilePlugin.java
===================================================================
--- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyFilePlugin.java 2009-11-25 07:49:08 UTC (rev 1667)
+++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyFilePlugin.java 2010-01-01 16:52:22 UTC (rev 1668)
@@ -75,7 +75,7 @@
/**
* Repertoire de sortie des classes (classpath).
*
- * @parameter expression="${helper.outputDirectory}" default-value="target/generated-sources/resources"
+ * @parameter expression="${helper.outputDirectory}" default-value="target/generated-sources/license"
* @required
* @since 1.0.0
*/
@@ -171,9 +171,9 @@
protected String thirdPartyFileContent;
protected File thirdPartyFile;
- public AddThirdPartyFilePlugin() {
- super("all files are up-to-date.");
- }
+// public AddThirdPartyFilePlugin() {
+// super("all files are up-to-date.");
+// }
@Override
protected boolean checkPackaging() {
@@ -182,7 +182,8 @@
boolean doGenerate;
@Override
- protected boolean init() throws Exception {
+ protected void init() throws Exception {
+// protected boolean init() throws Exception {
doGenerate = true;
thirdPartyFile = new File(outputDirectory, thirdPartyFilename);
@@ -219,7 +220,7 @@
thirdPartyFileContent = PluginHelper.readAsString(thirdPartyFile, encoding);
}
- return true;
+// return true;
}
@Override
@@ -232,14 +233,16 @@
if (verbose) {
getLog().info("backup " + thirdPartyFile);
}
- thirdPartyFile.renameTo(new File(thirdPartyFile.getAbsolutePath() + '~'));
+ backupFile(thirdPartyFile);
+// thirdPartyFile.renameTo(new File(thirdPartyFile.getAbsolutePath() + '~'));
}
writeFile(thirdPartyFile, thirdPartyFileContent, encoding);
}
if (copyToMETA_INF) {
copyFile(thirdPartyFile, new File(outputDirectory, "META-INF" + File.separator + project.getArtifactId() + "-" + thirdPartyFile.getName()));
}
- addResourceDir(outputDirectory.getAbsolutePath());
+ addResourceDir(outputDirectory,"**/*.txt");
+// addResourceDir(outputDirectory.getAbsolutePath());
}
/** @return resolve the dependency tree */
Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderPlugin.java
===================================================================
--- trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderPlugin.java 2009-11-25 07:49:08 UTC (rev 1667)
+++ trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderPlugin.java 2010-01-01 16:52:22 UTC (rev 1668)
@@ -20,17 +20,7 @@
*/
package org.nuiton.license.plugin;
-import org.nuiton.processor.LicenseProcessor;
-
-import java.io.File;
-import java.io.StringWriter;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
@@ -43,14 +33,19 @@
import org.nuiton.license.plugin.repository.LicenseRepositoryFactory;
import org.nuiton.plugin.AbstractPlugin;
import org.nuiton.plugin.PluginHelper;
+import org.nuiton.processor.LicenseProcessor;
+import java.io.File;
+import java.io.StringWriter;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
* The goal to update (or add) the licence header on some files.
*
* @author chemit
* @requiresProject true
* @goal update-header
- *
* @since 1.0.1
*/
public class UpdateHeaderPlugin extends AbstractPlugin {
@@ -105,9 +100,9 @@
protected String licenseName;
/**
* Le type de générateur a utiliser pour encapsuler le header.
+ * <p/>
+ * Par défaut, on veut utiliser le plugin sur des fichiers sources java.
*
- * Par défaut, on veut utiliser le plugin sur des fichiers sources java.
- *
* @parameter expression="${license.generatorName}" default-value="license-java"
* @required
* @since 1.0.1
@@ -115,14 +110,14 @@
protected String generatorName;
/**
* La liste des patterns de fichiers à inclure (séparés par des virgules).
- *
+ * <p/>
* Exemple : <code>**\/*.java,**\/*.properties</code>
- *
+ * <p/>
* On recherchera alors les fichiers respectant l'un des patterns dans
* tous les répertoires de sources et de tests.
+ * <p/>
+ * Par défaut, on veut utiliser le plugin sur des fichiers sources java.
*
- * Par défaut, on veut utiliser le plugin sur des fichiers sources java.
- *
* @parameter expression="${license.includes}" default-value="**\/*.java"
* @required
* @since 1.0.1
@@ -130,12 +125,12 @@
protected String includes = "**/*.java";
/**
* La liste des patterns de fichiers à exclure (séparés par des virgules).
- *
+ * <p/>
* Exemple : <code>**\/*.java,**\/*.properties</code>
- *
+ * <p/>
* On recherchera alors les fichiers respectant l'un des patterns dans
* tous les répertoires de sources et de tests.
- *
+ * <p/>
* Par défaut, on n'exclue rien.
*
* @parameter expression="${license.excludes}"
@@ -167,7 +162,7 @@
protected String licenseResolver;
/**
* La template (velocity) a utiliser pour construire le header.
- *
+ * <p/>
* Cette template doit être dans le class-path ou être un fichier existant
*
* @parameter expression="${license.template}" default-value="/license/defaultHeader.vm"
@@ -176,7 +171,7 @@
protected String template;
/**
* Des paramètres supplémentaires à utiliser dans la template du header.
- *
+ *
* @parameter
* @since 1.0.1
*/
@@ -201,7 +196,7 @@
* @parameter expression="${skipUpdateHeader}" default-value="false"
* @since 1.0.3
*/
- private boolean skipUpdateHeader;
+ protected boolean skipUpdateHeader;
/**
* A flag to test plugin but modify no file.
*
@@ -222,18 +217,26 @@
* @component role="org.nuiton.license.plugin.header.generator.HeaderGenerator"
*/
protected Map<String, HeaderGenerator> _generators;
- /** le header a ajouter dans chaque fichier source java */
+ /**
+ * le header a ajouter dans chaque fichier source java
+ */
protected String licenseHeaderContent;
- /** le header complet (avec les balises de commentaires) */
+ /**
+ * le header complet (avec les balises de commentaires)
+ */
protected String boxedLicenseHeaderContent;
- /** la liste des chemin relatifs des sources java a traiter pour chaque repertoire contenant des sources */
+ /**
+ * la liste des chemin relatifs des sources java a traiter pour chaque repertoire contenant des sources
+ */
protected Map<File, String[]> filesToTreate;
- /** le timestamp utilise pour la generation*/
+ /**
+ * le timestamp utilise pour la generation
+ */
protected long timestamp;
- public UpdateHeaderPlugin() {
- super("all files are up-to-date.");
- }
+// public UpdateHeaderPlugin() {
+// super("all files are up-to-date.");
+// }
@Override
public boolean isVerbose() {
@@ -261,29 +264,44 @@
}
@Override
- public boolean init() throws Exception {
+ protected boolean checkSkip() {
+ if (skipUpdateHeader) {
+ getLog().info("skip flag is on, will skip goal.");
+ return false;
+ }
+ if (filesToTreate == null || filesToTreate.isEmpty()) {
+ getLog().info("No file to treate, will skip goal.");
+ return false;
+ }
+ return super.checkSkip();
+ }
+ @Override
+ public void init() throws Exception {
+// public boolean init() throws Exception {
+
if (skipUpdateHeader) {
- return true;
+ return;
}
timestamp = System.nanoTime();
if (_generators == null) {
// should never happen...
- getLog().warn("no header generator found");
- return false;
+ throw new MojoExecutionException("no header generator found");
+// getLog().warn("no header generator found");
+// return false;
}
if (verbose) {
- Iterator<Entry<String, HeaderGenerator>> itr = _generators.entrySet().iterator();
- while (itr.hasNext()) {
- Entry<String, HeaderGenerator> next = itr.next();
+ for (Entry<String, HeaderGenerator> stringHeaderGeneratorEntry : _generators.entrySet()) {
+ Entry<String, HeaderGenerator> next = stringHeaderGeneratorEntry;
getLog().info("config - available generator : " + next.getKey());
}
}
if (!_generators.containsKey(generatorName.trim())) {
- getLog().warn("the generator named '" + generatorName + "' is unknown (use generator-list goal to see all of them)");
- return false;
+ throw new MojoExecutionException("the generator named '" + generatorName + "' is unknown (use generator-list goal to see all of them)");
+// getLog().warn("the generator named '" + generatorName + "' is unknown (use generator-list goal to see all of them)");
+// return false;
}
HeaderGenerator generator = _generators.get(generatorName);
@@ -295,50 +313,53 @@
getFilesToTreateForRoots(in, ex, compileSourceRoots, filesToTreate, null);
getFilesToTreateForRoots(in, ex, testCompileSourceRoots, filesToTreate, null);
- if (!filesToTreate.isEmpty()) {
+ if (filesToTreate.isEmpty()) {
+ return;
+ }
+// if (!filesToTreate.isEmpty()) {
- File templateFile = new File(template);
+ File templateFile = new File(template);
- // verifie que la template existe (dans le class-path ou en tant que fichier)
- checkResource(templateFile);
+ // verifie que la template existe (dans le class-path ou en tant que fichier)
+ checkResource(templateFile);
- // recuperation de la license a utiliser
- LicenseRepository factory = LicenseRepositoryFactory.newLicenseRepository(true, true, licenseResolver);
- License license = factory.getLicense(licenseName);
+ // recuperation de la license a utiliser
+ LicenseRepository factory = LicenseRepositoryFactory.newLicenseRepository(true, true, licenseResolver);
+ License license = factory.getLicense(licenseName);
- if (verbose) {
- getLog().info("config - use license " + license.getName());
- getLog().info("config - use generator " + generator.getName());
- getLog().info("config - use template " + template);
- }
- // obtain content of license header
- licenseHeaderContent = computeHeader(license, generator);
+ if (verbose) {
+ getLog().info("config - use license " + license.getName());
+ getLog().info("config - use generator " + generator.getName());
+ getLog().info("config - use template " + template);
+ }
+ // obtain content of license header
+ licenseHeaderContent = computeHeader(license, generator);
- // build the comment boxed header content
- boxedLicenseHeaderContent = generator.getHeader(licenseHeaderContent);
- if (verbose) {
- getLog().info("config - header to use\n" + boxedLicenseHeaderContent);
- }
-
- } else {
- getLog().info("no file to treate.");
+ // build the comment boxed header content
+ boxedLicenseHeaderContent = generator.getHeader(licenseHeaderContent);
+ if (verbose) {
+ getLog().info("config - header to use\n" + boxedLicenseHeaderContent);
}
- return true;
+// } else {
+// getLog().info("no file to treate.");
+// }
+
+// return true;
}
@Override
protected void doAction() throws Exception {
- if (skipUpdateHeader) {
- getLog().info("skip flag is on, the goal is skip.");
- return;
- }
+// if (skipUpdateHeader) {
+// getLog().info("skip flag is on, the goal is skip.");
+// return;
+// }
+//
+// if (filesToTreate.isEmpty()) {
+// getLog().info("No file to treate.");
+// return;
+// }
- if (filesToTreate.isEmpty()) {
- getLog().info("No file to treate.");
- return;
- }
-
// create a licence processor with given header
LicenseProcessor p = new LicenseProcessor(licenseHeaderContent);
@@ -377,18 +398,22 @@
if (verbose) {
getLog().debug("backup original file " + file);
}
- file.renameTo(backupFile);
+ renameFile(file, backupFile);
+// file.renameTo(backupFile);
}
if (dryRun) {
- processFile.delete();
+ deleteFile(processFile);
+// processFile.delete();
} else {
- processFile.renameTo(file);
+ renameFile(processFile, file);
+// processFile.renameTo(file);
}
} catch (Exception e) {
getLog().warn("skip file " + file + " (could not process for reason : " + e.getMessage() + ")");
- processFile.delete();
+ deleteFile(processFile);
+// processFile.delete();
} finally {
// toujours cleaner les états du filtre du processeur
p.getLicenceFilter().reset();
@@ -399,12 +424,12 @@
/**
* Construction du header a utiliser.
- *
+ * <p/>
* Le header est généré à partir de la template velocity donnée et de la
* license donnée.
*
- * @param license
- * @param generator
+ * @param license the license to use to compute header
+ * @param generator the header generator used to compute header
* @return le header construit
* @throws Exception pour toute erreur pendant la construction du header
*/
@@ -441,7 +466,7 @@
buffer.append("config - parameters for template : ");
for (Object key : context.getKeys()) {
- buffer.append("\n * " + key + " : " + context.get(key + ""));
+ buffer.append("\n * ").append(key).append(" : ").append(context.get(key + ""));
}
getLog().info(buffer.toString());
}
Modified: trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseRepositoryFactory.java
===================================================================
--- trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseRepositoryFactory.java 2009-11-25 07:49:08 UTC (rev 1667)
+++ trunk/src/main/java/org/nuiton/license/plugin/repository/LicenseRepositoryFactory.java 2010-01-01 16:52:22 UTC (rev 1668)
@@ -1,14 +1,14 @@
package org.nuiton.license.plugin.repository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
- *
* @author chemit
* @since 1.0.3
*/
@@ -18,24 +18,29 @@
* class-path directory where is the licenses repository
*/
public static final String JAR_LICENSE_REPOSITORY = "/META-INF/licenses";
- /** to use log facility, just put in your code: log.info(\"...\"); */
+ /**
+ * to use log facility, just put in your code: log.info(\"...\");
+ */
static private final Log log = LogFactory.getLog(LicenseRepositoryFactory.class);
/**
* Obtain a new repository.
*
* @param useJarRepository flag to use at first a jar repository
- * @param load flag to load the repository
- * @param extraResolvers extra baseURLs to defined extra license resolver
+ * @param load flag to load the repository
+ * @param extraResolvers extra baseURLs to defined extra license resolver
* @return the instanciate and ready to use license repository
- * @throws IllegalArgumentException
- * @throws IOException
+ * @throws IOException if any problem while acquiring license repository
*/
- public static LicenseRepository newLicenseRepository(boolean useJarRepository, boolean load, String... extraResolvers) throws IllegalArgumentException, IOException {
+ public static LicenseRepository newLicenseRepository(boolean useJarRepository, boolean load, String... extraResolvers) throws IOException {
List<URL> baseURLs = new ArrayList<URL>();
if (extraResolvers != null) {
for (String exUrl : extraResolvers) {
+ if (exUrl == null) {
+ // skpi null url
+ continue;
+ }
URL url;
try {
url = new URL(exUrl);
1
0
Author: tchemit
Date: 2009-11-25 08:49:08 +0100 (Wed, 25 Nov 2009)
New Revision: 1667
Modified:
trunk/pom.xml
Log:
use maven-jar-plugin 2.3 + reformat pom
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-24 16:45:13 UTC (rev 1666)
+++ trunk/pom.xml 2009-11-25 07:49:08 UTC (rev 1667)
@@ -1,12 +1,13 @@
<?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>
<!-- ************************************************************* -->
<!-- *** POM Relationships *************************************** -->
<!-- ************************************************************* -->
-
+
<groupId>org.nuiton</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>2.0.1-SNAPSHOT</version>
@@ -74,7 +75,7 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
-
+
<exclusion>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
@@ -145,7 +146,7 @@
<scope>test</scope>
<classifier>tests</classifier>
<exclusions>
-
+
<exclusion>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
@@ -227,7 +228,7 @@
</exclusions>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -263,7 +264,7 @@
</licenses>
<developers>
-
+
<developer>
<name>Tony Chemit</name>
<id>tchemit</id>
@@ -337,7 +338,7 @@
<system>hudson</system>
<url>http://hudson.nuiton.org/hudson/job/maven-license-plugin</url>
</ciManagement>
-
+
<!-- ************************************************************* -->
<!-- *** Build Settings ****************************************** -->
<!-- ************************************************************* -->
@@ -372,7 +373,7 @@
<license.licenseName>lgpl_v3</license.licenseName>
<repository.home.url>http://maven.nuiton.org/release</repository.home.url>
-
+
<helper.version>1.1.0</helper.version>
<jredmine.version>1.0.0</jredmine.version>
<processor.version>1.0.1</processor.version>
@@ -393,14 +394,14 @@
<redmine.collectedFiles>target/collect.properties</redmine.collectedFiles>
<!-- extra files to include in release -->
- <redmine.releaseFiles />
-
+ <redmine.releaseFiles/>
+
</properties>
<build>
<defaultGoal>install</defaultGoal>
-
+
<plugins>
<!-- expose new plexus components -->
@@ -415,7 +416,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<executions>
@@ -470,6 +471,11 @@
</plugin>
<plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.version}</version>
<configuration>
@@ -481,7 +487,8 @@
<!--skip>${maven.javadoc.skip}</skip-->
<taglets>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -489,7 +496,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -497,7 +505,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -513,7 +522,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -529,7 +539,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -537,7 +548,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -545,7 +557,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -577,7 +590,9 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass>
+ <tagletClass>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -585,7 +600,9 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass>
+ <tagletClass>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -593,7 +610,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -601,7 +619,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -609,7 +628,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -690,7 +710,7 @@
<artifactId>maven-helper-plugin</artifactId>
<version>${helper.version}</version>
</plugin>
-
+
<plugin>
<groupId>org.nuiton.jredmine</groupId>
<artifactId>maven-jredmine-plugin</artifactId>
@@ -778,7 +798,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -794,7 +815,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -802,7 +824,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -842,7 +865,9 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass>
+ <tagletClass>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -850,7 +875,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -858,7 +884,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -866,7 +893,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -874,7 +902,8 @@
</tagletArtifact>
</taglet>
<taglet>
- <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet
+ </tagletClass>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
@@ -1189,11 +1218,11 @@
<plugins>
-
+
<!--
- - obtain redmine login
- - send release email
- -->
+ - obtain redmine login
+ - send release email
+ -->
<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-helper-plugin</artifactId>
@@ -1303,7 +1332,7 @@
<maven.reports.generate>false</maven.reports.generate>
</properties>
</profile>
- <!-- do not build dependencies detail in maven-project-info-report (speedup site generation in dev) -->
+ <!-- do not build dependencies detail in maven-project-info-report (speedup site generation in dev) -->
<profile>
<id>nodepdetails</id>
<activation>
@@ -1355,5 +1384,5 @@
</profile-->
</profiles>
-
+
</project>
1
0
Author: tchemit
Date: 2009-11-24 17:45:13 +0100 (Tue, 24 Nov 2009)
New Revision: 1666
Modified:
trunk/pom.xml
Log:
use maven-changes-plugin 2.2 (with french translations :))
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-23 22:57:18 UTC (rev 1665)
+++ trunk/pom.xml 2009-11-24 16:45:13 UTC (rev 1666)
@@ -929,7 +929,7 @@
<!-- Implicit add of reportSet to not generate jira reports -->
<plugin>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<issueLinkTemplatePerSystem>
<redmine>${redmine.issueLinkTemplate}</redmine>
1
0
Author: tchemit
Date: 2009-11-23 23:57:18 +0100 (Mon, 23 Nov 2009)
New Revision: 1665
Modified:
trunk/pom.xml
Log:
bump plexus-component-metadata version
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-02 03:09:28 UTC (rev 1664)
+++ trunk/pom.xml 2009-11-23 22:57:18 UTC (rev 1665)
@@ -435,7 +435,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
</plugin>
<plugin>
1
0
Author: tchemit
Date: 2009-11-02 04:09:28 +0100 (Mon, 02 Nov 2009)
New Revision: 1664
Modified:
trunk/pom.xml
Log:
bump maven-helper-pluging and maven-jredmine-plugin + fix redmine-release-profile
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-01 16:19:45 UTC (rev 1663)
+++ trunk/pom.xml 2009-11-02 03:09:28 UTC (rev 1664)
@@ -346,6 +346,17 @@
<properties>
+ <platform>nuiton.org</platform>
+
+ <!-- a proprerty to define the id of the project, in a multi-module
+ project, you must use a hard-cored value, otherwise for modules
+ the artifactId will be expanded , otherwise, no need to override it
+ -->
+ <projectId>${project.artifactId}</projectId>
+
+ <!-- a property to define list id -->
+ <listId>${projectId}</listId>
+
<maven.src.dir>${basedir}/src</maven.src.dir>
<maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target>
@@ -362,8 +373,8 @@
<repository.home.url>http://maven.nuiton.org/release</repository.home.url>
- <helper.version>1.1.0-SNAPSHOT</helper.version>
- <jredmine.version>1.0.0-rc-3-SNAPSHOT</jredmine.version>
+ <helper.version>1.1.0</helper.version>
+ <jredmine.version>1.0.0</jredmine.version>
<processor.version>1.0.1</processor.version>
<jrst.version>1.0.0</jrst.version>
@@ -372,8 +383,9 @@
<javadoc.version>2.5</javadoc.version>
<!-- redmine configuration -->
- <redmine.url>http://www.nuiton.org</redmine.url>
- <redmine.serverId>redmine-nuiton.org</redmine.serverId>
+ <redmine.safe>false</redmine.safe>
+ <redmine.url>http://www.${platform}</redmine.url>
+ <redmine.serverId>redmine-${platform}</redmine.serverId>
<redmine.projectId>maven-license-plugin</redmine.projectId>
<redmine.xmlPath>target/generated-sources/changes/changes.xml</redmine.xmlPath>
<redmine.issueLinkTemplate>${redmine.url}/issues/show/%ISSUE%</redmine.issueLinkTemplate>
@@ -974,22 +986,6 @@
<version>2.3</version>
</plugin>
- <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>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>issues-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
</plugins>
</reporting>
@@ -1007,7 +1003,7 @@
<build>
<plugins>
- <!-- add license and third-party files to build -->
+ <!-- add license and third-party files to build -->
<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-license-plugin</artifactId>
@@ -1023,37 +1019,6 @@
</executions>
</plugin>
- <!-- generate the changes.xml from redmine -->
- <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>
-
- <!-- generate-changes -->
- <generateOnce>true</generateOnce>
- <actionMapping>fix:1, add:2</actionMapping>
- <statusIds>3,4,5</statusIds>
-
- <!-- generate announcements -->
- <urlDownload>${redmine.url}/projects/list_files/${projectId}</urlDownload>
-
- <!--<changesTitle>Release note of Maven pom project</changesTitle>-->
- <!--<releaseDescription>Description of first release</releaseDescription>-->
- <!--<verbose>true</verbose>-->
- </configuration>
- </plugin>
-
<!-- always compute source jar -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -1080,12 +1045,82 @@
</executions>
</plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- perform only on a release stage when using the maven-release-plugin -->
+ <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>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>issues-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ </plugins>
+ </reporting>
+ <build>
+
+ <plugins>
+
+ <!--
+ - obtain redmine login
+ - collect files for jredmine release
+ -->
+ <plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-helper-plugin</artifactId>
<executions>
- <!-- collect files to send to redmine -->
<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>
@@ -1097,11 +1132,42 @@
<!--<copyFiles>false</copyFiles>-->
</configuration>
</execution>
+ </executions>
+ </plugin>
+ <!-- generate the changes.xml from redmine -->
+ <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>
+
+ <!-- generate-changes -->
+ <generateOnce>true</generateOnce>
+ <actionMapping>fix:1, add:2</actionMapping>
+ <statusIds>3,4,5</statusIds>
+
+ <!-- generate announcements -->
+ <urlDownload>${redmine.url}/projects/list_files/${projectId}</urlDownload>
+
+ <!--<changesTitle>Release note of Maven pom project</changesTitle>-->
+ <!--<releaseDescription>Description of first release</releaseDescription>-->
+ <!--<verbose>true</verbose>-->
+ </configuration>
</plugin>
</plugins>
+
</build>
</profile>
@@ -1123,8 +1189,62 @@
<plugins>
- <!-- generate the changes.xml from redmine -->
+
+ <!--
+ - obtain redmine login
+ - send release email
+ -->
<plugin>
+ <groupId>org.nuiton</groupId>
+ <artifactId>maven-helper-plugin</artifactId>
+ <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>
+
+ <!-- for a multi-module just run on root project -->
+ <runOnce>true</runOnce>
+
+ <emailTitle>[ANNOUNCEMENT] - ${project.name} ${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>
+
+ <!--
+ - update version in redmine
+ - publish release files to redmine
+ - publish a release news in redmine
+ -->
+ <plugin>
<groupId>org.nuiton.jredmine</groupId>
<artifactId>maven-jredmine-plugin</artifactId>
<executions>
@@ -1139,8 +1259,6 @@
</execution>
</executions>
<configuration>
- <!-- Send nothing ! -->
- <!--<dryRun>true</dryRun>-->
<!-- for a multi-module just run on root project -->
<runOnce>true</runOnce>
@@ -1152,49 +1270,14 @@
<filesFromProperties>${redmine.collectedFiles}</filesFromProperties>
<!-- publish-news -->
- <newsContentFile>target/generated-sources/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>
</configuration>
</plugin>
- <!-- always add license and third-party files to classpath -->
- <plugin>
- <groupId>org.nuiton</groupId>
- <artifactId>maven-helper-plugin</artifactId>
- <executions>
- <execution>
- <id>send-release-email</id>
- <goals>
- <goal>send-email</goal>
- </goals>
- <phase>validate</phase>
- </execution>
- </executions>
- <configuration>
- <!-- Send nothing ! -->
- <!--<dryRun>true</dryRun>-->
-
- <!-- for a multi-module just run on root project -->
- <runOnce>true</runOnce>
-
- <emailTitle>[ANNOUNCEMENT] - ${project.name} ${project.version} released</emailTitle>
- <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm</emailContentFile>
- <mailSender>
- <name>nuiton.org Release Notification</name>
- <email>noreply(a)nuiton.org</email>
- </mailSender>
- <toAddresses>
- <!--<item>${listId}-users(a)list.nuiton.org</item>-->
- <!--<item>lutin(a)codelutin.com</item>-->
- <!--<item>dev(a)codelutin.com</item>-->
- <item>chemit(a)codelutin.com</item>
- </toAddresses>
- <smtpHost>smtp</smtpHost>
- </configuration>
- </plugin>
-
</plugins>
</build>
1
0
r1663 - in trunk: . src/test/resources/org/nuiton/license/plugin
by tchemit＠users.nuiton.org Nov. 1, 2009
by tchemit＠users.nuiton.org Nov. 1, 2009
Nov. 1, 2009
Author: tchemit
Date: 2009-11-01 17:19:45 +0100 (Sun, 01 Nov 2009)
New Revision: 1663
Added:
trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/
trunk/src/test/resources/org/nuiton/license/plugin/updateHeaderPluginTest/
Removed:
trunk/src/test/resources/org/nuiton/license/plugin/AddLicenseFilePluginTest/
trunk/src/test/resources/org/nuiton/license/plugin/UpdateHeaderPluginTest/
Modified:
trunk/
trunk/pom.xml
Log:
use maven-helper-plugin 1.1.0
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.classpath
.project
+ target
.settings
.classpath
.project
*.iml
*.ipr
*.iws
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-10-10 15:19:39 UTC (rev 1662)
+++ trunk/pom.xml 2009-11-01 16:19:45 UTC (rev 1663)
@@ -362,8 +362,8 @@
<repository.home.url>http://maven.nuiton.org/release</repository.home.url>
- <helper.version>1.0.3</helper.version>
- <jredmine.version>1.0.0-rc-2</jredmine.version>
+ <helper.version>1.1.0-SNAPSHOT</helper.version>
+ <jredmine.version>1.0.0-rc-3-SNAPSHOT</jredmine.version>
<processor.version>1.0.1</processor.version>
<jrst.version>1.0.0</jrst.version>
@@ -374,7 +374,7 @@
<!-- redmine configuration -->
<redmine.url>http://www.nuiton.org</redmine.url>
<redmine.serverId>redmine-nuiton.org</redmine.serverId>
- <redmine.projectId>${projectId}</redmine.projectId>
+ <redmine.projectId>maven-license-plugin</redmine.projectId>
<redmine.xmlPath>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>
@@ -702,6 +702,24 @@
<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>
@@ -989,6 +1007,22 @@
<build>
<plugins>
+ <!-- add license and third-party files to build -->
+ <plugin>
+ <groupId>org.nuiton</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>2.0.0</version>
+ <executions>
+ <execution>
+ <id>attach-licenses</id>
+ <goals>
+ <goal>add-license</goal>
+ <goal>add-third-party</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- generate the changes.xml from redmine -->
<plugin>
<groupId>org.nuiton.jredmine</groupId>
@@ -1046,19 +1080,10 @@
</executions>
</plugin>
- <!-- TO REMOVE when using maven-helper-plugin 1.1.0 -->
<plugin>
<groupId>org.nuiton</groupId>
<artifactId>maven-helper-plugin</artifactId>
<executions>
- <!-- will be removed when using maven-license-plugin -->
- <execution>
- <id>attach-licenses</id>
- <goals>
- <goal>add-license</goal>
- <goal>add-third-party</goal>
- </goals>
- </execution>
<!-- collect files to send to redmine -->
<execution>
<id>collect-files</id>
1
0
Author: tchemit
Date: 2009-10-10 17:19:39 +0200 (Sat, 10 Oct 2009)
New Revision: 1662
Modified:
trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-10-10 15:19:34 UTC (rev 1661)
+++ trunk/pom.xml 2009-10-10 15:19:39 UTC (rev 1662)
@@ -9,7 +9,7 @@
<groupId>org.nuiton</groupId>
<artifactId>maven-license-plugin</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<dependencies>
@@ -308,9 +308,9 @@
<!-- Source control management. -->
<scm>
- <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/tags/maven-license-p…</connection>
- <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/tags/maven-license-p…</developerConnection>
- <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/tags/maven-l…</url>
+ <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</connection>
+ <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</developerConnection>
+ <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/trunk</url>
</scm>
<issueManagement>
1
0