Author: tchemit Date: 2013-08-05 11:10:14 +0200 (Mon, 05 Aug 2013) New Revision: 1453 Url: http://nuiton.org/projects/mavenpom/repository/revisions/1453 Log: fixes #2799: Set relativizeDecorationLinks property to false fixes #2800: apply tidy:pom on poms Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml trunk/mavenpom4redmine/pom.xml trunk/mavenpomdoc/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2013-07-18 13:14:33 UTC (rev 1452) +++ trunk/mavenpom4labs/pom.xml 2013-08-05 09:10:14 UTC (rev 1453) @@ -23,14 +23,13 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> @@ -38,27 +37,23 @@ </parent> <artifactId>mavenpom4labs</artifactId> - + <packaging>pom</packaging> <!-- add this in your pom - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4labs</artifactId> - <version>XXX</version> - </parent> - --> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4labs</artifactId> + <version>XXX</version> + </parent> + --> <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>Mavenpom4labs</name> - <description> Ancestor of all projects of Code Lutin based on a labs environnement </description> - <inceptionYear>2010</inceptionYear> - <licenses> <license> <name>General Public License (GPL) v 3.0</name> @@ -66,7 +61,6 @@ <distribution>repo</distribution> </license> </licenses> - <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> @@ -111,14 +105,13 @@ <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <properties> - <labs.id /> + <labs.id/> <labs.list.host>lists.${platform}</labs.list.host> - <!-- default license to use for sons --> + <!-- default license to use for sons --> <license.licenseName>gpl_v3</license.licenseName> <!-- the platform is labs for all sons --> @@ -132,7 +125,9 @@ <!-- ceux qui utilisent mavenpom4labs sont sur le labs --> <!--<site.server>labs</site.server>--> - <site.repository>scpexe://${platform}/home/groups/${projectId}/htdocs</site.repository> + <site.repository> + scpexe://${platform}/home/groups/${projectId}/htdocs + </site.repository> <!-- customize maven-nuiton-skin --> <scmwebeditorEnabled>false</scmwebeditorEnabled> @@ -141,13 +136,10 @@ <googleSearchEnabled>false</googleSearchEnabled> <piwikEnabled>false</piwikEnabled> </properties> - - <packaging>pom</packaging> - <!-- ************************************************************* --> <!-- *** Maven Environment *************************************** --> <!-- ************************************************************* --> - + <!-- Maven Environment : profiles --> <profiles> @@ -162,7 +154,7 @@ </activation> <properties> - + <platform>nuiton.org</platform> <!-- stay on lgpl v3 for the project --> @@ -210,15 +202,20 @@ <configuration> <tasks> <!-- adds the ant-contrib tasks (if/then/else used below) --> - <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> + <taskdef + resource="net/sf/antcontrib/antcontrib.properties"/> <if> - <equals arg1="${siteSourcesType}" arg2="rst" /> + <equals arg1="${siteSourcesType}" arg2="rst"/> <then> - <echo message="Copy changelog.txt to src/site/rst/release-note.rst" /> - <copy verbose="${maven.verbose}" failonerror="false" overwrite="false" file="changelog.txt" tofile="src/site/rst/release-note.rst.vm" /> + <echo + message="Copy changelog.txt to src/site/rst/release-note.rst"/> + <copy verbose="${maven.verbose}" failonerror="false" + overwrite="false" file="changelog.txt" + tofile="src/site/rst/release-note.rst.vm"/> </then> <else> - <echo message="Skip Copy changelog.txt to src/site/rst/release-note.rst (not rst documentation)" /> + <echo + message="Skip Copy changelog.txt to src/site/rst/release-note.rst (not rst documentation)"/> </else> </if> </tasks> @@ -269,7 +266,9 @@ <dryRun>true</dryRun> <helper.dryRun>${dryRun}</helper.dryRun> <release.version>${project.version}</release.version> - <emailContentFile>src/announcement/release-email-${release.version}.txt</emailContentFile> + <emailContentFile> + src/announcement/release-email-${release.version}.txt + </emailContentFile> </properties> <build> @@ -325,7 +324,9 @@ <!-- for a multi-module just run on root project --> <runOnce>true</runOnce> <!--<dryRun>${dryRun}</dryRun>--> - <emailTitle>[ANN] - ${project.name} ${release.version} released</emailTitle> + <emailTitle>[ANN] - ${project.name} ${release.version} + released + </emailTitle> <emailContentFile>${emailContentFile}</emailContentFile> <mailSender> <name>${platform} Release Notification</name> @@ -363,5 +364,4 @@ </profiles> - </project> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2013-07-18 13:14:33 UTC (rev 1452) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2013-08-05 09:10:14 UTC (rev 1453) @@ -23,14 +23,13 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> @@ -38,31 +37,26 @@ </parent> <artifactId>mavenpom4redmineAndCentral</artifactId> - + <packaging>pom</packaging> <!-- add this in your pom - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>XXX</version> - </parent> - --> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmineAndCentral</artifactId> + <version>XXX</version> + </parent> + --> <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>Mavenpom4redmineAndCentral</name> - <description>Ancestor of all projects of Code Lutin based on a redmine developpment environnement and which are synchronized to Maven central </description> - <inceptionYear>2010</inceptionYear> - <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <properties> <!-- deploy releases on central-releases repository --> @@ -72,15 +66,13 @@ <repository.home.url>${central.release.home.url}</repository.home.url> <!-- use Maven central repository for announcement --> - <redmine.deploymentUrl>http://repo1.maven.org/maven2/</redmine.deploymentUrl> + <redmine.deploymentUrl>http://repo1.maven.org/maven2/ + </redmine.deploymentUrl> <redmine.templateDirectory> http://maven-site.nuiton.org/mavenpom/announcement/redmineAndCentral </redmine.templateDirectory> </properties> - - <packaging>pom</packaging> - <!-- ************************************************************* --> <!-- *** Maven Environment *************************************** --> <!-- ************************************************************* --> @@ -96,7 +88,7 @@ <value>true</value> </property> </activation> - + <build> <defaultGoal>validate</defaultGoal> <plugins> @@ -114,7 +106,8 @@ <addMavenCentral>true</addMavenCentral> <failIfNotSafe>true</failIfNotSafe> <repositories> - <central-releases>${central.release.home.url}</central-releases> + <central-releases>${central.release.home.url} + </central-releases> </repositories> </configuration> </execution> @@ -125,5 +118,4 @@ </profile> </profiles> - </project> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2013-07-18 13:14:33 UTC (rev 1452) +++ trunk/mavenpom4redmine/pom.xml 2013-08-05 09:10:14 UTC (rev 1453) @@ -23,14 +23,13 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> @@ -38,42 +37,34 @@ </parent> <artifactId>mavenpom4redmine</artifactId> - - <!-- add this in your pom - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>XXX</version> - </parent> - --> - - <modules> - <module>mavenpom4redmineAndCentral</module> - </modules> - + <packaging>pom</packaging> <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>Mavenpom4redmine</name> - <description>Ancestor of all projects of Code Lutin based on a redmine developpment environnement </description> - <inceptionYear>2010</inceptionYear> - + <!-- add this in your pom + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>XXX</version> + </parent> + --> + <modules> + <module>mavenpom4redmineAndCentral</module> + </modules> <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> <!-- Build Environment : Environment Information --> - <issueManagement> <system>redmine</system> <url>${redmine.url}/projects/${projectId}/issues</url> </issueManagement> - <!--Any mailing lists for the project--> <!--on redmine platform (nuiton or chorem) we normalize it to 3 lists --> <!--commits, devel and users --> @@ -118,7 +109,6 @@ <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <properties> <!-- the redmine plateform used (nuiton.org or chorem.org) --> @@ -134,9 +124,11 @@ <redmine.url>http://${platform}</redmine.url> <redmine.projectId>${projectId}</redmine.projectId> <redmine.xmlPath>${maven.gen.dir}/changes/changes.xml</redmine.xmlPath> - <redmine.collectedArtifacts>target/collect-artifacts.txt + <redmine.collectedArtifacts> + target/collect-artifacts.txt </redmine.collectedArtifacts> - <redmine.collectedAttachments>target/collect-attachments.txt + <redmine.collectedAttachments> + target/collect-attachments.txt </redmine.collectedAttachments> <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl> @@ -145,7 +137,7 @@ </redmine.templateDirectory> <!-- extra files to include in release --> - <redmine.releaseFiles /> + <redmine.releaseFiles/> <!-- use this for a lib extra files --> <redmine.libReleaseFiles> @@ -154,9 +146,6 @@ </redmine.libReleaseFiles> </properties> - - <packaging>pom</packaging> - <!-- ************************************************************* --> <!-- *** Maven Environment *************************************** --> <!-- ************************************************************* --> @@ -449,7 +438,9 @@ <!-- for a multi-module just run on root project --> <runOnce>true</runOnce> - <emailTitle>[ANN] - ${project.name} ${project.version} released</emailTitle> + <emailTitle> + [ANN] - ${project.name} ${project.version} released + </emailTitle> <emailContentFile> target/generated-sources/announcement/release-email-announcement.vm </emailContentFile> @@ -653,5 +644,4 @@ </profile> </profiles> - </project> Modified: trunk/mavenpomdoc/pom.xml =================================================================== --- trunk/mavenpomdoc/pom.xml 2013-07-18 13:14:33 UTC (rev 1452) +++ trunk/mavenpomdoc/pom.xml 2013-08-05 09:10:14 UTC (rev 1453) @@ -23,14 +23,13 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> @@ -39,13 +38,29 @@ </parent> <artifactId>mavenpomdoc</artifactId> + <packaging>pom</packaging> + <name>mavenpomdoc</name> - <description>Documentation of the mavenpom project.</description> - + <url>http://maven-site.nuiton.org/mavenpom</url> <inceptionYear>2012</inceptionYear> - <url>http://maven-site.nuiton.org/mavenpom</url> + <scm> + <connection> + scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk/mavenpomdoc + </connection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk/mavenpomdoc + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/mavenpom/trunk/mavenpomdoc + </url> + </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> <properties> @@ -83,21 +98,6 @@ </properties> - <packaging>pom</packaging> - - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk/mavenpomdoc</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk/mavenpomdoc</developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/trunk/mavenpomdoc</url> - </scm> - <reporting> <plugins> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-18 13:14:33 UTC (rev 1452) +++ trunk/pom.xml 2013-08-05 09:10:14 UTC (rev 1453) @@ -23,36 +23,30 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> <version>3.4.14-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>mavenpom4redmine</module> - <module>mavenpom4labs</module> - <module>mavenpomdoc</module> - </modules> - <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>Mavenpom</name> - <description>Ancestor of all projects of Code Lutin</description> - <url>http://maven-site.nuiton.org/mavenpom</url> - <inceptionYear>2009</inceptionYear> - + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> <licenses> <license> <name>Lesser General Public License (LGPL) v 3.0</name> @@ -108,28 +102,6 @@ </developer> </developers> - - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <!-- Build Environment : Environment Information --> - - <issueManagement> - <system>redmine</system> - <url>http://${platform}/projects/${projectId}/issues</url> - </issueManagement> - - <ciManagement> - <system>hudson</system> - <url>${ci.host.url}/job/${projectId}</url> - </ciManagement> - <!--Any mailing lists for the project--> <mailingLists> <mailingList> @@ -168,18 +140,55 @@ <archive>http://list.${platform}/pipermail/${listId}-users/</archive> </mailingList> </mailingLists> + <!-- ************************************************************* --> + <!-- *** Maven Environment *************************************** --> + <!-- ************************************************************* --> + <!-- prerequisites --> + <prerequisites> + <maven>2.2.1</maven> + </prerequisites> + + <modules> + <module>mavenpom4redmine</module> + <module>mavenpom4labs</module> + <module>mavenpomdoc</module> + </modules> <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</developerConnection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk + </developerConnection> <url>http://nuiton.org/projects/mavenpom/repository/trunk</url> </scm> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <!-- Build Environment : Environment Information --> + <issueManagement> + <system>redmine</system> + <url>http://${platform}/projects/${projectId}/issues</url> + </issueManagement> + <ciManagement> + <system>hudson</system> + <url>${ci.host.url}/job/${projectId}</url> + </ciManagement> + <!--Distribution--> + <distributionManagement> + <repository> + <id>${release.server}</id> + <url>${release.repository}</url> + </repository> + <snapshotRepository> + <id>${snapshot.server}</id> + <url>${snapshot.repository}</url> + </snapshotRepository> + </distributionManagement> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <properties> <!-- the redmine plateform used (nuiton.org or chorem.org or forge.codelutin.com) --> @@ -195,16 +204,24 @@ <listId>${projectId}</listId> <!-- location of central-releases repository --> - <central.release.repository>http://nexus.nuiton.org/nexus/content/repositories/central-releases</central.release.repository> + <central.release.repository> + http://nexus.nuiton.org/nexus/content/repositories/central-releases + </central.release.repository> <!-- location of other-releases repository --> - <other.release.repository>http://nexus.nuiton.org/nexus/content/repositories/other-releases</other.release.repository> + <other.release.repository> + http://nexus.nuiton.org/nexus/content/repositories/other-releases + </other.release.repository> <!-- location of nuiton snapshots repository --> - <our.snapshot.repository>http://nexus.nuiton.org/nexus/content/repositories/snapshots</our.snapshot.repository> + <our.snapshot.repository> + http://nexus.nuiton.org/nexus/content/repositories/snapshots + </our.snapshot.repository> <!-- location of nuiton site repository --> - <our.site.repository>scpexe://${platform}/var/lib/redmine-${platform}/project-site</our.site.repository> + <our.site.repository> + scpexe://${platform}/var/lib/redmine-${platform}/project-site + </our.site.repository> <!-- location of the release repository to use --> <release.repository>${other.release.repository}</release.repository> @@ -217,7 +234,7 @@ <!-- server to use for snapshot --> <snapshot.server>nuiton-nexus-deploy</snapshot.server> - + <!-- default encoding --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -285,7 +302,8 @@ <!-- codehaus plexus plugins --> <plexusPluginVersion>1.3.8</plexusPluginVersion> - <plexusComponentMetadataPluginVersion>1.5.5</plexusComponentMetadataPluginVersion> + <plexusComponentMetadataPluginVersion>1.5.5 + </plexusComponentMetadataPluginVersion> <!-- others plugins --> <androidPluginVersion>2.8.4</androidPluginVersion> @@ -298,7 +316,7 @@ <changelogPluginVersion>2.2</changelogPluginVersion> <jrxPluginVersion>2.3</jrxPluginVersion> <sonarReportPluginVersion>0.1</sonarReportPluginVersion> - + <!-- common libs used in projects --> <commonsBeanutilsVersion>1.8.3</commonsBeanutilsVersion> <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> @@ -316,7 +334,7 @@ <guavaVersion>14.0.1</guavaVersion> <junitVersion>4.11</junitVersion> <log4jVersion>1.2.17</log4jVersion> - + <!-- to deploy with scpexe for maven 3 --> <wagonSshExternalVersion>1.0</wagonSshExternalVersion> @@ -336,7 +354,9 @@ <maven.compiler.showWarnings>true</maven.compiler.showWarnings> <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation> <!-- for the moment we do not want to use incremental compilation --> - <maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation> + <maven.compiler.useIncrementalCompilation> + false + </maven.compiler.useIncrementalCompilation> <!-- javadoc configuration --> @@ -360,8 +380,13 @@ <!-- default documentation format (if not rst, change it)--> <siteSourcesType>rst</siteSourcesType> + <!-- do not relativize links in generated site --> + <relativizeDecorationLinks>false</relativizeDecorationLinks> + <!-- scmwebeditor url --> - <scmwebeditorUrl>http://scmwebeditor.nuiton.org/scmwebeditor/checkout.action</scmwebeditorUrl> + <scmwebeditorUrl> + http://scmwebeditor.nuiton.org/scmwebeditor/checkout.action + </scmwebeditorUrl> <!-- customize maven-nuiton-skin --> <scmwebeditorEnabled>true</scmwebeditorEnabled> @@ -370,12 +395,16 @@ <googleSearchEnabled>true</googleSearchEnabled> <piwikEnabled>true</piwikEnabled> <!-- fill this property to use a specific Piwik site id --> - <piwikId /> + <piwikId/> <!-- central releases url --> - <central.release.home.url>http://maven.nuiton.org/central-releases</central.release.home.url> + <central.release.home.url> + http://maven.nuiton.org/central-releases + </central.release.home.url> <!-- other releases url --> - <other.release.home.url>http://maven.nuiton.org/other-releases</other.release.home.url> + <other.release.home.url> + http://maven.nuiton.org/other-releases + </other.release.home.url> <!-- release repository url (to be used in site.xml, by default use other-release repository) --> <repository.home.url>${other.release.home.url}</repository.home.url> @@ -387,8 +416,8 @@ <!-- activate this profile while doing release:prepare to make sur everything is ok (license, third-party...) --> <arguments>-DperformRelease</arguments> - - <!-- release tag configuration --> + + <!-- release tag configuration --> <tagNameFormat>${projectId}-@{project.version}</tagNameFormat> <!-- default signature configuration --> @@ -397,8 +426,6 @@ </properties> - <packaging>pom</packaging> - <dependencyManagement> <dependencies> @@ -497,14 +524,14 @@ <artifactId>log4j</artifactId> <version>${log4jVersion}</version> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junitVersion}</version> <scope>test</scope> </dependency> - + </dependencies> </dependencyManagement> @@ -522,67 +549,6 @@ </excludes> </resource> </resources> - - <!-- Enabling the use of scpexe with maven 3.0 --> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>${wagonSshExternalVersion}</version> - </extension> - </extensions> - - <plugins> - - <!-- http://nuiton.org/issues/1683 : creates the surefire-workdir --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-surefire-workdir</id> - <phase>generate-test-sources</phase> - <configuration> - <target> - <mkdir dir="${basedir}/target/surefire-workdir" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>check-project-files</id> - <goals> - <goal>enforce</goal> - </goals> - <phase>initialize</phase> - <configuration> - <rules> - <requireFilesExist> - <files> - <file>LICENSE.txt</file> - <file>README.txt</file> - <!--file>changelog.txt</file--> - </files> - </requireFilesExist> - </rules> - <ignoreCache>true</ignoreCache> - <failFast>true</failFast> - <fail>true</fail> - - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - <pluginManagement> <plugins> @@ -636,7 +602,7 @@ <artifactId>maven-ejb-plugin</artifactId> <version>${ejbPluginVersion}</version> </plugin> - + <plugin> <artifactId>maven-enforcer-plugin</artifactId> <version>${enforcerPluginVersion}</version> @@ -657,7 +623,7 @@ <version>${invokerPluginVersion}</version> </plugin> - <plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <version>${jarPluginVersion}</version> <inherited>true</inherited> @@ -733,7 +699,7 @@ <configuration> </configuration> </plugin> - + <plugin> <artifactId>maven-source-plugin</artifactId> <version>${sourcePluginVersion}</version> @@ -744,7 +710,8 @@ <version>${surefirePluginVersion}</version> <configuration> <systemPropertyVariables> - <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> + <java.io.tmpdir>${project.build.directory}/surefire-workdir + </java.io.tmpdir> </systemPropertyVariables> </configuration> </plugin> @@ -792,7 +759,7 @@ <artifactId>findbugs-maven-plugin</artifactId> <version>${findbugsPluginVersion}</version> </plugin> - + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> @@ -872,7 +839,7 @@ <!-- Plugins version from nuiton --> - <plugin> + <plugin> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin</artifactId> <version>${helperPluginVersion}</version> @@ -909,7 +876,7 @@ <artifactId>tomcat7-maven-plugin</artifactId> <version>${tomcatPluginVersion}</version> </plugin> - + <plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId> @@ -918,34 +885,69 @@ </plugins> </pluginManagement> + <plugins> + <!-- http://nuiton.org/issues/1683 : creates the surefire-workdir --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-surefire-workdir</id> + <phase>generate-test-sources</phase> + <configuration> + <target> + <mkdir dir="${basedir}/target/surefire-workdir"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>check-project-files</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>initialize</phase> + <configuration> + <rules> + <requireFilesExist> + <files> + <file>LICENSE.txt</file> + <file>README.txt</file> + <!--file>changelog.txt</file--> + </files> + </requireFilesExist> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + <!-- Enabling the use of scpexe with maven 3.0 --> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>${wagonSshExternalVersion}</version> + </extension> + </extensions> </build> <reporting> <excludeDefaults>true</excludeDefaults> </reporting> - - <!-- ************************************************************* --> - <!-- *** Maven Environment *************************************** --> - <!-- ************************************************************* --> - - <!-- prerequisites --> - <prerequisites> - <maven>2.2.1</maven> - </prerequisites> - - <!--Distribution--> - <distributionManagement> - <repository> - <id>${release.server}</id> - <url>${release.repository}</url> - </repository> - <snapshotRepository> - <id>${snapshot.server}</id> - <url>${snapshot.repository}</url> - </snapshotRepository> - </distributionManagement> - <!-- Maven Environment : profiles --> <profiles> @@ -1000,7 +1002,7 @@ <value>true</value> </property> </activation> - + <build> <plugins> @@ -1049,7 +1051,7 @@ <build> <defaultGoal>generate-resources</defaultGoal> - + <plugins> <!-- add license and third-party files to build --> @@ -1092,7 +1094,7 @@ </profile> <profile> - <id>central-safe</id> + <id>central-safe</id> <build> <defaultGoal>validate</defaultGoal> <plugins> @@ -1110,7 +1112,9 @@ <addMavenCentral>true</addMavenCentral> <failIfNotSafe>true</failIfNotSafe> <repositories> - <central-releases>${central.release.home.url}</central-releases> + <central-releases> + ${central.release.home.url} + </central-releases> </repositories> </configuration> </execution> @@ -1119,7 +1123,7 @@ </plugins> </build> </profile> - + <!-- profile with all reports (include in release process) --> <profile> <id>reporting</id> @@ -1219,7 +1223,7 @@ </reportSet> </reportSets> </plugin> - + <!--plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId> @@ -1275,7 +1279,9 @@ <rules> <bannedDependencies> <excludes> - <exclude>org.codehaus.plexus:plexus-component-api</exclude> + <exclude> + org.codehaus.plexus:plexus-component-api + </exclude> </excludes> <message> The new containers are not supported. You @@ -1481,7 +1487,7 @@ </plugins> </build> </profile> - + <!-- just add to build the webstart --> <profile> <id>webstart-profile</id> @@ -1626,7 +1632,7 @@ <release.repository>${central.release.repository}</release.repository> <!-- release repository url (to be used in site.xml, by default use other-release repository) --> <repository.home.url>${central.release.home.url}</repository.home.url> - + <!-- must fail if redmine actions failed --> <redmine.safe>true</redmine.safe> @@ -1634,14 +1640,15 @@ <redmine.url>http://www.${platform}</redmine.url> <redmine.projectId>${projectId}</redmine.projectId> <redmine.xmlPath>${maven.gen.dir}/changes/changes.xml</redmine.xmlPath> - <redmine.collectedArtifacts>target/collect-artifacts.txt</redmine.collectedArtifacts> + <redmine.collectedArtifacts>target/collect-artifacts.txt + </redmine.collectedArtifacts> <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl> <redmine.templateDirectory> http://maven-site.nuiton.org/mavenpom/announcement/redmineAndCentral </redmine.templateDirectory> - + <!-- extra files to include in release --> - <redmine.releaseFiles /> + <redmine.releaseFiles/> </properties> @@ -1654,7 +1661,7 @@ </site> </distributionManagement--> <build> - + <plugins> <!-- @@ -1688,7 +1695,9 @@ </goals> <phase>install</phase> <configuration> - <descriptionFile>${redmine.collectedArtifacts}</descriptionFile> + <descriptionFile> + ${redmine.collectedArtifacts} + </descriptionFile> <includeAttached>true</includeAttached> <includeSiteAttached>true</includeSiteAttached> <copyFiles>true</copyFiles> @@ -1831,10 +1840,12 @@ <configuration> <!-- publish-attachments --> - <filesFromProperties>${redmine.collectedAttachments}</filesFromProperties> + <filesFromProperties>${redmine.collectedAttachments} + </filesFromProperties> <!-- generate announcements --> - <urlDownload>${redmine.url}/projects/files/${projectId}</urlDownload> + <urlDownload>${redmine.url}/projects/files/${projectId} + </urlDownload> <artifactsFile>${redmine.collectedArtifacts}</artifactsFile> <deploymentUrl> http://repo1.maven.org/maven2 @@ -1905,8 +1916,12 @@ <!-- for a multi-module just run on root project --> <runOnce>true</runOnce> - <emailTitle>[ANN] - ${project.name} ${project.version} released</emailTitle> - <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm</emailContentFile> + <emailTitle> + [ANN] - ${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> @@ -1949,7 +1964,9 @@ <closeVersion>true</closeVersion> <!-- 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> @@ -1961,7 +1978,7 @@ </build> </profile> - <profile> + <profile> <id>maven-3</id> <activation> <file> @@ -2089,5 +2106,4 @@ </profile> </profiles> - </project>