X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fpom.xml;h=7876f22349cf17ea66c5727e45401fe8782ce914;hb=c81dc41c157107a601024ab1e1bef1f78fd952f1;hp=6449ed2ad94227ec15966441c7461093161d0410;hpb=8bc0fec4337033c647dd74b1947b057c998aa446;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 6449ed2ad..7876f2234 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-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,26 +64,6 @@
 							<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>
@@ -109,13 +90,7 @@
 							javax.servlet.jsp.jstl.core,
 							javax.servlet.jsp.jstl.fmt,
 							javax.servlet.jsp.jstl.tlv,
-							javax.servlet.resources,
-							org.springframework.security.ui.webapp,
-							org.springframework.security.userdetails.memory,
-							org.springframework.web.context,
-							org.springframework.osgi.web.context.support,
-							org.springframework.web.filter,
-							org.springframework.security.context
+							javax.servlet.resources
 						</Import-Package>
 						<Web-ContextPath>org.argeo.slc.ria</Web-ContextPath>
 					</instructions>
@@ -145,10 +120,18 @@
 								<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>
 							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
@@ -183,9 +166,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.commons.security</groupId>
+				<artifactId>org.argeo.security.ria</artifactId>
+				<version>${version.argeo-commons}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 </project>
\ No newline at end of file