X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fpom.xml;h=f29a673c18005b403f6f9bc5737a9a1ee952a47f;hb=c21ebdcf2d9e1e3d0df737dc29b9763a078d84dc;hp=dfcfbd77addaf00c50dbbd90217ada77e4874893;hpb=1f605077091f6bb2abced2b976e747b2e1337ff5;p=gpl%2Fargeo-slc.git
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index dfcfbd77a..f29a673c1 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/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.runtime
@@ -29,6 +29,7 @@
org.apache.felix
maven-bundle-plugin
+ ${version.maven-bundle-plugin}
@@ -45,24 +46,49 @@
../../org.argeo.slc.webapp/src/main/webapp
- ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+ ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test-local.xml
+ ../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml
+
+
+ activemq.base
+ ${user.home}/share/apache-activemq-5.2.0
+
+
+
org.argeo.slc.runtime
- org.argeo.slc.hibernate
- ${project.version}
+ org.argeo.slc.support.hibernate
org.argeo.slc.runtime
org.argeo.slc.support.castor
- ${project.version}
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.support.activemq
+
+
+
+
+ org.springframework.ws
+ org.springframework.ws
+
+
+ org.springframework
+ org.springframework.web.servlet
+
+
+ org.springframework
+ org.springframework.aop
+
javax.servlet
@@ -81,17 +107,17 @@
provided
- org.springframework.ws
- org.springframework.ws
-
-
- org.springframework
- org.springframework.web.servlet
+ javax.wsdl
+ com.springsource.javax.wsdl
+
+
- org.springframework
- org.springframework.aop
+ org.apache.activemq
+ com.springsource.org.apache.activemq.web
+
+
org.aspectj
com.springsource.org.aspectj.weaver
@@ -104,10 +130,6 @@
com.lowagie.text
com.springsource.com.lowagie.text
-
- javax.wsdl
- com.springsource.javax.wsdl
-