X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fpom.xml;h=6f1792043bfd457244edcd36ef3a203dea081798;hb=8eb028e332cb2be50ed311a0501f7efce5849d44;hp=5dd781fbbb6c2543057de3c4986538d493539a39;hpb=27ce6bc00a1553eb855a3880a7e99e96a1c9ef00;p=gpl%2Fargeo-slc.git
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index 5dd781fbb..6f1792043 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -3,9 +3,9 @@
4.0.0
org.argeo.slc
- argeo-slc
- 0.11.2-SNAPSHOT
- ../../org.argeo.slc
+ runtime
+ 0.11.4-SNAPSHOT
+ ..
org.argeo.slc.runtime
org.argeo.slc.server
@@ -25,15 +25,21 @@
org.apache.maven.plugins
maven-jar-plugin
+
org.apache.felix
maven-bundle-plugin
+ ${version.maven-bundle-plugin}
- org.argeo.slc.*
+ org.argeo.slc.*,org.argeo.slc.server,org.argeo.slc.server.spring
+ org.w3c.dom;version="0.0.0",javax.xml.*;version="0.0.0",org.argeo.slc.activemq,org.argeo.slc.execution,*
@@ -45,57 +51,53 @@
../../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.support.hibernate
- ${project.version}
-
-
- org.argeo.slc.runtime
- org.argeo.slc.support.castor
- ${project.version}
+ org.argeo.slc.core
+
- javax.servlet
-
- com.springsource.javax.servlet.jsp.jstl
-
-
-
- org.apache.taglibs
-
- com.springsource.org.apache.taglibs.standard
-
+ org.springframework
+ org.springframework.web.servlet
- javax.servlet
- com.springsource.javax.servlet
- provided
+ org.springframework
+ org.springframework.aop
org.springframework.ws
- org.springframework.ws
-
-
- org.springframework
- org.springframework.web.servlet
+ org.springframework.oxm
+
+
- org.springframework
- org.springframework.aop
+ javax.servlet
+ com.springsource.javax.servlet
+
+
org.aspectj
com.springsource.org.aspectj.weaver
+
+
net.sourceforge.jexcelapi
com.springsource.jxl
@@ -104,9 +106,21 @@
com.lowagie.text
com.springsource.com.lowagie.text
+
+
+
+ org.springframework.security
+ org.springframework.security
+
+
+
+ com.springsource.json
+ com.springsource.json
+ 1.0.1.RELEASE
+
- javax.wsdl
- com.springsource.javax.wsdl
+ org.antlr
+ com.springsource.org.antlr