X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fpom.xml;h=b21f3775d68dbdd57a20b0d53c2244af7b4af841;hb=bdd200301868c0a86f9ea578778247740c8c2ea0;hp=a2821be5c34b1bfa9bae53df6259b6c83e90ba91;hpb=cd0f1a6edcfa2654c12e2f87b132bcc5bba01f51;p=gpl%2Fargeo-slc.git
diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index a2821be5c..b21f3775d 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -4,11 +4,11 @@
org.argeo.slc
argeo-slc
- 0.11.2-SNAPSHOT
+ 0.11.3-SNAPSHOT
../org.argeo.slc
org.argeo.slc.webapp
- war
+ pom
Argeo SLC Web Application
${artifactId}
@@ -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
@@ -107,85 +102,74 @@
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
- surefire-it
- integration-test
-
- test
-
-
- false
-
-
-
-
-
- org.mortbay.jetty
- maven-jetty-plugin
-
-
- start-jetty
- pre-integration-test
-
- run-war
-
-
- true
-
-
-
- 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
-
-
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