Author: tchemit Date: 2013-08-08 17:13:28 +0200 (Thu, 08 Aug 2013) New Revision: 2794 Url: http://nuiton.org/projects/topia/repository/revisions/2794 Log: fixes #2824: Updates mavenpom to 4.0 apply tidy on poms + clean them Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-05 16:54:23 UTC (rev 2793) +++ trunk/pom.xml 2013-08-08 15:13:28 UTC (rev 2794) @@ -23,197 +23,31 @@ <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.13</version> + <version>4.0</version> </parent> <artifactId>topia</artifactId> <version>3.0-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>topia-persistence</module> - <module>topia-service-replication</module> - <module>topia-service-migration</module> - <module>topia-service-security</module> - </modules> - <name>ToPIA</name> <description> Tools for Portable and Independent Architecture : Framework de persistance et de distribution d'application. </description> - <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/topia</url> - - <properties> - <!-- pour un muli module on doit fixer le projectId --> - <projectId>topia</projectId> + <inceptionYear>2004</inceptionYear> - <!-- do not relativize links in generated site --> - <relativizeDecorationLinks>false</relativizeDecorationLinks> - - <!-- libs version --> - <eugeneVersion>2.7</eugeneVersion> - <nuitonUtilsVersion>2.7</nuitonUtilsVersion> - <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> - <nuitonDecoratorVersion>3.0-alpha-1</nuitonDecoratorVersion> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <processorPluginVersion>1.3</processorPluginVersion> - <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.2.3.Final</hibernateVersion> - <sl4jVersion>1.7.5</sl4jVersion> - <h2Version>1.3.172</h2Version> - <hamcrestVersion>1.3</hamcrestVersion> - - </properties> - - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://nuiton.org/projects/topia/repository/show/branches/trunk</url> - </scm> - - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${eugeneVersion}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-java-templates</artifactId> - <version>${eugeneVersion}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-csv</artifactId> - <version>${nuitonCsvVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - <version>${nuitonDecoratorVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - <version>${hibernateVersion}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.8</version> - </dependency> - - <!-- hibernate-core only include api, need implementation, - binding with log4j will be used - --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${sl4jVersion}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${sl4jVersion}</version> - <scope>test</scope> - </dependency> - - <!-- BD H2 for testing --> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>${hamcrestVersion}</version> - <scope>test</scope> - </dependency> - - </dependencies> - </dependencyManagement> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <developers> - + <developer> <name>Benjamin Poussin</name> <id>bpoussin</id> @@ -323,7 +157,6 @@ </roles> </developer> </developers> - <contributors> <contributor> <name>Nicolas Dupont</name> @@ -368,15 +201,163 @@ <timezone>Europe/Paris</timezone> </contributor> </contributors> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <packaging>pom</packaging> + <modules> + <module>topia-persistence</module> + <module>topia-service-replication</module> + <module>topia-service-migration</module> + <module>topia-service-security</module> + </modules> - <build> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk + </developerConnection> + <url>http://nuiton.org/projects/topia/repository/show/branches/trunk</url> + </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <properties> + <!-- pour un muli module on doit fixer le projectId --> + <projectId>topia</projectId> + + <!-- do not relativize links in generated site --> + <relativizeDecorationLinks>false</relativizeDecorationLinks> + + <!-- libs version --> + <eugeneVersion>2.7</eugeneVersion> + <nuitonUtilsVersion>2.7</nuitonUtilsVersion> + <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> + <nuitonDecoratorVersion>3.0-alpha-1</nuitonDecoratorVersion> + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <processorPluginVersion>1.3</processorPluginVersion> + <xmlrpcVersion>3.1.2</xmlrpcVersion> + <hibernateVersion>4.2.3.Final</hibernateVersion> + <sl4jVersion>1.7.5</sl4jVersion> + <h2Version>1.3.172</h2Version> + <hamcrestVersion>1.3</hamcrestVersion> + + </properties> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugeneVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-java-templates</artifactId> + <version>${eugeneVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + <version>${nuitonCsvVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + <version>${nuitonDecoratorVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.12.1.GA</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.8</version> + </dependency> + + <!-- hibernate-core only include api, need implementation, + binding with log4j will be used + --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${sl4jVersion}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${sl4jVersion}</version> + <scope>test</scope> + </dependency> + + <!-- BD H2 for testing --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrestVersion}</version> + <scope>test</scope> + </dependency> + + </dependencies> + </dependencyManagement> + + <build> <pluginManagement> <plugins> @@ -436,7 +417,6 @@ </plugins> </pluginManagement> - </build> <reporting> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-08-05 16:54:23 UTC (rev 2793) +++ trunk/topia-persistence/pom.xml 2013-08-08 15:13:28 UTC (rev 2794) @@ -24,14 +24,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>topia</artifactId> @@ -40,7 +37,11 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> + <packaging>jar</packaging> + <name>ToPIA :: Persistence</name> + <description>Hibernate based persistence module</description> + <dependencies> <dependency> @@ -147,21 +148,7 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>ToPIA :: Persistence</name> - <description>Hibernate based persistence module</description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - <build> - <testResources> <testResource> @@ -186,7 +173,6 @@ </testResource> </testResources> - <plugins> <plugin> @@ -252,9 +238,6 @@ </plugins> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> <profiles> <!-- perform only on a release stage when using the maven-release-plugin --> @@ -367,5 +350,4 @@ </profile> </profiles> - </project> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-08-05 16:54:23 UTC (rev 2793) +++ trunk/topia-service-migration/pom.xml 2013-08-08 15:13:28 UTC (rev 2794) @@ -24,14 +24,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>topia</artifactId> @@ -40,6 +37,8 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> + <name>ToPIA :: Service Migration</name> + <description>Hibernate based migration service</description> <dependencies> @@ -100,21 +99,7 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>ToPIA :: Service Migration</name> - <description>Hibernate based migration service</description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - <build> - <resources> <resource> @@ -126,9 +111,9 @@ </resource> </resources> - <plugins> </plugins> </build> + </project> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-08-05 16:54:23 UTC (rev 2793) +++ trunk/topia-service-replication/pom.xml 2013-08-08 15:13:28 UTC (rev 2794) @@ -24,14 +24,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>topia</artifactId> @@ -40,6 +37,8 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-replication</artifactId> + <name>ToPIA :: Service Replication</name> + <description>Hibernate based replication service</description> <dependencies> @@ -90,7 +89,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -98,19 +97,6 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>ToPIA :: Service Replication</name> - <description>Hibernate based replication service</description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - <build> <plugins> @@ -128,9 +114,6 @@ </plugins> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> <profiles> <!-- perform only on a release stage when using the maven-release-plugin --> <profile> @@ -197,5 +180,4 @@ </profile> </profiles> - </project> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-08-05 16:54:23 UTC (rev 2793) +++ trunk/topia-service-security/pom.xml 2013-08-08 15:13:28 UTC (rev 2794) @@ -24,14 +24,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>topia</artifactId> @@ -41,6 +38,20 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-security</artifactId> + <name>ToPIA :: Service Security</name> + <description>Hibernate based security service</description> + + <properties> + + <!-- Post Release configuration --> + <!-- TODO Put this in last module (when we will remove this module) --> + <skipPostRelease>false</skipPostRelease> + + <!-- TopiaSecurityutil uses some sun.xxx classes --> + <signatureArtifactId>java16-sun</signatureArtifactId> + <signatureVersion>1.10</signatureVersion> + </properties> + <dependencies> <!-- Sibling dependencies --> @@ -86,7 +97,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> - + <!-- Depencies for test--> <dependency> <groupId>com.h2database</groupId> @@ -103,25 +114,7 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>ToPIA :: Service Security</name> - <description>Hibernate based security service</description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <properties> - - <!-- TopiaSecurityutil uses some sun.xxx classes --> - <signatureArtifactId>java16-sun</signatureArtifactId> - <signatureVersion>1.10</signatureVersion> - </properties> <build> - <resources> <resource> @@ -132,7 +125,6 @@ </resource> </resources> - <plugins> <plugin> @@ -145,7 +137,7 @@ <configuration> <templates> org.nuiton.topia.generator.TopiaMetaTransformer - </templates> + </templates> <defaultPackage>org.nuiton.topia</defaultPackage> <fullPackagePath>org.nuiton.topia</fullPackagePath> <overwrite>true</overwrite>