X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=42aabe60638cdb0d0e6d01be80f493d5385774ff;hb=d65c075608be3c026a571a49c0a0fbbb5417de94;hp=1ec5d05ceba60eea5b57514422993a296cd1e339;hpb=4d168acc0d03cb32ce17b33185cc4fec1472ef70;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 1ec5d05ce..42aabe606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,45 @@
 <?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/maven-v4_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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.2.0</version>
+	</parent>
 	<groupId>org.argeo.commons</groupId>
-	<version>0.1.1-SNAPSHOT</version>
 	<artifactId>argeo-commons</artifactId>
+	<version>0.3.3-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<developmentCycle>0.1</developmentCycle>
-		<version.slc>0.12.1-SNAPSHOT</version.slc>
-		<version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
-		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-		<version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
+		<developmentCycle>0.3</developmentCycle>
+		<version.argeo-distribution>1.1.4</version.argeo-distribution>
+		<version.argeo-commons>0.3.2</version.argeo-commons>
+		<version.argeo-ria>0.12.5</version.argeo-ria>
+		<version.equinox>3.6.2</version.equinox>
+		<!-- Maven -->
+		<!-- Using version 2.3.4 causes package use conflict. To be investigated. -->
+		<version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
+		<version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
+		<version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
+		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
+		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
 	</properties>
