Author: gregw
Date: Mon Jun 5 06:53:38 2006
New Revision: 411792
URL: http://svn.apache.org/viewvc?rev=411792&view=rev
Log:
cleaned up versions and dependencies to remove duplicates and to allow
settings.xml overrides
Modified:
incubator/activemq/trunk/activemq-web-console/pom.xml
incubator/activemq/trunk/pom.xml
Modified: incubator/activemq/trunk/activemq-web-console/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/pom.xml?rev=411792&r1=411791&r2=411792&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/pom.xml (original)
+++ incubator/activemq/trunk/activemq-web-console/pom.xml Mon Jun 5 06:53:38
2006
@@ -40,7 +40,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty6-plugin</artifactId>
- <version>6.0-SNAPSHOT</version>
<configuration>
<systemProperties>
Modified: incubator/activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/pom.xml?rev=411792&r1=411791&r2=411792&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Mon Jun 5 06:53:38 2006
@@ -82,6 +82,14 @@
<url>http://cvs.apache.org/repository</url>
<layout>legacy</layout>
</repository>
+
+ <repository>
+ <id>mortbay-repo</id>
+ <name>Mortbay Jetty Repo</name>
+ <!-- temporary solution until codehaus to ibiblio rsync working again -->
+ <url>http://www.mortbay.org/maven2/release</url>
+ </repository>
+
</repositories>
<pluginRepositories>
@@ -101,6 +109,14 @@
<name>maven-csharp</name>
<url>http://maven-csharp.javaforge.com/repo</url>
</pluginRepository>
+
+ <pluginRepository>
+ <id>mortbay-repo</id>
+ <name>Mortbay Jetty Repo</name>
+ <!-- temporary solution until codehaus to ibiblio rsync working again -->
+ <url>http://www.mortbay.org/maven2/release</url>
+ </pluginRepository>
+
</pluginRepositories>
@@ -245,19 +261,19 @@
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>2.1</version>
+ <version>${backport-util-concurrent-version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>${commons-logging-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.0</version>
+ <version>${org-apache-geronimo-specs-version}</version>
<exclusions>
<exclusion>
<groupId>mockobjects</groupId>
@@ -277,37 +293,37 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <version>${org-apache-geronimo-specs-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>${org-apache-geronimo-specs-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>${org-apache-geronimo-specs-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>1.0</version>
+ <version>${org-apache-geronimo-specs-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
- <version>1.0</version>
+ <version>${org-apache-geronimo-specs-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
- <version>1.0</version>
+ <version>${org-apache-geronimo-specs-version}</version>
</dependency>
@@ -318,7 +334,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>2.2</version>
+ <version>${org-apache-xbean-version}</version>
<optional>true</optional>
<!--
<exclusions>
@@ -355,7 +371,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.12</version>
+ <version>${log4j-version}</version>
<scope>runtime</scope>
</dependency>
@@ -364,23 +380,20 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
+ <version>${commons-beanutils-version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>2.1</version>
+ <version>${commons-collections-version}</version>
</dependency>
<!-- Optional Spring Support -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <!--
- <version>2.0-M5</version>
- -->
- <version>1.2.8</version>
+ <version>${org-springframework-version}</version>
<optional>true</optional>
</dependency>
@@ -388,7 +401,7 @@
<dependency>
<groupId>activecluster</groupId>
<artifactId>activecluster</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${activecluster-version}</version>
<optional>true</optional>
</dependency>
@@ -396,13 +409,13 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.1.0</version>
+ <version>${org-apache-derby-version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
- <version>10.1.1.0</version>
+ <version>${org-apache-derby-version}</version>
<optional>true</optional>
</dependency>
@@ -410,21 +423,21 @@
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
- <version>1.0-M3-dev</version>
+ <version>${axion-version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
- <version>1.0</version>
+ <version>${commons-primitives-version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3</version>
+ <version>${regexp-version}</version>
<optional>true</optional>
</dependency>
@@ -433,7 +446,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.7.2.2</version>
+ <version>${hsqldb-version}</version>
<optional>true</optional>
</dependency>
-->
@@ -441,14 +454,14 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2</version>
+ <version>${commons-dbcp-version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.2</version>
+ <version>${commons-pool-version}</version>
<optional>true</optional>
</dependency>
@@ -457,7 +470,7 @@
<dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
- <version>0.1.7</version>
+ <version>${howl-version}</version>
<optional>true</optional>
</dependency>
-->
@@ -531,141 +544,147 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
- <version>2.1.1</version>
+ <version>${mx4j-version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
- <version>2.1.1</version>
+ <version>${mx4j-version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
- <version>2.1.1</version>
+ <version>${mx4j-version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
- <version>2.1.1</version>
+ <version>${mx4j-version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-impl</artifactId>
- <version>2.1.1</version>
+ <version>${mx4j-version}</version>
</dependency>
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.1.2</version>
+ <version>${xstream-version}</version>
</dependency>
<dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
- <version>1.1.3.4d_b4_min</version>
+ <version>${xmlpull-version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
- <version>6.0.0beta16</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.0.0beta16</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.0.0beta16</version>
+ <version>${jetty-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty6-plugin</artifactId>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
- <version>1.2-RC1</version>
+ <version>${axis-version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0.1</version>
+ <version>${commons-httpclient-version}</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
- <version>1.0</version>
+ <version>${aopalliance-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
- <version>1.0.1</version>
+ <version>${jmock-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
- <version>1.0.1</version>
+ <version>${jmock-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
- <version>2.0</version>
+ <version>${cglib-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
- <version>0.1.0</version>
+ <version>${annogen-version}</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.2</version>
+ <version>${ant-version}</version>
</dependency>
<!-- ACTIVEMQ-WEB Specific Dependencies -->
<dependency>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
- <version>0.8</version>
+ <version>${rome-version}</version>
</dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.0</version>
+ <version>${jdom-version}</version>
</dependency>
<!-- ACTIVEMQ-JAAS Dependencies -->
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-core</artifactId>
- <version>0.9.2</version>
+ <version>${directory-version}</version>
</dependency>
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-shared</artifactId>
- <version>0.9.2</version>
+ <version>${directory-version}</version>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>apache-ldapber-provider</artifactId>
- <version>0.9.2</version>
+ <version>${directory-version}</version>
<exclusions>
<exclusion>
<groupId>commons-test</groupId>
@@ -676,17 +695,17 @@
<dependency>
<groupId>directory-shared</groupId>
<artifactId>ldap-common</artifactId>
- <version>0.9.2</version>
+ <version>${directory-version}</version>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-codec</artifactId>
- <version>0.3.2</version>
+ <version>${directory-asn1-version}</version>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-der</artifactId>
- <version>0.3.2</version>
+ <version>${directory-asn1-version}</version>
<exclusions>
<exclusion>
<groupId>commons-test</groupId>
@@ -697,47 +716,47 @@
<dependency>
<groupId>directory-shared</groupId>
<artifactId>kerberos-common</artifactId>
- <version>0.5</version>
+ <version>${directory-kerboros-version}</version>
</dependency>
<dependency>
<groupId>directory-network</groupId>
<artifactId>mina</artifactId>
- <version>0.7.3</version>
+ <version>${directory-mina-version}</version>
</dependency>
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>kerberos-protocol</artifactId>
- <version>0.5</version>
+ <version>${directory-kerboros-version}</version>
</dependency>
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>ldap-protocol</artifactId>
- <version>0.9.2</version>
+ <version>${directory-version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>1.0</version>
+ <version>${geronimo-version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>1.0</version>
+ <version>${geronimo-version}</version>
</dependency>
<dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
- <version>0.1.8</version>
+ <version>${howl-version}</version>
</dependency>
<dependency>
<groupId>p2psockets</groupId>
<artifactId>p2psockets-core</artifactId>
- <version>1.1.2</version>
+ <version>${p2psockets-version}</version>
</dependency>
<dependency>
<groupId>jxta</groupId>
<artifactId>jxta</artifactId>
- <version>2.0</version>
+ <version>${jxta-version}</version>
</dependency>
</dependencies>
@@ -773,7 +792,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.1.3</version>
+ <version>${org-apache-maven-surefire-plugin-version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -805,7 +824,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.1.3</version>
+ <version>${org-apache-maven-surefire-plugin-version}</version>
<configuration>
<forkMode>once</forkMode>
</configuration>
@@ -828,4 +847,49 @@
</plugins>
</reporting>
+ <properties>
+ <activecluster-version>1.1-SNAPSHOT</activecluster-version>
+ <activesoap-version>1.3</activesoap-version>
+ <annogen-version>0.1.0</annogen-version>
+ <ant-version>1.6.2</ant-version>
+ <aopalliance-version>1.0</aopalliance-version>
+ <axion-version>1.0-M3-dev</axion-version>
+ <axis-version>1.2-RC1</axis-version>
+ <backport-util-concurrent-version>2.1</backport-util-concurrent-version>
+ <cglib-version>2.0</cglib-version>
+ <commons-beanutils-version>1.6.1</commons-beanutils-version>
+ <commons-collections-version>2.1</commons-collections-version>
+ <commons-dbcp-version>1.2</commons-dbcp-version>
+ <commons-httpclient-version>2.0.1</commons-httpclient-version>
+ <commons-logging-version>1.0.4</commons-logging-version>
+ <commons-pool-version>1.2</commons-pool-version>
+ <commons-primitives-version>1.0</commons-primitives-version>
+ <directory-asn1-version>0.3.2</directory-asn1-version>
+ <directory-kerboros-version>0.5</directory-kerboros-version>
+ <directory-mina-version>0.7.3</directory-mina-version>
+ <directory-version>0.9.2</directory-version>
+ <geronimo-version>1.0</geronimo-version>
+ <howl-version>0.1.8</howl-version>
+ <hsqldb-version>1.7.2.2</hsqldb-version>
+ <jdom-version>1.0</jdom-version>
+ <jetty-version>6.0.0beta17</jetty-version>
+ <jmock-version>1.0.1</jmock-version>
+ <junit-version>3.8.1</junit-version>
+ <jxta-version>2.0</jxta-version>
+ <log4j-version>1.2.12</log4j-version>
+ <mx4j-version>2.1.1</mx4j-version>
+ <org-apache-derby-version>10.1.1.0</org-apache-derby-version>
+ <org-apache-geronimo-specs-version>1.0</org-apache-geronimo-specs-version>
+
<org-apache-maven-surefire-plugin-version>2.1.3</org-apache-maven-surefire-plugin-version>
+ <org-apache-xbean-version>2.2</org-apache-xbean-version>
+ <org-springframework-version>1.2.8</org-springframework-version>
+ <p2psockets-version>1.1.2</p2psockets-version>
+ <regexp-version>1.3</regexp-version>
+ <rome-version>0.8</rome-version>
+ <stax-version>1.1.1-dev</stax-version>
+ <xalan-version>2.6.0</xalan-version>
+ <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
+ <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
+ <xstream-version>1.1.2</xstream-version>
+ </properties>
</project>
