From 3ee4d451aadbf45c63f40a4cae3c15781aee5412 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 22 Jun 2012 14:27:34 +0000 Subject: [PATCH] Migration to distribution v1.3.0 completed git-svn-id: https://svn.argeo.org/commons/trunk@5344 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml | 2 +- pom.xml | 19 ++++- .../dep/org.argeo.security.dep.node/pom.xml | 78 ++++++++----------- .../org.argeo.security.equinox/pom.xml | 12 +-- .../org.argeo.security.ui.admin/pom.xml | 10 +-- .../plugins/org.argeo.security.ui.rap/pom.xml | 8 +- .../plugins/org.argeo.security.ui.rcp/pom.xml | 8 +- .../plugins/org.argeo.security.ui/pom.xml | 10 +-- security/plugins/pom.xml | 9 +-- .../org.argeo.security.activemq/pom.xml | 28 +++---- .../org.argeo.security.jackrabbit/pom.xml | 16 ++-- .../runtime/org.argeo.security.ldap/pom.xml | 16 ++-- .../runtime/org.argeo.security.mvc/pom.xml | 12 +-- .../dep/org.argeo.server.dep.activemq/pom.xml | 16 ++-- .../dep/org.argeo.server.dep.tomcat/pom.xml | 16 ++-- .../org.argeo.ext.jackrabbit.sybase/pom.xml | 2 +- server/modules/org.argeo.ext.jdbm/pom.xml | 2 +- .../modules/org.argeo.server.catalina/pom.xml | 2 +- server/runtime/org.argeo.server.core/pom.xml | 5 +- .../runtime/org.argeo.server.jcr.mvc/pom.xml | 4 + 20 files changed, 143 insertions(+), 132 deletions(-) diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml index 4f4c150dd..700bd8a5c 100644 --- a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml +++ b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml @@ -70,7 +70,7 @@ org.argeo.tp.rap org.eclipse.rwt.widgets.upload - 1.0.0.argeo002 + 1.0.0.argeo003 diff --git a/pom.xml b/pom.xml index a47ab6d6a..82b6b7641 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.argeo.commons argeo-commons @@ -410,6 +411,22 @@ limitations under the License. + + + argeo + http://maven.argeo.org/argeo + + true + daily + fail + + + false + never + fail + + + argeo-commons-site diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml index 9800b6ae9..f965af3e8 100644 --- a/security/dep/org.argeo.security.dep.node/pom.xml +++ b/security/dep/org.argeo.security.dep.node/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -48,61 +48,45 @@ - org.apache.xmlcommons - com.springsource.org.apache.xmlcommons + org.argeo.tp + org.apache.xmlcommons - org.apache.xalan - com.springsource.org.apache.xalan + org.argeo.tp + org.apache.xalan - javax.xml.soap - com.springsource.javax.xml.soap + org.argeo.tp + javax.annotation - javax.activation - com.springsource.javax.activation - - - javax.annotation - com.springsource.javax.annotation - - - javax.xml.ws - com.springsource.javax.xml.ws - - - javax.xml.bind - com.springsource.javax.xml.bind - - - javax.mail - com.springsource.javax.mail + org.argeo.tp + javax.mail - 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.dep.osgi.commons.cli + org.argeo.tp + org.apache.commons.cli - org.apache.commons - com.springsource.org.apache.commons.dbcp + org.argeo.tp + org.apache.commons.dbcp - org.springframework + org.argeo.tp org.springframework.context.support @@ -114,13 +98,13 @@ - org.springframework + org.argeo.tp org.springframework.jms - org.springframework.osgi + org.argeo.tp org.springframework.osgi.extender @@ -166,8 +150,8 @@ - com.opensymphony.quartz - com.springsource.org.quartz + org.argeo.tp + org.quartz @@ -198,11 +182,11 @@ - org.springframework.osgi + org.argeo.tp org.springframework.osgi.web.extender - org.springframework.osgi + org.argeo.tp org.springframework.osgi.web @@ -267,16 +251,16 @@ - com.h2database - com.springsource.org.h2 + org.argeo.tp + org.h2 - com.mysql.jdbc - com.springsource.com.mysql.jdbc + org.argeo.tp + com.mysql.jdbc - org.postgresql - com.springsource.org.postgresql.jdbc3 + org.argeo.tp + org.postgresql.jdbc3 @@ -438,4 +422,4 @@ - + \ No newline at end of file diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/security/plugins/org.argeo.security.equinox/pom.xml index 22f73c2f0..d8756a531 100644 --- a/security/plugins/org.argeo.security.equinox/pom.xml +++ b/security/plugins/org.argeo.security.equinox/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -41,12 +41,14 @@ - org.eclipse.osgi + org.argeo.tp org.eclipse.osgi - org.eclipse.equinox + org.argeo.tp org.eclipse.equinox.security + + 1.0.200 @@ -63,8 +65,8 @@ - org.springframework.security + org.argeo.tp org.springframework.security.core - + \ No newline at end of file diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml index 1487b21e8..444caf577 100644 --- a/security/plugins/org.argeo.security.ui.admin/pom.xml +++ b/security/plugins/org.argeo.security.ui.admin/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -85,15 +85,15 @@ - org.springframework.security + org.argeo.tp org.springframework.security.core - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging - + \ No newline at end of file diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml index 76fbabaf4..fe01b8207 100644 --- a/security/plugins/org.argeo.security.ui.rap/pom.xml +++ b/security/plugins/org.argeo.security.ui.rap/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -47,8 +47,8 @@ - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging @@ -75,4 +75,4 @@ 1.1.1-SNAPSHOT - + \ No newline at end of file diff --git a/security/plugins/org.argeo.security.ui.rcp/pom.xml b/security/plugins/org.argeo.security.ui.rcp/pom.xml index 68678dd73..d001143b4 100644 --- a/security/plugins/org.argeo.security.ui.rcp/pom.xml +++ b/security/plugins/org.argeo.security.ui.rcp/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -47,8 +47,8 @@ - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging @@ -75,4 +75,4 @@ 1.1.1-SNAPSHOT - + \ No newline at end of file diff --git a/security/plugins/org.argeo.security.ui/pom.xml b/security/plugins/org.argeo.security.ui/pom.xml index f275c5543..26fecab17 100644 --- a/security/plugins/org.argeo.security.ui/pom.xml +++ b/security/plugins/org.argeo.security.ui/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -77,15 +77,15 @@ - org.springframework.security + org.argeo.tp org.springframework.security.core - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging - + \ No newline at end of file diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml index 5633b3060..da7addc08 100644 --- a/security/plugins/pom.xml +++ b/security/plugins/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons @@ -84,10 +84,5 @@ 1.1.1-SNAPSHOT test - - javax.xml.stream - com.springsource.javax.xml.stream - test - - + \ No newline at end of file diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml index b360d333c..0a0a2c64b 100644 --- a/security/runtime/org.argeo.security.activemq/pom.xml +++ b/security/runtime/org.argeo.security.activemq/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -50,39 +50,41 @@ - org.springframework + org.argeo.tp org.springframework.transaction - org.springframework.security + org.argeo.tp org.springframework.security.core - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging - org.argeo.dep.osgi - org.argeo.dep.osgi.activemq + org.argeo.tp + org.apache.activemq + + 5.3.0.0001 - javax.jms - com.springsource.javax.jms + org.argeo.tp + javax.jms - org.springframework + org.argeo.tp org.springframework.jms - org.junit - com.springsource.junit + org.argeo.tp + junit test - + \ No newline at end of file diff --git a/security/runtime/org.argeo.security.jackrabbit/pom.xml b/security/runtime/org.argeo.security.jackrabbit/pom.xml index 989cf10a5..e632d7d09 100644 --- a/security/runtime/org.argeo.security.jackrabbit/pom.xml +++ b/security/runtime/org.argeo.security.jackrabbit/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -28,7 +28,7 @@ - org.argeo.dep.osgi.jackrabbit + org.apache.jackrabbit org.argeo.security.jackrabbit.* *,org.springframework.core @@ -43,16 +43,16 @@ 1.1.1-SNAPSHOT - org.argeo.dep.osgi - org.argeo.dep.osgi.jcr + org.argeo.tp + javax.jcr - org.argeo.dep.osgi - org.argeo.dep.osgi.jackrabbit + org.argeo.tp + org.apache.jackrabbit - org.springframework.security + org.argeo.tp org.springframework.security.core - + \ No newline at end of file diff --git a/security/runtime/org.argeo.security.ldap/pom.xml b/security/runtime/org.argeo.security.ldap/pom.xml index f4e28051b..c9ff9fed9 100644 --- a/security/runtime/org.argeo.security.ldap/pom.xml +++ b/security/runtime/org.argeo.security.ldap/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -56,21 +56,21 @@ - org.argeo.dep.osgi - org.argeo.dep.osgi.jcr + org.argeo.tp + javax.jcr - org.argeo.dep.osgi - org.argeo.dep.osgi.springframework.ldap + org.argeo.tp + org.springframework.ldap - org.slf4j - com.springsource.slf4j.org.apache.commons.logging + org.argeo.tp + slf4j.org.apache.commons.logging - + \ No newline at end of file diff --git a/security/runtime/org.argeo.security.mvc/pom.xml b/security/runtime/org.argeo.security.mvc/pom.xml index c07303a73..d0358b826 100644 --- a/security/runtime/org.argeo.security.mvc/pom.xml +++ b/security/runtime/org.argeo.security.mvc/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.argeo.commons.security @@ -54,19 +54,19 @@ - org.springframework + org.argeo.tp org.springframework.web.servlet - org.springframework + org.argeo.tp org.springframework.aop - javax.servlet - com.springsource.javax.servlet + org.argeo.tp + javax.servlet - + \ No newline at end of file diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml index 7e3dae827..18f483d22 100644 --- a/server/dep/org.argeo.server.dep.activemq/pom.xml +++ b/server/dep/org.argeo.server.dep.activemq/pom.xml @@ -26,6 +26,8 @@ org.argeo.tp org.apache.activemq + + 5.3.0.0001 org.argeo.tp @@ -55,13 +57,13 @@ - - org.argeo.commons.server - org.argeo.server.dep.javax - 1.1.1-SNAPSHOT - pom - test - + + + + + + + org.argeo.tp javax.servlet diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml index dd911d6b3..1e933aa05 100644 --- a/server/dep/org.argeo.server.dep.tomcat/pom.xml +++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml @@ -93,17 +93,19 @@ - - org.argeo.commons.server - org.argeo.server.dep.javax - 1.1.1-SNAPSHOT - pom - test - org.argeo.tp org.apache.xmlcommons test + + + + org.argeo.commons.osgi + org.argeo.osgi.boot + 1.1.1-SNAPSHOT + test + + \ No newline at end of file diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml index 8cff6962c..4326096f0 100644 --- a/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml +++ b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml @@ -16,7 +16,7 @@ maven-bundle-plugin - org.argeo.dep.osgi.jackrabbit + org.apache.jackrabbit diff --git a/server/modules/org.argeo.ext.jdbm/pom.xml b/server/modules/org.argeo.ext.jdbm/pom.xml index 782113a06..2d6136614 100644 --- a/server/modules/org.argeo.ext.jdbm/pom.xml +++ b/server/modules/org.argeo.ext.jdbm/pom.xml @@ -16,7 +16,7 @@ maven-bundle-plugin - com.springsource.jdbm + jdbm org.apache.directory.server.core.partition.impl.btree.jdbm;resolution:=optional, org.apache.directory.server.core.schema;resolution:=optional, diff --git a/server/modules/org.argeo.server.catalina/pom.xml b/server/modules/org.argeo.server.catalina/pom.xml index 5ee55b233..2096395f8 100644 --- a/server/modules/org.argeo.server.catalina/pom.xml +++ b/server/modules/org.argeo.server.catalina/pom.xml @@ -15,7 +15,7 @@ maven-bundle-plugin - com.springsource.org.apache.catalina + org.apache.catalina *, diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml index 340af14d0..e751fe35d 100644 --- a/server/runtime/org.argeo.server.core/pom.xml +++ b/server/runtime/org.argeo.server.core/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.argeo.commons.server @@ -31,6 +33,7 @@ org.argeo.server.* + javax.xml.transform.*;version="0.0.0",* diff --git a/server/runtime/org.argeo.server.jcr.mvc/pom.xml b/server/runtime/org.argeo.server.jcr.mvc/pom.xml index 07368fc63..f8e7865d8 100644 --- a/server/runtime/org.argeo.server.jcr.mvc/pom.xml +++ b/server/runtime/org.argeo.server.jcr.mvc/pom.xml @@ -33,6 +33,10 @@ org.springframework.beans.factory, + javax.xml.transform.*;version="0.0.0", + javax.xml.parsers.*;version="0.0.0", + org.w3c.dom.*;version="0.0.0", + org.xml.sax.*;version="0.0.0", * -- 2.30.2