+	<modules>
+		<module>basic</module>
+		<module>osgi</module>
+		<module>server</module>
+		<module>eclipse</module>
+		<module>security</module>
+		<module>gis</module>
+		<module>sandbox</module>
+	</modules>
+	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
-		<connection>scm:svn:https://www.argeo.org/svn/commons/trunk</connection>
-		<developerConnection>scm:svn:https://www.argeo.org/svn/commons/trunk</developerConnection>
-		<url>https://www.argeo.org/svn/commons/trunk</url>
+		<connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
+		<url>https://svn.argeo.org/commons/trunk</url>
 	</scm>
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://www.argeo.org/bugzilla/</url>
-	</issueManagement>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
@@ -31,7 +48,7 @@
 			<comments><![CDATA[
 SLC - Software LifeCycle framework
 			   
-Copyright 2008 Mathieu Baudier - Argeo e.U.
+Copyright 2010 Mathieu Baudier
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -48,10 +65,6 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
-	<organization>
-		<name>Argeo</name>
-		<url>http://www.argeo.org</url>
-	</organization>
 	<developers>
 		<developer>
 			<id>mbaudier</id>
@@ -66,17 +79,13 @@ limitations under the License.
 			</roles>
 		</developer>
 	</developers>
-	<modules>
-		<module>osgi</module>
-		<module>server</module>
-		<module>security</module>
-	</modules>
 	<build>
 		<pluginManagement>
 			<plugins>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.3.2</version>
 					<configuration>
 						<source>1.5</source>
 						<target>1.5</target>
@@ -85,6 +94,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
+					<version>2.1.2</version>
 					<executions>
 						<execution>
 							<id>attach-sources</id>
@@ -95,6 +105,16 @@ limitations under the License.
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.4.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.7.1</version>
+				</plugin>
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -102,9 +122,10 @@ limitations under the License.
 				</plugin>
 				<plugin>
 					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.3.1</version>
 					<configuration>
 						<archive>
-							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+							<manifestFile>META-INF/MANIFEST.MF</manifestFile>
 						</archive>
 					</configuration>
 				</plugin>
@@ -114,10 +135,11 @@ limitations under the License.
 					<version>${version.maven-bundle-plugin}</version>
 					<extensions>true</extensions>
 					<configuration>
-						<manifestLocation>target/classes/META-INF</manifestLocation>
+						<manifestLocation>META-INF</manifestLocation>
 						<instructions>
 							<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-							<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+							<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
 							<_removeheaders>Bnd-LastModified</_removeheaders>
 						</instructions>
 					</configuration>
@@ -137,10 +159,10 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-3</version>
+				<version>1.0-beta-4</version>
 				<executions>
 					<execution>
-						<phase>validate</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>create</goal>
 						</goals>
@@ -149,12 +171,20 @@ limitations under the License.
 				<configuration>
 					<doCheck>false</doCheck>
 					<doUpdate>false</doUpdate>
-					<useLastCommittedRevision>true</useLastCommittedRevision>
+					<format>{0,date,yyyyMMdd_HHmmss}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
+					<revisionOnScmFailure>git</revisionOnScmFailure>
+					<providerImplementations>
+						<git>svn</git>
+					</providerImplementations>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.4.3</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 				</configuration>
@@ -162,19 +192,39 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>2.0-beta-5</version>
-				<!--
-					The site plugin is buggy with multi modules.
-					http://jira.codehaus.org/browse/MSITE-276
-				-->
+				<version>2.1.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
+				<version>2.1</version>
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release</releaseProfiles>
-					<goals>deploy</goals>
+					<preparationGoals>clean install</preparationGoals>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.mycila.maven-license-plugin</groupId>
+				<artifactId>maven-license-plugin</artifactId>
+				<version>1.8.0</version>
+				<configuration>
+					<header>license-apache2-header.txt</header>
+					<failIfMissing>true</failIfMissing>
+					<aggregate>true</aggregate>
+					<includes>
+						<include>src/**/*.java</include>
+						<include>src/**/*.xml</include>
+					</includes>
+					<excludes>
+						<exclude>**/springutil/**</exclude>
+						<exclude>**/qooxdoo-sdk/**</exclude>
+					</excludes>
+					<useDefaultExcludes>true</useDefaultExcludes>
+					<mapping>
+						<java>SLASHSTAR_STYLE</java>
+						<xml>XML_STYLE</xml>
+					</mapping>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -182,72 +232,18 @@ limitations under the License.
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.argeo.slc</groupId>
-				<artifactId>argeo-slc</artifactId>
-				<version>${version.slc}</version>
+				<groupId>org.argeo.dep</groupId>
+				<artifactId>versions-all</artifactId>
+				<version>${version.argeo-distribution}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
-		<repository>
-			<id>central</id>
-			<url>http://repo1.maven.org/maven2</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.release</id>
-			<name>
-				SpringSource Enterprise Bundle Repository - SpringSource
-				Bundle Releases
-			</name>
-			<url>
-				http://repository.springsource.com/maven/bundles/release
-			</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.external</id>
-			<name>
-				SpringSource Enterprise Bundle Repository - External
-				Bundle Releases
-			</name>
-			<url>
-				http://repository.springsource.com/maven/bundles/external
-			</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
 		<repository>
 			<id>argeo</id>
-			<url>http://www.argeo.org/maven/argeo</url>
+			<url>http://maven.argeo.org/argeo</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -259,33 +255,118 @@ limitations under the License.
 				<checksumPolicy>fail</checksumPolicy>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>argeo-snapshots</id>
-			<url>http://www.argeo.org/maven/argeo-snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
 	</repositories>
 	<distributionManagement>
-		<repository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>argeo-restricted</id>
-			<name>Argeo FOSS Repository</name>
-			<url>file:///var/argeo/maven2/argeo</url>
-		</repository>
-		<snapshotRepository>
-			<uniqueVersion>true</uniqueVersion>
-			<id>argeo-snapshots-restricted</id>
-			<name>Argeo FOSS Snapshots Repository</name>
-			<url>file:///var/argeo/maven2/argeo-snapshots</url>
-		</snapshotRepository>
+		<site>
+			<id>argeo-commons-site</id>
+			<name>Argeo Commons Site</name>
+			<url>file://${site.repoBase}/${developmentCycle}/</url>
+		</site>
 	</distributionManagement>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.3.1</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>index</report>
+							<report>summary</report>
+							<report>license</report>
+							<report>scm</report>
+							<report>issue-tracking</report>
+							<report>dependencies</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<inherited>false</inherited>
+						<reports>
+							<report>project-team</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.7</version>
+				<inherited>false</inherited>
+				<configuration>
+					<aggregate>true</aggregate>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.2</version>
+				<configuration>
+					<aggregate>true</aggregate>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.7.1</version>
+				<inherited>false</inherited>
+				<configuration>
+					<aggregate>true</aggregate>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<aggregate>true</aggregate>
+					<tags>
+						<tag>TODO</tag>
+						<tag>FIXME</tag>
+						<tag>@deprecated</tag>
+					</tags>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changelog-plugin</artifactId>
+				<version>2.2</version>
+				<inherited>false</inherited>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<version>2.3</version>
+				<inherited>false</inherited>
+				<configuration>
+					<linkXref>true</linkXref>
+					<targetJdk>1.5</targetJdk>
+					<aggregate>true</aggregate>
+					<excludes>
+						<exclude>**/springutil/*.java</exclude>
+					</excludes>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>cpd</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
+	<profiles>
+		<profile>
+			<id>release</id>
+			<distributionManagement>
+				<site>
+					<id>argeo-commons-site</id>
+					<name>Argeo Commons Site</name>
+					<url>file://${site.repoBase}/${project.version}</url>
+				</site>
+			</distributionManagement>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file