X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fpom.xml;h=7bc940f106fd530d9d2a2a8bbb0fb6a184469abf;hb=4810532845c8a54c04a850c7db3a9fe00e8ebc6a;hp=89f1e01cc865b30dfa2d87508b41238dbf1696de;hpb=9806e512313b8fd28f0fa0874300b04e90fcc43d;p=gpl%2Fargeo-slc.git
diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 89f1e01cc..7bc940f10 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -4,7 +4,7 @@
org.argeo.slc
argeo-slc
- 0.11.2-SNAPSHOT
+ 0.11.3-SNAPSHOT
../org.argeo.slc
org.argeo.slc.webapp
@@ -26,7 +26,7 @@
org.argeo.slc.maven
maven-argeo-qooxdoo-plugin
- 0.8.0.6
+ 0.8.1.2
env
@@ -55,16 +55,11 @@
slc-build
-
- slc-test
- integration-test
-
- generate
-
-
- slc-test
-
-
+
slc-api
site
@@ -80,68 +75,32 @@
org.apache.maven.plugins
maven-assembly-plugin
-
-
- src/assembly/sdk.xml
-
-
- assembly-base
+ assembly-ria
package
single
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
- surefire-it
- integration-test
-
- test
-
- false
+
+ src/assembly/ria.xml
+
-
-
-
- org.mortbay.jetty
- maven-jetty-plugin
-
- start-jetty
- pre-integration-test
+ assembly-ria-slc
+ package
- run-war
+ single
- true
+
+ src/assembly/ria-slc.xml
+
-
- stop-jetty
- post-integration-test
-
- stop
-
-
-
- ${project.build.directory}/${artifactId}.war
- 0
- src/main/config/jetty/webdefault.xml
- src/main/config/jetty/jetty-test.xml
-
@@ -149,38 +108,75 @@
org.argeo.slc.runtime
org.argeo.slc.server
- ${project.version}
+
+
- org.argeo.slc.runtime
- org.argeo.slc.launcher
- ${project.version}
- test
+ org.springframework.osgi
+ org.springframework.osgi.web.extender
- org.argeo.slc.runtime
- org.argeo.slc.support.ant
- ${project.version}
- test
+ org.eclipse.osgi
+ org.eclipse.osgi
- org.argeo.slc.runtime
- org.argeo.slc.support.ws.client
- ${project.version}
- test
+ org.apache.catalina
+ com.springsource.org.apache.catalina
+
+
+ org.springframework.osgi
+ org.springframework.osgi.web
+
+
+ javax.annotation
+ com.springsource.javax.annotation
+
+
+ javax.persistence
+ com.springsource.javax.persistence
+
+
+ javax.xml.ws
+ com.springsource.javax.xml.ws
+
+
+ javax.xml.bind
+ com.springsource.javax.xml.bind
+
+
+ org.springframework.osgi
+ org.springframework.osgi.extender
+
+
+ org.argeo.slc.dep.osgi
+ org.argeo.dep.osgi.catalina.start
+
+
+ javax.servlet
+ com.springsource.javax.servlet.jsp
+
+
+ javax.el
+ com.springsource.javax.el
+
+
+ javax.servlet
+ com.springsource.javax.servlet.jsp.jstl
+
+
+ org.apache.taglibs
+ com.springsource.org.apache.taglibs.standard
-
- javax.activation
- com.springsource.javax.activation
- test
+ org.hsqldb
+ com.springsource.org.hsqldb
com.sun.xml
- com.springsource.com.sun.xml.messaging.saaj
+ com.springsource.com.sun.xml.messaging.saaj