X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=7b8c291ad65d15eec66631a3fe6458ab6ad8b5d0;hb=8e097b1470aab6e956108acdbc5ddcd78488beec;hp=28e3c033c9a4c1a5321719a3a90afb608f6c67a7;hpb=2ad1acc6a405415f6456c5547ad6ec2a87438fec;p=gpl%2Fargeo-slc.git
diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 28e3c033c..7b8c291ad 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -11,21 +11,19 @@
pom
Argeo SLC Site server
- 1.1.3
+ 1.1.2
2.5.5
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
- war
- true
- true
- true
-
-
+
org.mortbay.jetty
maven-jetty-plugin
@@ -50,52 +48,106 @@
+
+ maven-dependency-plugin
+
+
+ copy
+ initialize
+
+ copy
+
+
+ ${project.build.directory}/equinox
+ true
+
+
+ org.eclipse.osgi
+ org.eclipse.osgi
+ ${version.equinox}
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.osgiboot
+ ${project.version}
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.osgiboot
+ ${project.version}
+ xml
+ osgiboot
+
+
+
+ org.objectweb.asm
+ com.springsource.org.objectweb.asm
+ 1.5.3
+
+
+ org.objectweb.asm
+ com.springsource.org.objectweb.asm.attrs
+ 1.5.3
+
+
+
+
+
+
maven-antrun-plugin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ maven-dependency-plugin
+
+
+ manager
+ initialize
+
+ list
+
+
+ target/server.maven
+
+
+
+
@@ -144,20 +196,21 @@
javax.xml.bind
com.springsource.javax.xml.bind
+
+
+ org.aopalliance
+ com.springsource.org.aopalliance
+ 1.0.0
+
+
-
-
-
- org.apache.commons
- com.springsource.org.apache.commons.logging
-
-
- org.apache.log4j
-
- com.springsource.org.apache.log4j
-
-
-
+
org.springframework.osgi
- catalina.osgi
- 5.5.23-SNAPSHOT
+ org.springframework.osgi.web.extender
-
org.springframework.osgi
- catalina.start.osgi
- 1.0.0
+ org.springframework.osgi.extender
org.springframework.osgi
- jasper.osgi
- 5.5.23-SNAPSHOT
+ org.springframework.osgi.web
- org.springframework.osgi
- commons-el.osgi
- 1.0-SNAPSHOT
+ org.apache.catalina
+ com.springsource.org.apache.catalina
-
- org.springframework.osgi
- jstl.osgi
- 1.1.2-SNAPSHOT
+ org.apache.jasper
+ com.springsource.org.apache.jasper
+ 6.0.18
- org.springframework.osgi
- servlet-api.osgi
- 2.5-SNAPSHOT
- jar
+ org.apache.el
+ com.springsource.org.apache.el
+ 6.0.18
+
- org.springframework.osgi
- jsp-api.osgi
- 2.0-SNAPSHOT
- jar
+ javax.servlet
+ com.springsource.javax.servlet.jsp
-
- org.springframework.osgi
- spring-osgi-web
- ${spring-osgi.version}
+ javax.el
+ com.springsource.javax.el
-
- org.springframework.osgi
- spring-osgi-web-extender
- ${spring-osgi.version}
+ javax.servlet
+ com.springsource.javax.servlet.jsp.jstl
-
- org.springframework.osgi
- spring-osgi-extender
- ${spring-osgi.version}
+ org.apache.taglibs
+ com.springsource.org.apache.taglibs.standard
-
- org.aopalliance
- com.springsource.org.aopalliance
- 1.0.0
-
+
- org.springframework
- spring-web
- ${spring.version}
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
- org.springframework
- spring-context
- ${spring.version}
+ org.apache.log4j
+
+ com.springsource.org.apache.log4j
+
- org.springframework
- spring-webmvc
- ${spring.version}
+ org.springframework.osgi
+ catalina.start.osgi
+ 1.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -290,10 +373,34 @@
6.1.9
-
- org.argeo.slc
+ com.thoughtworks.xstream
+ com.springsource.com.thoughtworks.xstream
+ 1.2.2
+
+
+
+
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.support.equinox
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.support.activemq
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.support.castor
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.support.maven
${project.version}