X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=3f0ced5e1c4835d34904dd1caa271a529c7687ff;hb=46857868246f9b1c1c6d8bbcf4195d2ec4578dab;hp=b631bf11cf2ba7b8a5341bf50056851ea8a0c832;hpb=014859e95df810903d77c6f0f1c811b627351476;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index b631bf11c..3f0ced5e1 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -1,10 +1,12 @@
-<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>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.10.3</version>
+	<version>0.11.1-SNAPSHOT</version>
 	<description>SLC Distribution</description>
 	<url>
 		http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
@@ -17,8 +19,10 @@
 		<version.jetty>6.1.11</version.jetty>
 	</properties>
 	<scm>
-		<connection>scm:svn:https://www.argeo.org/svn/slc/tags/argeo-slc-all-0.10.3/org.argeo.slc</connection>
-		<url>https://www.argeo.org/svn/slc/tags/argeo-slc-all-0.10.3/org.argeo.slc</url>
+		<connection>
+			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc
+		</connection>
+		<url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc</url>
 	</scm>
 	<issueManagement>
 		<system>Bugzilla</system>
@@ -96,7 +100,8 @@
 						<stopKey>stopKey</stopKey>
 						<stopPort>9091</stopPort>
 						<connectors>
-							<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+							<connector
+								implementation="org.mortbay.jetty.nio.SelectChannelConnector">
 								<port>9090</port>
 								<maxIdleTime>60000</maxIdleTime>
 							</connector>
@@ -359,6 +364,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+            <dependency>
+                <groupId>javax.xml.stream</groupId>
+                <artifactId>stax-api</artifactId>
+                <version>1.0</version>
+            </dependency>
 			<dependency>
 				<groupId>com.sun.xml.messaging.saaj</groupId>
 				<artifactId>saaj-impl</artifactId>
@@ -427,13 +437,28 @@
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.main</artifactId>
 				<version>1.2.1</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.apache.felix</groupId>
+						<artifactId>
+							org.apache.felix.framework
+						</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>org.osgi.core</artifactId>
+				<version>1.2.0</version>
+				<scope>provided</scope>
 			</dependency>
 
 			<!-- Auto UI -->
 			<dependency>
 				<groupId>org.argeo.dep.jemmy</groupId>
 				<artifactId>org.argeo.dep.jemmy.nb61</artifactId>
-				<version>0.2.0</version>
+				<version>0.2.2</version>
 			</dependency>
 
 		</dependencies>