Author: tchemit Date: 2013-08-09 11:05:00 +0200 (Fri, 09 Aug 2013) New Revision: 1294 Url: http://nuiton.org/projects/eugene/repository/revisions/1294 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2013-07-23 14:47:19 UTC (rev 1293) +++ trunk/eugene/pom.xml 2013-08-09 09:05:00 UTC (rev 1294) @@ -22,11 +22,10 @@ <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>eugene</artifactId> @@ -35,20 +34,13 @@ <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> -<!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> <name>EUGene :: EUGene</name> <description>Efficient Universal Generator.</description> - <inceptionYear>2004</inceptionYear> -<!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> <properties> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> </properties> -<!-- POM Relationships : Inheritance : Dependencies --> + <dependencies> <dependency> @@ -58,7 +50,7 @@ <dependency> <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> @@ -132,11 +124,11 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.12</version> - </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.12</version> + </dependency> </dependencies> @@ -189,9 +181,7 @@ </plugin> </plugins> </build> -<!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <profiles> <!-- prepare release assemblies at release time --> <profile> Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2013-07-23 14:47:19 UTC (rev 1293) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2013-08-09 09:05:00 UTC (rev 1294) @@ -46,7 +46,7 @@ * Tag value to add the version of the model from outside (says in the * properties file associated to the model).. * <p/> - * Actually, the eugene api does not use to modify the model. It is only + * Actually, the eugene api does not use to modify the model. ItaTa is only * used while reading the properties associated with a model and if found is * directly set to the {@code version} field of the model. * Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2013-07-23 14:47:19 UTC (rev 1293) +++ trunk/eugene-java-templates/pom.xml 2013-08-09 09:05:00 UTC (rev 1294) @@ -22,7 +22,9 @@ <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> <parent> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2013-07-23 14:47:19 UTC (rev 1293) +++ trunk/eugene-maven-plugin/pom.xml 2013-08-09 09:05:00 UTC (rev 1294) @@ -23,11 +23,11 @@ #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>eugene</artifactId> @@ -35,17 +35,12 @@ </parent> <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId><!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <artifactId>eugene-maven-plugin</artifactId> <packaging>maven-plugin</packaging> -<!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> <name>EUGene :: Maven plugin</name> <description>Maven plugin to use the eugene library</description> <inceptionYear>2006</inceptionYear> -<!-- POM Relationships : Inheritance : Dependencies --> + <dependencies> <dependency> @@ -70,10 +65,10 @@ </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>eugene-yaml-templates</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> + <groupId>${project.groupId}</groupId> + <artifactId>eugene-yaml-templates</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> </dependency> <dependency> @@ -243,7 +238,7 @@ <pomInclude>generate/all/pom.xml</pomInclude> <!-- This test should be removed : too much complex to test,... nothing :( --> <!--<pomInclude>generate/generators/pom.xml</pomInclude>--> - <!--this test used topia and must be move in topia not here--> + <!--this test used topia and must be move in topia not here--> <!--<pomInclude>evol-879/model/pom.xml</pomInclude>--> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2013-07-23 14:47:19 UTC (rev 1293) +++ trunk/eugene-plantuml-templates/pom.xml 2013-08-09 09:05:00 UTC (rev 1294) @@ -22,35 +22,37 @@ <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"> - <modelVersion>4.0.0</modelVersion> +<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> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>2.7.1-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-plantuml-templates</artifactId> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-plantuml-templates</artifactId> - <name>EUGene :: PlantUML templates</name> - <inceptionYear>2013</inceptionYear> + <name>EUGene :: PlantUML templates</name> + <inceptionYear>2013</inceptionYear> - <dependencies> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>net.sourceforge.plantuml</groupId> - <artifactId>plantuml</artifactId> - <version>7968</version> - </dependency> + <dependency> + <groupId>net.sourceforge.plantuml</groupId> + <artifactId>plantuml</artifactId> + <version>7968</version> + </dependency> - </dependencies> + </dependencies> </project> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2013-07-23 14:47:19 UTC (rev 1293) +++ trunk/eugene-yaml-templates/pom.xml 2013-08-09 09:05:00 UTC (rev 1294) @@ -22,46 +22,54 @@ <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"> - <modelVersion>4.0.0</modelVersion> +<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> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>2.7.1-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-yaml-templates</artifactId> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-yaml-templates</artifactId> - <name>EUGene :: YAML templates</name> - <inceptionYear>2013</inceptionYear> + <name>EUGene :: YAML templates</name> + <inceptionYear>2013</inceptionYear> - <dependencies> + <properties> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - </dependency> + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> + </properties> - </dependencies> + <dependencies> - <build> - <plugins> - <!-- expose new plexus components --> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> - <goals> - <goal>generate-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <!-- expose new plexus components --> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 14:47:19 UTC (rev 1293) +++ trunk/pom.xml 2013-08-09 09:05:00 UTC (rev 1294) @@ -22,30 +22,25 @@ <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> - <version>3.4.11</version> + <version>4.0</version> </parent> <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version><!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <version>2.7.1-SNAPSHOT</version> <packaging>pom</packaging> -<!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> <name>EUGene</name> <description>Efficient Universal Generator</description> <url>http://maven-site.nuiton.org/eugene</url> <inceptionYear>2004</inceptionYear> -<!-- Developers --> + <developers> <developer> <name>Benjamin Poussin</name> @@ -133,11 +128,7 @@ <module>eugene-maven-plugin</module> <module>eugene-yaml-templates</module> </modules> -<!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> <developerConnection> @@ -440,14 +431,16 @@ <phase>pre-site</phase> <configuration> <tasks> - <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> + <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" + failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd" /> + <include name="**/*.xsd"/> </fileset> </copy> - <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> + <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" + failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd" /> + <include name="**/*.dtd"/> </fileset> </copy> </tasks>