X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=aa4bbc607ea8341bd01224119b55b7a5a7bb0d7f;hb=fd57c2fdf6dac352806fc5517355627c545e768b;hp=c567c122f5532553ceb4793f541281c1a5bb117b;hpb=534cbc59a3b6abaa7dbf0d404bf480762f5dbbe0;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index c567c122f..aa4bbc607 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,24 +9,35 @@
 	</parent>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>0.2.1-SNAPSHOT</version>
+	<version>0.3.4-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<developmentCycle>0.2</developmentCycle>
-		<version.argeo-distribution>1.1.0-SNAPSHOT</version.argeo-distribution>
-		<version.argeo-ria>0.12.4</version.argeo-ria>
-		<version.maven-argeo-osgi>0.1.29-SNAPSHOT</version.maven-argeo-osgi>
-		<version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
-		<version.maven-argeo-qooxdoo>1.1.0-SNAPSHOT</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.7</version.argeo-distribution>
+		<version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
+		<!-- distribution -->
+		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
+		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+		<rpm.release>6</rpm.release>
+		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
+		<!-- encoding, see http://is.gd/mvn_source_encoding -->
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+	<modules>
+		<module>basic</module>
+		<module>osgi</module>
+		<module>server</module>
+		<module>eclipse</module>
+		<module>security</module>
+		<module>demo</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>
@@ -34,9 +45,9 @@
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
 			<comments><![CDATA[
-SLC - Software LifeCycle framework
+Argeo Commons Enterprise Framework
 			   
-Copyright 2008 Mathieu Baudier - Argeo e.U.
+Copyright 2011 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,29 +77,39 @@ limitations under the License.
 				<role>QA</role>
 			</roles>
 		</developer>
+		<developer>
+			<id>bsinou</id>
+			<name>Bruno Sinou</name>
+			<email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
+			<organization>Argeo</organization>
+			<organizationUrl>http://www.argeo.org</organizationUrl>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
 	</developers>
-	<modules>
-		<module>basic</module>
-		<module>osgi</module>
-		<module>server</module>
-		<module>security</module>
-		<module>eclipse</module>
-		<module>sandbox</module>
-	</modules>
 	<build>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-webdav-jackrabbit</artifactId>
+				<version>2.2</version>
+			</extension>
+		</extensions>
 		<pluginManagement>
 			<plugins>
+				<!-- Maven -->
 				<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>
+						<source>1.6</source>
+						<target>1.6</target>
 					</configuration>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
+					<version>2.1.2</version>
 					<executions>
 						<execution>
 							<id>attach-sources</id>
@@ -100,29 +121,50 @@ limitations under the License.
 					</executions>
 				</plugin>
 				<plugin>
-					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>${version.maven-argeo-osgi}</version>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.4.1</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.7.1</version>
 				</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>
+				<plugin>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.7</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>2.4.3</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>2.1.1</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.1</version>
+				</plugin>
+				<!-- Apache -->
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>${version.maven-bundle-plugin}</version>
+					<version>2.3.7</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>
-							<_removeheaders>Bnd-LastModified</_removeheaders>
+							<Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
+							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
 						</instructions>
 					</configuration>
 					<executions>
@@ -135,6 +177,43 @@ limitations under the License.
 						</execution>
 					</executions>
 				</plugin>
+				<!-- Codehaus -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>buildnumber-maven-plugin</artifactId>
+					<version>1.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>rpm-maven-plugin</artifactId>
+					<version>2.1-alpha-1</version>
+					<extensions>true</extensions>
+					<configuration>
+						<version>${project.version}</version>
+						<release>r${timestamp}.el${rpm.release}</release>
+						<distribution>argeo${rpm.release}</distribution>
+						<packager>mbaudier@argeo.org</packager>
+						<group>Applications/System</group>
+						<prefix>/usr</prefix>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<version>1.2.1</version>
+				</plugin>
+				<!-- Argeo -->
+				<plugin>
+					<groupId>org.argeo.maven.plugins</groupId>
+					<artifactId>maven-argeo-osgi-plugin</artifactId>
+					<version>1.0.33</version>
+				</plugin>
+				<!-- Others -->
+				<plugin>
+					<groupId>com.mycila.maven-license-plugin</groupId>
+					<artifactId>maven-license-plugin</artifactId>
+					<version>1.8.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -143,16 +222,16 @@ limitations under the License.
 				<artifactId>buildnumber-maven-plugin</artifactId>
 				<executions>
 					<execution>
-						<phase>validate</phase>
+						<phase>generate-resources</phase>
 						<goals>
-							<goal>create</goal>
+							<goal>create-timestamp</goal>
 						</goals>
 					</execution>
 				</executions>
 				<configuration>
 					<doCheck>false</doCheck>
 					<doUpdate>false</doUpdate>
-					<useLastCommittedRevision>true</useLastCommittedRevision>
+					<timestampFormat>yyMMdd_HHmm</timestampFormat>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -165,6 +244,9 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<siteDirectory>doc/site</siteDirectory>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -198,6 +280,9 @@ limitations under the License.
 				</configuration>
 			</plugin>
 		</plugins>
+		<!-- NOTE: This is just a vision for the future, it's not yet implemented: 
+			see MNG-2216 -->
+		<!-- <sourceEncoding>UTF-8</sourceEncoding> -->
 	</build>
 	<dependencyManagement>
 		<dependencies>
@@ -210,6 +295,22 @@ limitations under the License.
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+	<repositories>
+		<repository>
+			<id>argeo</id>
+			<url>http://maven.argeo.org/argeo</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
 	<distributionManagement>
 		<site>
 			<id>argeo-commons-site</id>
@@ -222,6 +323,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>
@@ -244,6 +346,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>
@@ -253,6 +356,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>
@@ -260,6 +364,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>
@@ -268,6 +373,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>
@@ -280,6 +386,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>
@@ -316,5 +423,37 @@ limitations under the License.
 				</site>
 			</distributionManagement>
 		</profile>
+		<profile>
+			<id>localrepo</id>
+			<distributionManagement>
+				<repository>
+					<id>localrepo</id>
+					<name>Internal Release Repository</name>
+					<url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
+					</url>
+				</repository>
+				<snapshotRepository>
+					<id>localrepo.snapshots</id>
+					<name>Internal Snapshot Repository</name>
+					<url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
+					</url>
+				</snapshotRepository>
+			</distributionManagement>
+		</profile>
+		<profile>
+			<id>full</id>
+			<modules>
+				<module>doc</module>
+				<module>sandbox</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>el5</id>
+			<properties>
+				<rpm.release>5</rpm.release>
+				<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64
+				</rpm.stagingRepository>
+			</properties>
+		</profile>
 	</profiles>
 </project>
\ No newline at end of file