X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=bbfa74f7c1ea8e4e606b7585068d042fdd962001;hb=061e03873ca4523c51b48ba05bce4591aaa2c465;hp=7a3b1fe3664994b36f66fa945ffcdc7dde14b7e5;hpb=df64860a7cca3e377072ac9767dab8743c75217c;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 7a3b1fe36..bbfa74f7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,18 @@
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
 	<version>0.12.1-SNAPSHOT</version>
+	<properties>
+		<developmentCycle>0.12</developmentCycle>
+		<version.argeo-distribution>1.0.3</version.argeo-distribution>
+		<version.argeo-ria>0.12.3</version.argeo-ria>
+		<version.argeo-commons>0.1.2</version.argeo-commons>
+		<version.equinox>3.5.1.R35x_v20090827</version.equinox>
+		<version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
+		<version.maven-argeo-osgi>0.1.26</version.maven-argeo-osgi>
+		<version.maven-argeo-qooxdoo>0.8.3.0</version.maven-argeo-qooxdoo>
+		<site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
+		<site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
+	</properties>
 	<modules>
 		<module>runtime</module>
 		<module>dep</module>
@@ -18,19 +30,9 @@
 		<module>server</module>
 		<module>demo</module>
 		<module>integration-tests</module>
-		<module>archetypes</module>
+		<!-- <module>archetypes</module>-->
+		<module>dist</module>
 	</modules>
-	<properties>
-		<developmentCycle>0.12</developmentCycle>
-		<version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
-		<version.argeo-commons>0.1.2-SNAPSHOT</version.argeo-commons>
-		<version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
-		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-		<version.maven-argeo-osgi>0.1.23</version.maven-argeo-osgi>
-		<version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
-		<site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
-		<site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
-	</properties>
 	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
 		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk</connection>
@@ -151,7 +153,6 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-3</version>
 				<executions>
 					<execution>
 						<phase>validate</phase>
@@ -189,6 +190,7 @@ limitations under the License.
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release</releaseProfiles>
 					<goals>deploy</goals>
+					<preparationGoals>clean argeo-osgi:update-manifests install scm:checkin</preparationGoals>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -199,8 +201,8 @@ limitations under the License.
 			<!-- Third Parties -->
 			<dependency>
 				<groupId>org.argeo.dep</groupId>
-				<artifactId>versions</artifactId>
-				<version>1.0.1-SNAPSHOT</version>
+				<artifactId>versions-all</artifactId>
+				<version>${version.argeo-distribution}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -333,6 +335,22 @@ limitations under the License.
 				<artifactId>org.argeo.osgi.boot</artifactId>
 				<version>${version.argeo-commons}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.ads</artifactId>
+				<version>${version.argeo-commons}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
+				<version>${version.argeo-commons}</version>
+				<type>pom</type>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.jackrabbit</artifactId>
+				<version>${version.argeo-commons}</version>
+			</dependency>
 
 		</dependencies>
 	</dependencyManagement>
@@ -406,10 +424,6 @@ limitations under the License.
 					<aggregate>true</aggregate>
 				</configuration>
 			</plugin>
-			<!--
-				<plugin> <groupId>org.codehaus.mojo</groupId>
-				<artifactId>scmchangelog-maven-plugin</artifactId> </plugin>
-			-->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
@@ -422,11 +436,6 @@ limitations under the License.
 					</tags>
 				</configuration>
 			</plugin>
-			<!--
-				<plugin> <groupId>org.codehaus.mojo</groupId>
-				<artifactId>clirr-maven-plugin</artifactId>
-				<inherited>false</inherited> </plugin>
-			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-changelog-plugin</artifactId>