Author: tchemit Date: 2013-08-09 12:06:50 +0200 (Fri, 09 Aug 2013) New Revision: 3853 Url: http://chorem.org/projects/pollen/repository/revisions/3853 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/pollen-persistence/pom.xml trunk/pollen-rest-api/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-js/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-07-18 13:38:52 UTC (rev 3852) +++ trunk/pollen-persistence/pom.xml 2013-08-09 10:06:50 UTC (rev 3853) @@ -1,9 +1,9 @@ <?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"> +<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>pollen</artifactId> @@ -29,14 +29,6 @@ <artifactId>guava</artifactId> </dependency> - <!--dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency--> - <!--dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency--> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -45,14 +37,6 @@ <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> - <!--dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency--> <dependency> <groupId>org.nuiton.jpa</groupId> @@ -69,19 +53,10 @@ <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> - <!--dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </dependency--> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> - <!--dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency--> <dependency> <groupId>junit</groupId> @@ -142,61 +117,6 @@ </execution> </executions> </plugin> - - <!--plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <id>generate-entities</id> - <configuration> - <fullPackagePath>org.chorem.pollen</fullPackagePath> - <defaultPackage>org.chorem.pollen.entities</defaultPackage> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.topia.generator.BinderHelperTransformer - </templates> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin--> - <!--plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java</basedir> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin--> </plugins> </build> Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2013-07-18 13:38:52 UTC (rev 3852) +++ trunk/pollen-rest-api/pom.xml 2013-08-09 10:06:50 UTC (rev 3853) @@ -46,11 +46,6 @@ <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> - <!--dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </dependency--> - <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web</artifactId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-07-18 13:38:52 UTC (rev 3852) +++ trunk/pollen-services/pom.xml 2013-08-09 10:06:50 UTC (rev 3853) @@ -27,11 +27,6 @@ <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> - <!--dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </dependency--> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-persistence</artifactId> Modified: trunk/pollen-ui-js/pom.xml =================================================================== --- trunk/pollen-ui-js/pom.xml 2013-07-18 13:38:52 UTC (rev 3852) +++ trunk/pollen-ui-js/pom.xml 2013-08-09 10:06:50 UTC (rev 3853) @@ -3,20 +3,12 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> <version>2.0-SNAPSHOT</version> </parent> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Pollen :: UI (JS) </name> <description>Pollen UI</description> @@ -24,10 +16,12 @@ <artifactId>pollen-ui-js</artifactId> <packaging>pom</packaging> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <properties> + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> + </properties> + <build> <plugins> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-18 13:38:52 UTC (rev 3852) +++ trunk/pom.xml 2013-08-09 10:06:50 UTC (rev 3853) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.13</version> + <version>4.0</version> </parent> <groupId>org.chorem</groupId>