X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=42aabe60638cdb0d0e6d01be80f493d5385774ff;hb=d65c075608be3c026a571a49c0a0fbbb5417de94;hp=308188ac4c0dcea425bfd227fa23b70c793ca321;hpb=6cdf19b70b25cc675d8e616dcaf905570a83c78b;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 308188ac4..42aabe606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,28 +4,41 @@
 	<parent>
 		<groupId>org.argeo</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.0</version>
+		<version>1.2.0</version>
 	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>0.2.1-SNAPSHOT</version>
+	<version>0.3.3-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<developmentCycle>0.2</developmentCycle>
-		<version.argeo-distribution>1.0.4</version.argeo-distribution>
-		<version.argeo-ria>0.12.4</version.argeo-ria>
-		<version.maven-argeo-osgi>0.1.28</version.maven-argeo-osgi>
-		<version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
-		<version.maven-argeo-qooxdoo>0.8.3.0</version.maven-argeo-qooxdoo>
-		<site.repoBase>file:///var/argeo/projects/commons/www/site</site.repoBase>
-		<site.urlBase>http://www.argeo.org/projects/commons/site</site.urlBase>
+		<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>
 	<licenses>
 		<license>
@@ -35,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.
@@ -66,19 +79,13 @@ limitations under the License.
 			</roles>
 		</developer>
 	</developers>
-	<modules>
-		<module>basic</module>
-		<module>osgi</module>
-		<module>server</module>
-		<module>security</module>
-		<module>sandbox</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>
@@ -87,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>
@@ -97,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>
@@ -104,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>
@@ -116,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>
@@ -139,9 +159,10 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.0-beta-4</version>
 				<executions>
 					<execution>
-						<phase>validate</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>create</goal>
 						</goals>
@@ -150,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>
@@ -163,10 +192,12 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
+				<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>
@@ -176,6 +207,7 @@ limitations under the License.
 			<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>
@@ -194,13 +226,6 @@ limitations under the License.
 						<xml>XML_STYLE</xml>
 					</mapping>
 				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 		</plugins>
 	</build>
@@ -218,7 +243,7 @@ limitations under the License.
 	<repositories>
 		<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>
@@ -243,6 +268,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.3.1</version>
 				<reportSets>
 					<reportSet>
 						<reports>
@@ -265,6 +291,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.7</version>
 				<inherited>false</inherited>
 				<configuration>
 					<aggregate>true</aggregate>
@@ -274,6 +301,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.2</version>
 				<configuration>
 					<aggregate>true</aggregate>
 				</configuration>
@@ -281,6 +309,7 @@ limitations under the License.
 			<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>
@@ -289,6 +318,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.4</version>
 				<configuration>
 					<aggregate>true</aggregate>
 					<tags>
@@ -301,6 +331,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-changelog-plugin</artifactId>
+				<version>2.2</version>
 				<inherited>false</inherited>
 			</plugin>
 			<plugin>