Author: tchemit Date: 2013-08-09 12:06:59 +0200 (Fri, 09 Aug 2013) New Revision: 382 Url: http://chorem.org/projects/chorem/repository/revisions/382 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2013-08-07 13:35:46 UTC (rev 381) +++ trunk/chorem-entities/pom.xml 2013-08-09 10:06:59 UTC (rev 382) @@ -1,12 +1,7 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> @@ -16,7 +11,7 @@ <groupId>org.chorem.chorem</groupId> <artifactId>chorem-entities</artifactId> - <name>Chorem entities</name> + <name>Chorem :: entities</name> <description>Chorem entities</description> <dependencies> @@ -119,7 +114,6 @@ <filtering>true</filtering> </resource> </resources>--> - <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> @@ -160,4 +154,5 @@ </plugins> </build> + </project> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2013-08-07 13:35:46 UTC (rev 381) +++ trunk/chorem-webmotion/pom.xml 2013-08-09 10:06:59 UTC (rev 382) @@ -1,12 +1,7 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> @@ -15,12 +10,11 @@ <groupId>org.chorem.chorem</groupId> <artifactId>chorem-webmotion</artifactId> + <packaging>war</packaging> - <name>Chorem webmotion</name> + <name>Chorem :: webmotion</name> <description>Chorem webmotion</description> - <packaging>war</packaging> - <properties> <i18n.bundleOutputName>chorem-i18n</i18n.bundleOutputName> <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources @@ -35,6 +29,9 @@ target/${project.build.finalName}.war, </redmine.releaseFiles> + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> + </properties> <dependencies> @@ -195,7 +192,41 @@ <filtering>true</filtering> </resource> </resources>--> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> + <!--<contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml>--> + <webAppConfig> + <contextPath>/chorem</contextPath> + </webAppConfig> + <systemProperties> + <systemProperty> + <name>chorem.log.dir</name> + <value>${basedir}/target</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <configuration> + <path>/chorem</path> + <uriEncoding>UTF-8</uriEncoding> + <systemProperties> + <chorem.log.dir>${basedir}/target</chorem.log.dir> + </systemProperties> + </configuration> + </plugin> + + </plugins> + </pluginManagement> <plugins> <!-- processor plugin --> <plugin> @@ -258,55 +289,6 @@ </executions> </plugin> </plugins> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <configuration> - <stopKey>A</stopKey> - <stopPort>1269</stopPort> - <!--<contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml>--> - <webAppConfig> - <contextPath>/chorem</contextPath> - </webAppConfig> - <systemProperties> - <systemProperty> - <name>chorem.log.dir</name> - <value>${basedir}/target</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <configuration> - <path>/chorem</path> - <uriEncoding>UTF-8</uriEncoding> - <systemProperties> - <chorem.log.dir>${basedir}/target</chorem.log.dir> - </systemProperties> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat6-maven-plugin</artifactId> - <configuration> - <path>/chorem</path> - <uriEncoding>UTF-8</uriEncoding> - <systemProperties> - <chorem.log.dir>${basedir}/target</chorem.log.dir> - </systemProperties> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-07 13:35:46 UTC (rev 381) +++ trunk/pom.xml 2013-08-09 10:06:59 UTC (rev 382) @@ -1,34 +1,22 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.0</version> </parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> <version>0.3-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>chorem-entities</module> - <module>chorem-webmotion</module> - </modules> - - <name>chorem</name> + <name>Chorem</name> <description>Project management</description> - <inceptionYear>2011</inceptionYear> - <url>http://maven-site.chorem.org/chorem</url> - <packaging>pom</packaging> - + <inceptionYear>2011</inceptionYear> <licenses> <license> <name>GNU Affero General Public License version 3</name> @@ -73,6 +61,11 @@ </developer> </developers> + <modules> + <module>chorem-entities</module> + <module>chorem-webmotion</module> + </modules> + <scm> <connection>scm:svn:http://svn.chorem.org/svn/chorem/trunk</connection> <developerConnection> @@ -80,7 +73,6 @@ </developerConnection> <url>http://www.chorem.org/repositories/browse/chorem/trunk</url> </scm> - <distributionManagement> <site> <id>${platform}</id> @@ -115,6 +107,19 @@ <i18n.silent>true</i18n.silent> </properties> + <repositories> + + <repository> + <id>chorem-group</id> + <name>Chorem Group</name> + <url>http://nexus.nuiton.org/nexus/content/groups/chorem-group</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + + </repositories> + <dependencyManagement> <dependencies> @@ -266,7 +271,6 @@ <filtering>true</filtering> </resource> </resources>--> - <pluginManagement> <plugins> @@ -302,22 +306,8 @@ </plugins> </pluginManagement> - </build> - <repositories> - - <repository> - <id>chorem-group</id> - <name>Chorem Group</name> - <url>http://nexus.nuiton.org/nexus/content/groups/chorem-group</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - - </repositories> - <profiles> <profile> @@ -361,5 +351,4 @@ </profile> </profiles> - </project>