X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fpom.xml;h=4c0355e29e566fffeb054a16bcc789f63a5022c6;hb=3041a38db80c37c1459e11f2a4c73c50cd653159;hp=51313d077e70f1af0dd201b9586582f2ca77fcbe;hpb=9089b25384758c01359acad6ceaf75a24c4d4853;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 51313d077..4c0355e29 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>server</artifactId>
-		<version>0.12.1-SNAPSHOT</version>
+		<version>0.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.server</groupId>
@@ -26,7 +26,7 @@
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
 				<version>${version.maven-argeo-qooxdoo}</version>
 				<configuration>
-					<sdkVersion>0.8.2.argeo.1</sdkVersion>
+					<sdkVersion>1.1.0</sdkVersion>
 				</configuration>
 				<executions>
 					<execution>
@@ -109,13 +109,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>
@@ -130,7 +124,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!--
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -150,14 +143,20 @@
 									<type>zip</type>
 									<outputDirectory>src/argeo-ria-src</outputDirectory>
 								</artifactItem>
-							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
+								<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>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -174,8 +173,41 @@
 							</descriptors>
 						</configuration>
 					</execution>
+					<execution>
+						<id>assembly-ria-slc-web</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>assembly/ria-slc-web.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</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