[maven-release-plugin] copy for tag argeo-slc-all-0.11.2

[gpl/argeo-slc.git] / org.argeo.slc.webapp / pom.xml

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 89f1e01cc865b30dfa2d87508b41238dbf1696de..d7a2e13055ccf6bef4a1c1ca65ce0bb00e9b01dd 100644 (file)
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -1,10 +1,9 @@
-<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>argeo-slc</artifactId>
-               <version>0.11.2-SNAPSHOT</version>
+               <version>0.11.2</version>
                <relativePath>../org.argeo.slc</relativePath>
        </parent>
        <artifactId>org.argeo.slc.webapp</artifactId>
@@ -55,6 +54,7 @@
                                                        <job>slc-build</job>
                                                </configuration>
                                        </execution>
+                                       <!-- 
                                        <execution>
                                                <id>slc-test</id>
                                                <phase>integration-test</phase>
@@ -65,6 +65,7 @@
                                                        <job>slc-test</job>
                                                </configuration>
                                        </execution>
+                                        -->
                                        <execution>
                                                <id>slc-api</id>
                                                <phase>site</phase>
@@ -80,68 +81,32 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-assembly-plugin</artifactId>
-                               <configuration>
-                                       <descriptors>
-                                               <descriptor>src/assembly/sdk.xml</descriptor>
-                                       </descriptors>
-                               </configuration>
                                <executions>
                                        <execution>
-                                               <id>assembly-base</id>
+                                               <id>assembly-ria</id>
                                                <phase>package</phase>
                                                <goals>
                                                        <goal>single</goal>
                                                </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <skipTests>true</skipTests>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>surefire-it</id>
-                                               <phase>integration-test</phase>
-                                               <goals>
-                                                       <goal>test</goal>
-                                               </goals>
                                                <configuration>
-                                                       <skipTests>false</skipTests>
+                                                       <descriptors>
+                                                               <descriptor>src/assembly/ria.xml</descriptor>
+                                                       </descriptors>
                                                </configuration>
                                        </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.mortbay.jetty</groupId>
-                               <artifactId>maven-jetty-plugin</artifactId>
-                               <executions>
                                        <execution>
-                                               <id>start-jetty</id>
-                                               <phase>pre-integration-test</phase>
+                                               <id>assembly-ria-slc</id>
+                                               <phase>package</phase>
                                                <goals>
-                                                       <goal>run-war</goal>
+                                                       <goal>single</goal>
                                                </goals>
                                                <configuration>
-                                                       <daemon>true</daemon>
+                                                       <descriptors>
+                                                               <descriptor>src/assembly/ria-slc.xml</descriptor>
+                                                       </descriptors>
                                                </configuration>
                                        </execution>
-                                       <execution>
-                                               <id>stop-jetty</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>stop</goal>
-                                               </goals>
-                                       </execution>
                                </executions>
-                               <configuration>
-                                       <webApp>${project.build.directory}/${artifactId}.war</webApp>
-                                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                                       <webDefaultXml>src/main/config/jetty/webdefault.xml</webDefaultXml>
-                                       <jettyConfig>src/main/config/jetty/jetty-test.xml</jettyConfig>
-                               </configuration>
                        </plugin>
                </plugins>
        </build>
@@ -151,36 +116,12 @@
                        <artifactId>org.argeo.slc.server</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.ant</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.ws.client</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-                       <scope>test</scope>
-               </dependency>
 
                <!-- Required in JDK 1.5 -->
                <dependency>
                        <groupId>com.sun.xml</groupId>
                        <artifactId>
-                                       com.springsource.com.sun.xml.messaging.saaj
+                               com.springsource.com.sun.xml.messaging.saaj
                                </artifactId>
                </dependency>