You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/19 22:59:11 UTC
svn commit: r423604 - /incubator/activemq/trunk/pom.xml
Author: chirino
Date: Wed Jul 19 13:59:11 2006
New Revision: 423604
URL: http://svn.apache.org/viewvc?rev=423604&view=rev
Log:
changed to a released plugin dependency
Modified:
incubator/activemq/trunk/pom.xml
Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/pom.xml?rev=423604&r1=423603&r2=423604&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Wed Jul 19 13:59:11 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>1</version>
+ <version>2</version>
</parent>
<groupId>incubator-activemq</groupId>
@@ -66,12 +66,6 @@
<id>central</id>
<url>http://ibiblio.org/maven2/</url>
</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>
<!-- For geronimo-1.2-SNAPSHOT jars
<repository>
<id>apache-maven1-snapshot</id>
@@ -90,12 +84,6 @@
<pluginRepositories>
<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>
- <pluginRepository>
<id>apache-snapshots</id>
<name>Snapshot repository</name>
<url>http://people.apache.org/maven-snapshot-repository</url>
@@ -250,16 +238,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${org-apache-geronimo-specs-version}</version>
- <exclusions>
- <exclusion>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -616,12 +594,6 @@
</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>${axis-version}</version>
@@ -817,6 +789,16 @@
<artifactId>javacc-maven-plugin</artifactId>
<version>2.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.0.0rc0</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -868,8 +850,8 @@
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -892,10 +874,6 @@
<artifactId>taglist-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -951,7 +929,7 @@
<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.3-SNAPSHOT</org-apache-maven-surefire-plugin-version>
+ <org-apache-maven-surefire-plugin-version>2.2</org-apache-maven-surefire-plugin-version>
<p2psockets-version>1.1.2</p2psockets-version>
<regexp-version>1.3</regexp-version>
<rome-version>0.8</rome-version>