X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fpom.xml;h=084e2b67c59223f9e0c485a2df596b45e14f8b5d;hb=cadd80fc4de2449895d7cb7720c8eff5c3118e70;hp=410cf8347761a4abc896f12517a6ef550a61f6e0;hpb=f5c671ebe1c495a67793c37e78e1eda990d65eba;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 410cf8347..084e2b67c 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.2-SNAPSHOT</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>
@@ -94,7 +93,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<!--
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -103,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,
@@ -146,13 +144,12 @@
 									<outputDirectory>src/argeo-ria-src</outputDirectory>
 								</artifactItem>
 							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
+							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -169,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>