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

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index d043faf6e..59c33b362 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -1,16 +1,15 @@
-<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.11.4-SNAPSHOT</version>
+		<version>0.12.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.server</groupId>
 	<artifactId>org.argeo.slc.ria</artifactId>
 	<packaging>jar</packaging>
-	<name>Argeo SLC RIA</name>
+	<name>SLC RIA</name>
 	<build>
 		<resources>
 			<resource>
@@ -27,7 +26,7 @@
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
 				<version>${version.maven-argeo-qooxdoo}</version>
 				<configuration>
-					<sdkVersion>0.8.2.argeo.1</sdkVersion>
+					<sdkVersion>0.8.3</sdkVersion>
 				</configuration>
 				<executions>
 					<execution>
@@ -102,7 +101,7 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-						<Export-Package></Export-Package>
+						<Export-Package />
 						<Import-Package>
 							javax.servlet,
 							javax.servlet.http,
@@ -110,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>
@@ -151,7 +144,7 @@
 									<outputDirectory>src/argeo-ria-src</outputDirectory>
 								</artifactItem>
 							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
+							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
 					</execution>
@@ -173,6 +166,18 @@
 							</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>				
 				</executions>
 			</plugin>
 		</plugins>