X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fpom.xml;h=c8ca584a552b3e079b373e5ec3457241fee99b64;hb=4663b42433ba4a16c81d90927aecff2a923cd7a4;hp=fa3f0704a73df8ba7606b9ebfd980f3dc42eec56;hpb=94f7f66d8aa4f9c3510c215045964bad85208cc8;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index fa3f0704a..c8ca584a5 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.13.0-SNAPSHOT</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,35 +64,10 @@
 							<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>
@@ -99,9 +75,6 @@
 				<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,18 +112,12 @@
 								<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>
 								</artifactItem>
-								<artifactItem>
-									<groupId>org.argeo.commons.security</groupId>
-									<artifactId>org.argeo.security.ria</artifactId>
-									<classifier>ria-security</classifier>
-									<type>zip</type>
-									<outputDirectory>src/argeo-ria-lib/security</outputDirectory>
-								</artifactItem>								
-							</artifactItems>							
+							</artifactItems>
 							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
@@ -184,7 +151,19 @@
 								<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>
@@ -192,10 +171,10 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.argeo.commons.security</groupId>
-				<artifactId>org.argeo.security.ria</artifactId>
-				<version>${version.argeo-commons}</version>
+				<groupId>org.argeo.ria</groupId>
+				<artifactId>org.argeo.ria.core</artifactId>
+				<version>${version.argeo-ria}</version>
 			</dependency>
 		</dependencies>
-	</dependencyManagement>	
+	</dependencyManagement>
 </project>
\ No newline at end of file