X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=d0cc2be8637624e7ee35fab1f9e2a34c5b3a0882;hb=36862e777231ee8beecf4d5c7081fdfb8e28cfbd;hp=0efa0af55bdb4c539f14a771cdbf53da9c2a7ae5;hpb=63906e5a538b4595e1696fee927d647df1dab1b1;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 0efa0af55..d0cc2be86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -13,17 +14,16 @@
 	<packaging>pom</packaging>
 	<properties>
 		<developmentCycle>0.3</developmentCycle>
-		<version.argeo-distribution>1.1.5</version.argeo-distribution>
+		<version.argeo-distribution>1.1.6-SNAPSHOT</version.argeo-distribution>
 		<version.argeo-commons>0.3.4-SNAPSHOT</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>
+		<!-- maven -->
 		<version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
 		<version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
+		<!-- distribution -->
 		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
 	</properties>
 	<modules>
 		<module>basic</module>
@@ -31,8 +31,7 @@
 		<module>server</module>
 		<module>eclipse</module>
 		<module>security</module>
-		<module>doc</module>
-		<module>sandbox</module>
+		<module>demo</module>
 	</modules>
 	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
@@ -80,10 +79,17 @@ limitations under the License.
 		</developer>
 	</developers>
 	<build>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-webdav</artifactId>
+				<version>1.0-beta-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>
@@ -92,7 +98,6 @@ limitations under the License.
 					</configuration>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
 					<version>2.1.2</version>
 					<executions>
@@ -106,20 +111,13 @@ limitations under the License.
 					</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>
-					<version>${version.maven-argeo-osgi}</version>
-				</plugin>
 				<plugin>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.3.1</version>
@@ -129,10 +127,27 @@ limitations under the License.
 						</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.2.0</version>
 					<extensions>true</extensions>
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
@@ -153,13 +168,49 @@ limitations under the License.
 						</execution>
 					</executions>
 				</plugin>
+				<!-- Codehaus -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>buildnumber-maven-plugin</artifactId>
+					<version>1.0-beta-4</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${buildNumber}.el6</release>
+						<distribution>argeo6</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>${version.maven-argeo-osgi}</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>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-4</version>
 				<executions>
 					<execution>
 						<phase>generate-resources</phase>
@@ -184,7 +235,6 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.4.3</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 				</configuration>
@@ -192,12 +242,10 @@ 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>
@@ -207,7 +255,6 @@ 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>
@@ -368,5 +415,27 @@ 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>
 	</profiles>
 </project>
\ No newline at end of file