X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=3822b9410870d00b3cc824eed0e026cf8bec1abc;hb=b512ba809efabaad19fb61c8c951b31e95b0d66c;hp=cd20ada69366772b7253881c4ba2fa1a8d26b45d;hpb=613e7bb4a3283fc5f14c534dc7d7491a8da51945;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index cd20ada69..3822b9410 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -21,10 +22,11 @@
 	</modules>
 	<properties>
 		<developmentCycle>0.12</developmentCycle>
-		<version.argeo-ria>0.12.0</version.argeo-ria>
+		<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.21</version.maven-argeo-osgi>
+		<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>
@@ -194,6 +196,15 @@ limitations under the License.
 	</build>
 	<dependencyManagement>
 		<dependencies>
+			<!-- Third Parties -->
+			<dependency>
+				<groupId>org.argeo.dep</groupId>
+				<artifactId>versions</artifactId>
+				<version>1.0.1-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<!-- SLC (itself) -->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
@@ -255,11 +266,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 +321,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 +368,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 +404,7 @@ limitations under the License.
 				<inherited>false</inherited>
 				<configuration>
 					<aggregate>true</aggregate>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>