From: Mathieu Baudier Date: Wed, 27 Jun 2012 11:21:51 +0000 (+0000) Subject: Build working based on Commons v1.1.1 X-Git-Tag: argeo-slc-2.1.7~691 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=411353f2dc434519d5c2014d8bf8d93ddffe26fc;p=gpl%2Fargeo-slc.git Build working based on Commons v1.1.1 git-svn-id: https://svn.argeo.org/slc/trunk@5373 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/dep/org.argeo.slc.dep.detached/pom.xml b/dep/org.argeo.slc.dep.detached/pom.xml index c93c03d21..5041bafaa 100644 --- a/dep/org.argeo.slc.dep.detached/pom.xml +++ b/dep/org.argeo.slc.dep.detached/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -23,8 +23,8 @@ - net.sourceforge.mx4j - com.springsource.mx4j + org.argeo.tp + mx4j \ No newline at end of file diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml index 6e4bb1c6c..c86827508 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml +++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc.eclipse @@ -44,8 +44,8 @@ - biz.aQute - bndlib + org.argeo.tp + biz.aQute.bndlib - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1a0475e81..823eda5d1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.argeo.commons argeo-commons - 0.4.0 + 1.1.1 org.argeo.slc argeo-slc @@ -92,18 +93,6 @@ limitations under the License. - - - Philippe Rioland - - CapCo - http://www.capco.com - - tester - sponsor - - - @@ -117,8 +106,8 @@ limitations under the License. - argeo - http://maven.argeo.org/argeo + argeo-commons + http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.commons-1.1.1 true daily @@ -130,54 +119,12 @@ limitations under the License. fail - - argeo-snapshots - http://dev.argeo.org/maven/argeo-snapshots - - false - never - fail - - - true - always - fail - - argeo-slc-site SLC Site - file://${site.repoBase}/${developmentCycle.slc}/ + file://${site.repoBase}/${project.version} - - - developer - - file://${user.home}/dev/work/slcSite - ${site.repoBase} - - - - true - argeo-snapshots-restricted - Argeo FOSS Snapshots Repository - scpexe://argeo.org/var/argeo/maven2/argeo-snapshots - - - - - release - - - argeo-slc-site - SLC Site - file://${site.repoBase}/${version.slc} - - - - - diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml index e8978de69..38a717280 100644 --- a/runtime/org.argeo.slc.core/pom.xml +++ b/runtime/org.argeo.slc.core/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -49,26 +49,26 @@ - org.aspectj - com.springsource.org.aspectj.runtime + org.argeo.tp + org.aspectj.runtime - org.aspectj - com.springsource.org.aspectj.weaver + org.argeo.tp + org.aspectj.weaver - org.apache.commons - com.springsource.org.apache.commons.io + org.argeo.tp + org.apache.commons.io - org.argeo.dep.osgi - org.argeo.dep.osgi.commons.exec + org.argeo.tp + org.apache.commons.exec - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging org.argeo.commons.basic @@ -79,28 +79,36 @@ - org.springframework + org.argeo.tp org.springframework.context - org.springframework.security + org.argeo.tp + org.springframework.core + + + org.argeo.tp + org.springframework.aop + + + org.argeo.tp org.springframework.security.core - net.sourceforge.cglib - com.springsource.net.sf.cglib + org.argeo.tp + net.sf.cglib - org.apache.commons - com.springsource.org.apache.commons.codec + org.argeo.tp + org.apache.commons.codec - org.junit - com.springsource.junit + org.argeo.tp + junit test diff --git a/runtime/org.argeo.slc.detached.launcher/pom.xml b/runtime/org.argeo.slc.detached.launcher/pom.xml index d7b8f3e2a..d7768323e 100644 --- a/runtime/org.argeo.slc.detached.launcher/pom.xml +++ b/runtime/org.argeo.slc.detached.launcher/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -50,7 +50,7 @@ - org.eclipse.osgi + org.argeo.tp org.eclipse.osgi diff --git a/runtime/org.argeo.slc.detached/pom.xml b/runtime/org.argeo.slc.detached/pom.xml index 6b08142aa..cbe8e2099 100644 --- a/runtime/org.argeo.slc.detached/pom.xml +++ b/runtime/org.argeo.slc.detached/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -43,50 +43,48 @@ - org.eclipse.osgi + org.argeo.tp org.eclipse.osgi - org.springframework.osgi + org.argeo.tp org.springframework.osgi.extender - edu.emory.mathcs.backport - com.springsource.edu.emory.mathcs.backport + org.argeo.tp + edu.emory.mathcs.backport - org.apache.xmlcommons - com.springsource.org.apache.xmlcommons + org.argeo.tp + org.apache.xmlcommons provided - org.apache.commons - - com.springsource.org.apache.commons.io - + org.argeo.tp + org.apache.commons.io - org.junit - com.springsource.junit + org.argeo.tp + junit test - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging - org.slf4j - com.springsource.slf4j.log4j + org.argeo.tp + slf4j.log4j - org.apache.xerces - com.springsource.org.apache.xerces + org.argeo.tp + org.apache.xerces diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml index 544930149..d4125afab 100644 --- a/runtime/org.argeo.slc.launcher/pom.xml +++ b/runtime/org.argeo.slc.launcher/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -84,17 +84,17 @@ - org.argeo.dep.osgi - org.argeo.dep.osgi.commons.cli + org.argeo.tp + org.apache.commons.cli - org.eclipse.osgi + org.argeo.tp org.eclipse.osgi - org.springframework.ws + org.argeo.tp org.springframework.oxm true diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml index c1ecc2261..51484fca0 100644 --- a/runtime/org.argeo.slc.repo/pom.xml +++ b/runtime/org.argeo.slc.repo/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -48,20 +48,20 @@ - org.eclipse.osgi + org.argeo.tp org.eclipse.osgi - org.apache.commons - com.springsource.org.apache.commons.io + org.argeo.tp + org.apache.commons.io - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging - javax.servlet - com.springsource.javax.servlet + org.argeo.tp + javax.servlet - + \ No newline at end of file diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml index bce230f7e..16ecb0690 100644 --- a/runtime/org.argeo.slc.server/pom.xml +++ b/runtime/org.argeo.slc.server/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -53,69 +53,73 @@ - org.springframework + org.argeo.tp + org.springframework.web + + + org.argeo.tp org.springframework.web.servlet - org.springframework + org.argeo.tp org.springframework.aop - org.springframework.ws + org.argeo.tp org.springframework.oxm true - org.apache.commons - com.springsource.org.apache.commons.fileupload + org.argeo.tp + org.apache.commons.fileupload - javax.servlet - com.springsource.javax.servlet + org.argeo.tp + javax.servlet - org.aspectj - com.springsource.org.aspectj.weaver + org.argeo.tp + org.aspectj.weaver - net.sourceforge.jexcelapi - com.springsource.jxl + org.argeo.tp + jxl - com.lowagie.text - com.springsource.com.lowagie.text + org.argeo.tp + com.lowagie.text - com.springsource.json + org.argeo.tp com.springsource.json 1.0.1.RELEASE true - org.antlr - com.springsource.org.antlr + org.argeo.tp + org.antlr true - com.svnkit - com.springsource.org.tmatesoft.svn + org.argeo.tp + org.tmatesoft.svn true - + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml index 5a049f60c..62848dd8d 100644 --- a/runtime/org.argeo.slc.support.activemq/pom.xml +++ b/runtime/org.argeo.slc.support.activemq/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -35,64 +35,56 @@ - org.springframework + org.argeo.tp org.springframework.jms - org.springframework.ws + org.argeo.tp org.springframework.oxm - org.springframework + org.argeo.tp org.springframework.transaction - org.aspectj - com.springsource.org.aspectj.weaver + org.argeo.tp + org.aspectj.weaver - javax.jms - com.springsource.javax.jms + org.argeo.tp + javax.jms - org.argeo.dep.osgi - org.argeo.dep.osgi.activemq + org.argeo.tp + org.apache.activemq - - - - - org.apache.activemq - com.springsource.org.apache.activemq.pool - - - org.apache.commons - com.springsource.org.apache.commons.pool + org.argeo.tp + org.apache.commons.pool - org.apache.geronimo.specs - com.springsource.javax.management.j2ee + org.argeo.tp + javax.management.j2ee - javax.ejb - com.springsource.javax.ejb + org.argeo.tp + javax.ejb - javax.xml.rpc - com.springsource.javax.xml.rpc + org.argeo.tp + javax.xml.rpc - javax.servlet - com.springsource.javax.servlet + org.argeo.tp + javax.servlet \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.aether/pom.xml b/runtime/org.argeo.slc.support.aether/pom.xml index aab31cb18..c131b4a6a 100644 --- a/runtime/org.argeo.slc.support.aether/pom.xml +++ b/runtime/org.argeo.slc.support.aether/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -33,31 +33,31 @@ - org.argeo.dep.osgi - org.argeo.dep.osgi.aether + org.argeo.tp + org.sonatype.aether - org.springframework + org.argeo.tp org.springframework.beans - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging - org.eclipse.osgi + org.argeo.tp org.eclipse.osgi provided - org.junit - com.springsource.junit + org.argeo.tp + junit test - + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml index ede0f88f3..bb5ea5e6d 100644 --- a/runtime/org.argeo.slc.support.ant/pom.xml +++ b/runtime/org.argeo.slc.support.ant/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -34,26 +34,26 @@ - org.apache.ant - com.springsource.org.apache.tools.ant + org.argeo.tp + org.apache.tools.ant - org.apache.ant - com.springsource.org.apache.tools.ant.launch + org.argeo.tp + org.apache.tools.ant.launch - org.apache.commons - com.springsource.org.apache.commons.net + org.argeo.tp + org.apache.commons.net - org.apache.oro - com.springsource.org.apache.oro + org.argeo.tp + org.apache.oro - org.apache.bsf - com.springsource.org.apache.bsf + org.argeo.tp + org.apache.bsf \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml index d588c1397..f1371cf0c 100644 --- a/runtime/org.argeo.slc.support.castor/pom.xml +++ b/runtime/org.argeo.slc.support.castor/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -66,23 +66,23 @@ - org.springframework.ws + org.argeo.tp org.springframework.oxm - org.codehaus.castor - com.springsource.org.castor + org.argeo.tp + org.castor - org.apache.xerces - com.springsource.org.apache.xerces + org.argeo.tp + org.apache.xerces - org.apache.xalan - com.springsource.org.apache.xalan + org.argeo.tp + org.apache.xalan diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml index 6cfb0c501..b63a57729 100644 --- a/runtime/org.argeo.slc.support.equinox/pom.xml +++ b/runtime/org.argeo.slc.support.equinox/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.argeo.slc @@ -17,13 +19,15 @@ org.apache.maven.plugins maven-surefire-plugin - false + + true org.apache.felix maven-bundle-plugin - @@ -47,7 +51,7 @@ - org.eclipse.osgi + org.argeo.tp org.eclipse.osgi diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml index 158c494b6..eab0bb374 100644 --- a/runtime/org.argeo.slc.support.hibernate/pom.xml +++ b/runtime/org.argeo.slc.support.hibernate/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.argeo.slc @@ -14,7 +16,6 @@ org.apache.felix maven-bundle-plugin - org.argeo.slc.core @@ -22,6 +23,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + true + + @@ -32,35 +41,37 @@ - org.hibernate - com.springsource.org.hibernate + org.argeo.tp + org.hibernate - net.sourceforge.ehcache - com.springsource.net.sf.ehcache + org.argeo.tp + net.sf.ehcache - edu.emory.mathcs.backport - - com.springsource.edu.emory.mathcs.backport - + org.argeo.tp + edu.emory.mathcs.backport - org.springframework + org.argeo.tp org.springframework.orm - org.springframework + org.argeo.tp org.springframework.jdbc - org.springframework + org.argeo.tp org.springframework.context.support + + org.argeo.tp + org.springframework.transaction + - org.apache.commons - com.springsource.org.apache.commons.dbcp + org.argeo.tp + org.apache.commons.dbcp @@ -79,21 +90,14 @@ - org.hsqldb - com.springsource.org.hsqldb - test - - - com.h2database - com.springsource.org.h2 + org.argeo.tp + org.hsqldb test - - javax.transaction - com.springsource.javax.transaction + org.argeo.tp + org.h2 test - - + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.jemmy/pom.xml b/runtime/org.argeo.slc.support.jemmy/pom.xml index aa4c760bc..d1b7f8512 100644 --- a/runtime/org.argeo.slc.support.jemmy/pom.xml +++ b/runtime/org.argeo.slc.support.jemmy/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -43,7 +43,7 @@ - org.argeo.dep.jemmy + org.argeo.tp org.argeo.dep.jemmy.nb61 diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml index 447896221..1a5b79e77 100644 --- a/runtime/org.argeo.slc.support.maven/pom.xml +++ b/runtime/org.argeo.slc.support.maven/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -77,17 +77,17 @@ - org.springframework + org.argeo.tp org.springframework.beans - org.apache.commons - com.springsource.org.apache.commons.io + org.argeo.tp + org.apache.commons.io - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging @@ -218,13 +218,13 @@ - org.argeo.dep.osgi - org.argeo.dep.osgi.aether + org.argeo.tp + org.sonatype.aether - org.junit - com.springsource.junit + org.argeo.tp + junit - + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml index 2c250b614..d5fcd95e7 100644 --- a/runtime/org.argeo.slc.support.osgi/pom.xml +++ b/runtime/org.argeo.slc.support.osgi/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -10,7 +10,7 @@ org.argeo.slc.support.osgi SLC Support OSGi jar - + @@ -35,46 +35,46 @@ - biz.aQute - bndlib + org.argeo.tp + biz.aQute.bndlib - org.eclipse.osgi + org.argeo.tp org.eclipse.osgi provided - org.springframework.osgi + org.argeo.tp org.springframework.osgi.core - org.springframework.osgi + org.argeo.tp org.springframework.osgi.extender - org.springframework.osgi + org.argeo.tp org.springframework.osgi.web - net.sourceforge.cglib - com.springsource.net.sf.cglib + org.argeo.tp + net.sf.cglib - org.objectweb.asm - com.springsource.org.objectweb.asm.attrs + org.argeo.tp + org.objectweb.asm.attrs - org.apache.xalan - com.springsource.org.apache.xalan + org.argeo.tp + org.apache.xalan - + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml index 0c0419f1a..8b86f0876 100644 --- a/runtime/org.argeo.slc.support.simple/pom.xml +++ b/runtime/org.argeo.slc.support.simple/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -44,58 +44,58 @@ - com.jcraft.jsch - com.springsource.com.jcraft.jsch + org.argeo.tp + com.jcraft.jsch - com.opensymphony.quartz - com.springsource.org.quartz + org.argeo.tp + org.quartz - org.springframework + org.argeo.tp org.springframework.context.support - javax.mail - com.springsource.javax.mail + org.argeo.tp + javax.mail - com.svnkit - com.springsource.org.tmatesoft.svn + org.argeo.tp + org.tmatesoft.svn - org.apache.commons - com.springsource.org.apache.commons.vfs + org.argeo.tp + org.apache.commons.vfs - org.argeo.dep.osgi - org.argeo.dep.osgi.commons.exec + org.argeo.tp + org.apache.commons.exec - org.argeo.dep.osgi + org.argeo.tp org.redline_rpm - org.springframework + org.argeo.tp org.springframework.transaction - org.junit - com.springsource.junit + org.argeo.tp + junit test diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml index f22f5cc7e..3cf2631c9 100644 --- a/runtime/org.argeo.slc.support.ws.client/pom.xml +++ b/runtime/org.argeo.slc.support.ws.client/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -46,23 +46,12 @@ - org.springframework.ws + org.argeo.tp org.springframework.ws - - - javax.xml.soap - com.springsource.javax.xml.soap - - - com.sun.xml - - com.springsource.com.sun.xml.messaging.saaj - - - javax.activation - com.springsource.javax.activation + org.argeo.tp + com.sun.xml.messaging.saaj \ No newline at end of file diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml index fe927302c..c6a3ebd90 100644 --- a/runtime/org.argeo.slc.unit/pom.xml +++ b/runtime/org.argeo.slc.unit/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.slc @@ -45,30 +45,30 @@ 1.1.1-SNAPSHOT - org.junit - com.springsource.junit + org.argeo.tp + junit - org.dbunit - com.springsource.org.dbunit + org.argeo.tp + org.dbunit true - org.apache.commons - com.springsource.org.apache.commons.collections + org.argeo.tp + org.apache.commons.collections true - org.hibernate - com.springsource.org.hibernate + org.argeo.tp + org.hibernate true - org.springframework + org.argeo.tp org.springframework.orm true @@ -80,7 +80,7 @@ ${version.argeo-commons} - org.springframework.osgi + org.argeo.tp org.springframework.osgi.core @@ -93,24 +93,24 @@ - org.springframework.ws + org.argeo.tp org.springframework.oxm true - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging - org.apache.log4j - com.springsource.org.apache.log4j + org.argeo.tp + org.apache.log4j - org.slf4j - com.springsource.slf4j.log4j + org.argeo.tp + slf4j.log4j - + \ No newline at end of file