X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=571d5d3090e9445c4e93bd419628f5e739b96692;hb=90e0f279286d0247542e8557272d47c8064b822b;hp=98fde70983cf9bd0af92a2d839de55f42e217bc8;hpb=eda6ec9fac31c155445caeb7441c64b5ae2e933a;p=gpl%2Fargeo-slc.git
diff --git a/pom.xml b/pom.xml
index 98fde7098..571d5d309 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,7 @@
runtime
dep
+ modules
server
demo
integration-tests
@@ -16,6 +17,7 @@
0.11
+ 0.11.4-SNAPSHOT
2.5.6.SEC01
1.5.7.A
1.2.0
@@ -27,7 +29,8 @@
1.5.6
2.0.0
5.2.0.0006
- 0.1.13
+ 0.1.15-SNAPSHOT
+ 0.8.2-SNAPSHOT
file:///var/argeo/projects/SLC/www/site
http://www.argeo.org/projects/slc/site
@@ -140,70 +143,32 @@ limitations under the License.
-
- org.mortbay.jetty
- maven-jetty-plugin
- ${version.jetty}
-
- org.argeo.slc.webapp
- stopKey
- 9091
-
-
- 9090
- 60000
-
-
-
-
-
- org.hsqldb
-
- com.springsource.org.hsqldb
-
- 1.8.0.9
-
-
- org.mortbay.jetty
- jetty-plus
- ${version.jetty}
-
-
- org.mortbay.jetty
- jetty-naming
- ${version.jetty}
-
-
- org.apache.log4j
- com.springsource.org.apache.log4j
- 1.2.15
-
-
- javax.xml.soap
- com.springsource.javax.xml.soap
- 1.3.0
-
-
- javax.mail
- com.springsource.javax.mail
- 1.4.1
-
-
-
-
- org.argeo.slc.maven
+ org.argeo.maven.plugins
maven-argeo-osgi-plugin
${version.maven-argeo-osgi}
+
+ org.codehaus.mojo
+ buildnumber-maven-plugin
+ 1.0-beta-3
+
+
+ validate
+
+ create
+
+
+
+
+ false
+ false
+ true
+
+
org.apache.maven.plugins
maven-resources-plugin
@@ -220,8 +185,6 @@ limitations under the License.
http://jira.codehaus.org/browse/MSITE-276
-->
-
-
org.apache.maven.plugins
maven-release-plugin
@@ -242,6 +205,16 @@ limitations under the License.
org.argeo.slc.specs
${project.version}
+
+ org.argeo.slc.runtime
+ org.argeo.slc.core
+ ${project.version}
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.unit
+ ${project.version}
+
org.argeo.slc.runtime
org.argeo.slc.launcher
@@ -257,11 +230,11 @@ limitations under the License.
org.argeo.slc.support.simple
${project.version}
-
+ ${project.version}
+
org.argeo.slc.runtime
org.argeo.slc.support.hibernate
@@ -287,6 +260,11 @@ limitations under the License.
org.argeo.slc.osgiboot
${project.version}
+
+ org.argeo.slc.runtime
+ org.argeo.slc.support.osgi
+ ${project.version}
+
org.argeo.slc.runtime
org.argeo.slc.support.equinox
@@ -305,6 +283,12 @@ limitations under the License.
org.argeo.slc.ria
${project.version}
+
+
+ org.argeo.ria
+ org.argeo.ria.core
+ ${version.argeo-ria}
+
org.slf4j
- com.springsource.slf4j.org.apache.commons.logging
+ com.springsource.slf4j.api
${version.slf4j}
org.slf4j
- com.springsource.slf4j.jcl
+ com.springsource.slf4j.org.apache.commons.logging
${version.slf4j}
org.slf4j
- com.springsource.slf4j.org.apache.log4j
+ com.springsource.slf4j.log4j
${version.slf4j}
@@ -430,16 +412,34 @@ limitations under the License.
org.springframework
org.springframework.core
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.beans
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.context
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
@@ -447,77 +447,190 @@ limitations under the License.
org.springframework.context.support
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.orm
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.jdbc
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.transaction
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.web
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.web.servlet
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.aop
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework
org.springframework.jms
${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework.ws
org.springframework.oxm
${version.spring-ws}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
+
org.springframework.osgi
org.springframework.osgi.extender
${version.spring-osgi}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework.osgi
org.springframework.osgi.core
${version.spring-osgi}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework.osgi
org.springframework.osgi.web.extender
${version.spring-osgi}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework.osgi
org.springframework.osgi.web
${version.spring-osgi}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.springframework.osgi
org.springframework.osgi.test
${version.spring-osgi}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
- org.argeo.slc.dep.osgi
+ org.argeo.dep.osgi
org.argeo.dep.osgi.catalina.start
- 1.0.0.argeo3
+ 1.0.0.argeo4
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
+
+
+
+
+ org.springframework.security
+ org.springframework.security
+ 2.0.4.A
+
+
+ org.springframework
+ org.springframework.web
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
+
+
+ org.antlr
+ com.springsource.org.antlr
+ 3.0.1
@@ -574,6 +687,12 @@ limitations under the License.
org.apache.bsf
com.springsource.org.apache.bsf
2.4.0
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.beanshell
@@ -597,7 +716,7 @@ limitations under the License.
org.argeo.dep.osgi
org.argeo.dep.osgi.commons.cli
- 1.1
+ 1.1.0.argeo1
org.argeo.dep.osgi
@@ -630,6 +749,12 @@ limitations under the License.
com.mysql.jdbc
com.springsource.com.mysql.jdbc
5.1.6
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
@@ -637,6 +762,12 @@ limitations under the License.
org.codehaus.castor
com.springsource.org.castor
1.2.0
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
org.apache.xerces
@@ -770,6 +901,12 @@ limitations under the License.
com.springsource.org.hibernate
3.2.6.ga
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
net.sourceforge.jexcelapi
@@ -780,6 +917,12 @@ limitations under the License.
net.sourceforge.ehcache
com.springsource.net.sf.ehcache
1.4.1
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
edu.emory.mathcs.backport
@@ -821,6 +964,10 @@ limitations under the License.
org.apache.activemq
com.springsource.org.apache.activemq
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
+ com.jcraft.jsch
+ com.springsource.com.jcraft.jsch
+ 0.1.25
+
+
+
+
+ com.opensymphony.quartz
+ com.springsource.org.quartz
+ 1.6.2
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
+
+
+
+
+ org.argeo.dep.jemmy
+ org.argeo.dep.jemmy.nb61
+ 0.2.2
+
+
+ org.argeo.dep.jacob
+ org.argeo.dep.jacob
+ 1.14.3.argeo4
+
+
+ org.argeo.dep.jacob
+ org.argeo.dep.jacob.win32.x86
+ 1.14.3.argeo4
+
+
+
+ org.springframework
+ org.springframework.jdbc
+ ${version.spring}
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
+
+
+ org.custommonkey.xmlunit
+ com.springsource.org.custommonkey.xmlunit
+ 1.2.0
+
+
+
+ org.beanshell
+ com.springsource.bsh
+ 2.0.0.b4
+
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.beanutils
+ 1.7.0
+
+
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
+
+
+
@@ -1063,19 +1281,20 @@ limitations under the License.
org.apache.maven.plugins
maven-pmd-plugin
2.3
+ false
+
+ true
+ 1.5
+ true
+
+ **/springutil/*.java
+
+
cpd
-
- true
- 1.5
- true
-
- **/springutil/*.java
-
-