X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=0777f04f855c269096310aee1eea2c2cbbb887ee;hb=649318725d952a887d988ddb5dd84e4ffee39e9c;hp=b928539eca097dd0b18043b0eaa4cf91c0689ebc;hpb=0c7e0b9314d87092a4926cbaa3725967b0792fa4;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index b928539ec..0777f04f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,28 +4,30 @@
 	<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.1.2</version>
+	<version>0.3.1-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<developmentCycle>0.1</developmentCycle>
-		<version.argeo-distribution>1.0.2</version.argeo-distribution>
-		<version.argeo-ria>0.12.2</version.argeo-ria>
-		<version.maven-argeo-osgi>0.1.25</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.3</version.argeo-distribution>
+		<version.argeo-commons>0.3.1-SNAPSHOT</version.argeo-commons>
+		<version.argeo-ria>0.12.5</version.argeo-ria>
+		<version.equinox>3.6.2</version.equinox>
+		<version.maven-argeo-osgi>0.1.31</version.maven-argeo-osgi>
+		<version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
+		<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>
 	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
-		<connection>scm:svn:https://www.argeo.org/svn/commons/tags/argeo-commons-0.1.2</connection>
-		<developerConnection>scm:svn:https://www.argeo.org/svn/commons/tags/argeo-commons-0.1.2</developerConnection>
-		<url>https://www.argeo.org/svn/commons/tags/argeo-commons-0.1.2</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 +37,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.
@@ -70,7 +72,10 @@ limitations under the License.
 		<module>basic</module>
 		<module>osgi</module>
 		<module>server</module>
+		<module>eclipse</module>
 		<module>security</module>
+		<module>gis</module>
+		<module>sandbox</module>
 	</modules>
 	<build>
 		<pluginManagement>
@@ -78,6 +83,7 @@ limitations under the License.
 				<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>
@@ -86,6 +92,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>
@@ -96,6 +103,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>
@@ -103,9 +120,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>
@@ -115,10 +133,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>
@@ -138,9 +157,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>
@@ -149,12 +169,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,16 +190,41 @@ 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>
 					<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>
 	</build>
 	<dependencyManagement>
@@ -188,7 +241,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>
@@ -213,6 +266,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>
@@ -235,6 +289,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>
@@ -244,6 +299,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>
@@ -251,6 +307,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>
@@ -259,6 +316,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>
@@ -271,6 +329,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>