X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fpom.xml;h=232244babea8d1dd7aad5a4bbca425c08ee9fd98;hb=1973d521367cdfe1d467da2bb8a539284996bcf6;hp=59c33b362b8615bffb05c0bce9d77b632eca3bc1;hpb=5fdd82df06b612c7cb6effa41a3d4b5b87c2b4c6;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 59c33b362..232244bab 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -1,9 +1,10 @@
-<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.slc</groupId>
 		<artifactId>server</artifactId>
-		<version>0.12.1</version>
+		<version>0.13.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.server</groupId>
@@ -26,7 +27,7 @@
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
 				<version>${version.maven-argeo-qooxdoo}</version>
 				<configuration>
-					<sdkVersion>0.8.3</sdkVersion>
+					<sdkVersion>1.1.0</sdkVersion>
 				</configuration>
 				<executions>
 					<execution>
@@ -63,45 +64,17 @@
 							<job>slc-build</job>
 						</configuration>
 					</execution>
-					<execution>
-						<id>slc-test</id>
-						<phase>site</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<job>slc-test</job>
-						</configuration>
-					</execution>
-					<execution>
-						<id>slc-api</id>
-						<phase>site</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<job>slc-api</job>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
-						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-						<Export-Package />
 						<Import-Package>
 							javax.servlet,
 							javax.servlet.http,
@@ -139,6 +112,7 @@
 								<artifactItem>
 									<groupId>org.argeo.ria</groupId>
 									<artifactId>org.argeo.ria.core</artifactId>
+									<version>${version.argeo-ria}</version>
 									<classifier>ria</classifier>
 									<type>zip</type>
 									<outputDirectory>src/argeo-ria-src</outputDirectory>
@@ -177,9 +151,30 @@
 								<descriptor>assembly/ria-slc-web.xml</descriptor>
 							</descriptors>
 						</configuration>
-					</execution>				
+					</execution>
+					<execution>
+						<id>assembly-ria-jcr</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>assembly/ria-jcr.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.ria</groupId>
+				<artifactId>org.argeo.ria.core</artifactId>
+				<version>${version.argeo-ria}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 </project>
\ No newline at end of file