From: Mathieu Baudier Date: Fri, 18 Sep 2009 08:21:40 +0000 (+0000) Subject: Use centralized parent and versions X-Git-Tag: argeo-commons-2.1.30~1791 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=be1362b418157673529c9575e12731f5a2c457e0 Use centralized parent and versions git-svn-id: https://svn.argeo.org/commons/trunk@2962 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/basic/dep/org.argeo.basic.dep.log4j/pom.xml b/basic/dep/org.argeo.basic.dep.log4j/pom.xml index 1cedd6eb1..748fb5218 100644 --- a/basic/dep/org.argeo.basic.dep.log4j/pom.xml +++ b/basic/dep/org.argeo.basic.dep.log4j/pom.xml @@ -23,5 +23,9 @@ org.slf4j com.springsource.slf4j.log4j + + org.slf4j + com.springsource.slf4j.api + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d3edb663a..e3e0df7a5 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,14 @@ 4.0.0 + + org.argeo + parent + 1.0.0 + org.argeo.commons - 0.1.1-SNAPSHOT argeo-commons + 0.1.1-SNAPSHOT Argeo Commons pom @@ -20,10 +25,6 @@ scm:svn:https://www.argeo.org/svn/commons/trunk https://www.argeo.org/svn/commons/trunk - - Bugzilla - https://www.argeo.org/bugzilla/ - Apache 2 @@ -49,10 +50,6 @@ limitations under the License. - - Argeo - http://www.argeo.org - mbaudier @@ -184,69 +181,15 @@ limitations under the License. - org.argeo.slc - argeo-slc - ${version.slc} + org.argeo.dep + versions + 1.0.0 pom import - - central - http://repo1.maven.org/maven2 - - true - daily - warn - - - false - never - fail - - - - com.springsource.repository.bundles.release - - SpringSource Enterprise Bundle Repository - SpringSource - Bundle Releases - - - http://repository.springsource.com/maven/bundles/release - - - true - daily - fail - - - false - never - fail - - - - com.springsource.repository.bundles.external - - SpringSource Enterprise Bundle Repository - External - Bundle Releases - - - http://repository.springsource.com/maven/bundles/external - - - true - daily - fail - - - false - never - fail - - argeo http://www.argeo.org/maven/argeo @@ -261,63 +204,5 @@ limitations under the License. fail - - argeo-snapshots - http://www.argeo.org/maven/argeo-snapshots - - false - never - fail - - - true - always - fail - - - - - argeo - http://www.argeo.org/maven/argeo - - true - daily - fail - - - false - never - fail - - - - argeo-snapshots - http://www.argeo.org/maven/argeo-snapshots - - false - never - fail - - - true - always - fail - - - - - - false - argeo-restricted - Argeo FOSS Repository - file:///var/argeo/maven2/argeo - - - true - argeo-snapshots-restricted - Argeo FOSS Snapshots Repository - file:///var/argeo/maven2/argeo-snapshots - - \ No newline at end of file diff --git a/security/demo/pom.xml b/security/demo/pom.xml index bc19cb063..8c9dfe992 100644 --- a/security/demo/pom.xml +++ b/security/demo/pom.xml @@ -20,13 +20,6 @@ true org.argeo.security.demo - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - ${version.maven-argeo-osgi} - target/exec org.argeo.osgi.boot @@ -71,173 +64,35 @@ 0.1.1-SNAPSHOT - - - - org.eclipse.osgi - org.eclipse.osgi - org.argeo.commons.osgi org.argeo.osgi.boot 0.1.1-SNAPSHOT - + - org.slf4j - com.springsource.slf4j.org.apache.commons.logging - - - org.apache.log4j - com.springsource.org.apache.log4j + org.argeo.commons.server + org.argeo.server.dep.tomcat + 0.1.1-SNAPSHOT + pom - org.slf4j - com.springsource.slf4j.log4j + org.argeo.commons.server + org.argeo.server.dep.ads + 0.1.1-SNAPSHOT + pom - - org.springframework.osgi - org.springframework.osgi.web.extender - org.springframework.osgi org.springframework.osgi.extender org.springframework.osgi - org.springframework.osgi.web - - - - - javax.servlet - com.springsource.javax.servlet - - - javax.annotation - com.springsource.javax.annotation - - - javax.persistence - com.springsource.javax.persistence - - - javax.activation - com.springsource.javax.activation - - - org.apache.geronimo.specs - com.springsource.javax.management.j2ee - - - javax.ejb - com.springsource.javax.ejb - - - javax.xml.rpc - com.springsource.javax.xml.rpc - - - javax.xml.soap - com.springsource.javax.xml.soap - - - javax.transaction - com.springsource.javax.transaction - - - javax.xml.stream - com.springsource.javax.xml.stream - - - javax.servlet - com.springsource.javax.servlet.jsp - - - javax.servlet - com.springsource.javax.servlet.jsp.jstl - - - javax.el - com.springsource.javax.el - - - javax.xml.ws - com.springsource.javax.xml.ws - - - javax.xml.bind - com.springsource.javax.xml.bind - - - - - - - - org.argeo.dep.osgi - org.argeo.dep.osgi.catalina.start - - - org.apache.catalina - com.springsource.org.apache.catalina - - - org.apache.jasper - com.springsource.org.apache.jasper - - - org.apache.el - com.springsource.org.apache.el - - - - - - - org.apache.directory - com.springsource.org.apache.directory.server.core - 1.0.2 - - - org.argeo.dep.osgi - org.argeo.dep.osgi.directory.shared.asn.codec - 0.9.5.5.0001 - - - org.argeo.dep.osgi - org.argeo.dep.osgi.mina.filter.ssl - 1.0.2.0001 - - - org.apache.directory - com.springsource.org.apache.directory.server.jndi - 1.0.2 - - - net.sourceforge.jdbm - com.springsource.jdbm - 1.0.0 - - - - org.apache.commons - com.springsource.org.apache.commons.lang - 2.4.0 + org.springframework.osgi.web.extender \ No newline at end of file diff --git a/server/demo/pom.xml b/server/demo/pom.xml index 8c80ce2e4..ea5038b48 100644 --- a/server/demo/pom.xml +++ b/server/demo/pom.xml @@ -16,15 +16,10 @@ org.argeo.maven.plugins maven-argeo-osgi-plugin + ${version.maven-argeo-osgi} true org.argeo.server.demo - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - target/exec/server org.argeo.osgi.boot @@ -44,31 +39,19 @@ - - - - org.eclipse.osgi - org.eclipse.osgi - org.argeo.commons.osgi org.argeo.osgi.boot 0.1.1-SNAPSHOT - - - org.slf4j - com.springsource.slf4j.org.apache.commons.logging - - - org.apache.log4j - com.springsource.org.apache.log4j - + - org.slf4j - com.springsource.slf4j.log4j + org.argeo.commons.server + org.argeo.server.dep.tomcat + 0.1.1-SNAPSHOT + pom @@ -76,105 +59,6 @@ org.springframework.osgi org.springframework.osgi.web.extender - - org.springframework.osgi - org.springframework.osgi.extender - - - org.springframework.osgi - org.springframework.osgi.web - - - - - javax.servlet - com.springsource.javax.servlet - - - javax.annotation - com.springsource.javax.annotation - - - javax.persistence - com.springsource.javax.persistence - - - javax.activation - com.springsource.javax.activation - - - org.apache.geronimo.specs - com.springsource.javax.management.j2ee - - - javax.ejb - com.springsource.javax.ejb - - - javax.xml.rpc - com.springsource.javax.xml.rpc - - - javax.xml.soap - com.springsource.javax.xml.soap - - - javax.transaction - com.springsource.javax.transaction - - - javax.xml.stream - com.springsource.javax.xml.stream - - - javax.servlet - com.springsource.javax.servlet.jsp - - - javax.servlet - com.springsource.javax.servlet.jsp.jstl - - - javax.el - com.springsource.javax.el - - - javax.xml.ws - com.springsource.javax.xml.ws - - - javax.xml.bind - com.springsource.javax.xml.bind - - - - - - - - org.argeo.dep.osgi - org.argeo.dep.osgi.catalina.start - - - org.apache.catalina - com.springsource.org.apache.catalina - - - org.apache.jasper - com.springsource.org.apache.jasper - - - org.apache.el - com.springsource.org.apache.el - - \ No newline at end of file diff --git a/server/dep/org.argeo.server.dep.ads/pom.xml b/server/dep/org.argeo.server.dep.ads/pom.xml new file mode 100644 index 000000000..69ddfa7bf --- /dev/null +++ b/server/dep/org.argeo.server.dep.ads/pom.xml @@ -0,0 +1,58 @@ + + 4.0.0 + + org.argeo.commons.server + 0.1.1-SNAPSHOT + dep + .. + + org.argeo.server.dep.ads + pom + Apache Directory Server + + + + org.argeo.commons.basic + org.argeo.basic.dep.log4j + 0.1.1-SNAPSHOT + pom + + + + + org.apache.directory + com.springsource.org.apache.directory.server.core + 1.0.2 + + + org.argeo.dep.osgi + org.argeo.dep.osgi.directory.shared.asn.codec + 0.9.5.5.0001 + + + org.argeo.dep.osgi + org.argeo.dep.osgi.mina.filter.ssl + 1.0.2.0001 + + + org.apache.directory + com.springsource.org.apache.directory.server.jndi + 1.0.2 + + + net.sourceforge.jdbm + com.springsource.jdbm + 1.0.0 + + + + org.apache.commons + com.springsource.org.apache.commons.lang + 2.4.0 + + + \ No newline at end of file diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml index 14fc2bfab..261d241c2 100644 --- a/server/dep/org.argeo.server.dep.tomcat/pom.xml +++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml @@ -16,6 +16,7 @@ org.argeo.commons.basic org.argeo.basic.dep.log4j 0.1.1-SNAPSHOT + pom diff --git a/server/dep/pom.xml b/server/dep/pom.xml index b97eb1938..31d38c9a4 100644 --- a/server/dep/pom.xml +++ b/server/dep/pom.xml @@ -14,5 +14,6 @@ pom org.argeo.server.dep.tomcat + org.argeo.server.dep.ads \ No newline at end of file