X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=0546caf93153f2a089ef12ef13a15eeefb724b79;hb=refs%2Ftags%2Fsvn%2Ftags%2Fargeo-slc-0.12.1;hp=cd20ada69366772b7253881c4ba2fa1a8d26b45d;hpb=613e7bb4a3283fc5f14c534dc7d7491a8da51945;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index cd20ada69..0546caf93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,19 @@
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.12.1-SNAPSHOT</version>
+	<version>0.12.1</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.27</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>
@@ -17,23 +29,14 @@
 		<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.0</version.argeo-ria>
-		<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.21</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>
-		<developerConnection>scm:svn:https://www.argeo.org/svn/slc/trunk</developerConnection>
-		<url>https://www.argeo.org/svn/slc/trunk</url>
+		<connection>scm:svn:https://www.argeo.org/svn/slc/tags/argeo-slc-0.12.1</connection>
+		<developerConnection>scm:svn:https://www.argeo.org/svn/slc/tags/argeo-slc-0.12.1</developerConnection>
+		<url>https://www.argeo.org/svn/slc/tags/argeo-slc-0.12.1</url>
 	</scm>
 	<issueManagement>
 		<system>Bugzilla</system>
@@ -149,7 +152,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>
@@ -187,6 +189,7 @@ limitations under the License.
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release</releaseProfiles>
 					<goals>deploy</goals>
+					<preparationGoals>clean argeo-osgi:update-manifests install</preparationGoals>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -194,6 +197,15 @@ limitations under the License.
 	</build>
 	<dependencyManagement>
 		<dependencies>
+			<!-- Third Parties -->
+			<dependency>
+				<groupId>org.argeo.dep</groupId>
+				<artifactId>versions-all</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<!-- SLC (itself) -->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
@@ -255,11 +267,6 @@ limitations under the License.
 				<artifactId>org.argeo.slc.server</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.osgiboot</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.osgi</artifactId>
@@ -315,13 +322,35 @@ limitations under the License.
 				<classifier>dist</classifier>
 			</dependency>
 
+			<!-- Argeo Commons -->
 			<dependency>
-				<groupId>org.argeo.dep</groupId>
-				<artifactId>versions</artifactId>
-				<version>1.0.0</version>
+				<groupId>org.argeo.commons.security</groupId>
+				<artifactId>org.argeo.security.dep.ads</artifactId>
+				<version>${version.argeo-commons}</version>
 				<type>pom</type>
-				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.osgi</groupId>
+				<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>
 	<repositories>
@@ -340,6 +369,13 @@ limitations under the License.
 			</snapshots>
 		</repository>
 	</repositories>
+	<distributionManagement>
+		<site>
+			<id>argeo-slc-site</id>
+			<name>SLC Site</name>
+			<url>file://${site.repoBase}/${developmentCycle}/</url>
+		</site>
+	</distributionManagement>
 	<reporting>
 		<plugins>
 			<plugin>
@@ -369,6 +405,7 @@ limitations under the License.
 				<inherited>false</inherited>
 				<configuration>
 					<aggregate>true</aggregate>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -386,10 +423,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>
@@ -402,11 +435,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>