X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fpom.xml;h=f29a673c18005b403f6f9bc5737a9a1ee952a47f;hb=7e5b554623c63e4c55c7685add0f12419a90b856;hp=7da3764d88dfbf678d83fae6997b242e6de2b816;hpb=849cd8dd11f663afefbe219890531c40dbddd571;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml index 7da3764d8..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,25 +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.support.hibernate - ${project.version} 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 @@ -82,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 @@ -105,10 +130,6 @@ com.lowagie.text com.springsource.com.lowagie.text - - javax.wsdl - com.springsource.javax.wsdl -