Author: chirino
Date: Fri Feb 17 22:03:51 2006
New Revision: 378696
URL: http://svn.apache.org/viewcvs?rev=378696&view=rev
Log:
Applyed http://jira.activemq.org/jira/browse/AMQ-582
Thanks Carlos! This should help our m2 build a ton.
Modified:
incubator/activemq/trunk/activecluster/pom.xml
incubator/activemq/trunk/activeio/activeio-aio/BUILD.txt
incubator/activemq/trunk/activeio/activeio-aio/pom.xml
incubator/activemq/trunk/activeio/activeio-core/pom.xml
incubator/activemq/trunk/activeio/activeio-jxta/pom.xml
incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml
incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml
incubator/activemq/trunk/activeio/pom.xml
incubator/activemq/trunk/activemq-console/pom.xml
incubator/activemq/trunk/activemq-core/pom.xml
incubator/activemq/trunk/activemq-jaas/pom.xml
incubator/activemq/trunk/activemq-optional/pom.xml
incubator/activemq/trunk/activemq-ra/pom.xml
incubator/activemq/trunk/activemq-systest/pom.xml
incubator/activemq/trunk/activemq-web/pom.xml
incubator/activemq/trunk/assembly/pom.xml
incubator/activemq/trunk/jmeter/pom.xml
incubator/activemq/trunk/pom.xml
incubator/activemq/trunk/sandbox/activemq-gbean-management/pom.xml
incubator/activemq/trunk/sandbox/activemq-gbean/pom.xml
Modified: incubator/activemq/trunk/activecluster/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activecluster/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activecluster/pom.xml (original)
+++ incubator/activemq/trunk/activecluster/pom.xml Fri Feb 17 22:03:51 2006
@@ -18,78 +18,25 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.activecluster</groupId>
+ <parent>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.activemq.activecluster</groupId>
<artifactId>activecluster</artifactId>
- <packaging>jar</packaging>
<version>1.3-SNAPSHOT</version>
- <name>ActiveCluster Project</name>
- <url>http://maven.apache.org</url>
-
- <ciManagement>
- <system>continuum</system>
- <url>http://ci.gbuild.org/continuum</url>
- <notifiers>
- <notifier>
- <configuration>
- <address>[email protected]</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/activemq/trunk/activecluster</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/activemq/trunk/activecluster</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/incubator/activemq/trunk/activecluster/</url>
- </scm>
+ <name>ActiveCluster</name>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0.1B-rc4</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- <version>1.1-rc4</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-management</artifactId>
- <version>1.0-rc4</version>
- </dependency>
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>4.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>2.0_01_pd</version>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.1.0</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: incubator/activemq/trunk/activeio/activeio-aio/BUILD.txt
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-aio/BUILD.txt?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-aio/BUILD.txt (original)
+++ incubator/activemq/trunk/activeio/activeio-aio/BUILD.txt Fri Feb 17
22:03:51 2006
@@ -8,7 +8,7 @@
https://www7b.software.ibm.com/dl/AW-0H8/AW-0H8-p
unpack the zip and install the file like this;
-mvn install:install-file -Dfile=./ibmaio.jar -DartifactId=ibmaio
-DgroupId=ibmaio -Dversion=1.0 -Dpackaging=jar
+mvn install:install-file -Dfile=./ibmaio.jar -DartifactId=ibmaio
-DgroupId=com.ibm.io -Dversion=20040616 -Dpackaging=jar
You should now be able to build this module with maven using:
Modified: incubator/activemq/trunk/activeio/activeio-aio/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-aio/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-aio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-aio/pom.xml Fri Feb 17 22:03:51
2006
@@ -1,70 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-project</artifactId>
- <relativePath>../pom.xml</relativePath>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activeio-aio</artifactId>
- <packaging>jar</packaging>
- <name>ActiveIO :: AIO</name>
- <url>http://activeio.org</url>
-
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-core</artifactId>
- <version>${version}</version>
- <type>test-jar</type>
- </dependency>
-
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>ibmaio</groupId>
- <artifactId>ibmaio</artifactId>
- <version>1.0</version>
- </dependency>
-
- </dependencies>
-
-</project>
+?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>activeio-aio</artifactId>
+ <name>ActiveIO :: AIO</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ibm.io</groupId>
+ <artifactId>ibmaio</artifactId>
+ <version>20040616</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Modified: incubator/activemq/trunk/activeio/activeio-core/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-core/pom.xml Fri Feb 17 22:03:51
2006
@@ -18,9 +18,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-project</artifactId>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -42,37 +41,22 @@
<version>0.1.8</version>
</dependency>
- <!-- Unit Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
- <!-- Used by journal performance testing tools -->
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.4-rc4</version>
- </dependency>
-
- <!-- Used in testing -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>2.1</version>
+ <scope>test</scope>
</dependency>
<!-- Used by xnet GBean code -->
@@ -93,20 +77,5 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: incubator/activemq/trunk/activeio/activeio-jxta/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-jxta/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-jxta/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-jxta/pom.xml Fri Feb 17 22:03:51
2006
@@ -18,9 +18,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-project</artifactId>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -31,14 +30,14 @@
<dependencies>
<!-- Required Dependencies -->
<dependency>
- <groupId>org.apache.activeio</groupId>
+ <groupId>org.apache.activemq.activeio</groupId>
<artifactId>activeio-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activeio</groupId>
+ <groupId>org.apache.activemq.activeio</groupId>
<artifactId>activeio-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
@@ -56,20 +55,6 @@
<groupId>jxta</groupId>
<artifactId>jxta</artifactId>
<version>2.0</version>
- </dependency>
-
- <!-- Unit Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
</dependency>
</dependencies>
Modified: incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml Fri Feb 17
22:03:51 2006
@@ -18,9 +18,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-project</artifactId>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -31,15 +30,16 @@
<dependencies>
<!-- Required Dependencies -->
<dependency>
- <groupId>org.apache.activeio</groupId>
+ <groupId>org.apache.activemq.activeio</groupId>
<artifactId>activeio-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activeio</groupId>
+ <groupId>org.apache.activemq.activeio</groupId>
<artifactId>activeio-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
@@ -53,23 +53,9 @@
<version>5.1.2</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.4-rc4</version>
- </dependency>
-
- <!-- Unit Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
</dependency>
</dependencies>
Modified: incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml
(original)
+++ incubator/activemq/trunk/activeio/activeio-oneport-openorb/pom.xml Fri Feb
17 22:03:51 2006
@@ -18,9 +18,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-project</artifactId>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -32,15 +31,16 @@
<!-- Required Dependencies -->
<dependency>
- <groupId>org.apache.activeio</groupId>
+ <groupId>org.apache.activemq.activeio</groupId>
<artifactId>activeio-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-core</artifactId>
- <version>${version}</version>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -78,20 +78,6 @@
<groupId>avalon</groupId>
<artifactId>avalon-logkit</artifactId>
<version>1.2.2</version>
- </dependency>
-
- <!-- Unit Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
</dependency>
</dependencies>
Modified: incubator/activemq/trunk/activeio/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/pom.xml Fri Feb 17 22:03:51 2006
@@ -1,128 +1,28 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.activeio</groupId>
- <artifactId>activeio-project</artifactId>
+ <parent>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio</artifactId>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ActiveIO Project</name>
-
- <ciManagement>
- <system>continuum</system>
- <url>http://ci.gbuild.org/continuum</url>
- <notifiers>
- <notifier>
- <configuration>
- <address>[email protected]</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <mailingLists>
- <mailingList>
- <name>Development List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
- </mailingList>
- </mailingLists>
-
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/incubator/activemq/trunk/activeio</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/activemq/trunk/activeio</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/incubator/activemq/trunk/activeio</url>
- </scm>
-
- <repositories>
- <repository>
- <id>openejb</id>
- <name>OpenEJB OpenORB Repository</name>
- <url>http://www.openejb.org/maven</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
+ <name>ActiveIO</name>
<modules>
<module>activeio-core</module>
-<!--
- Disable this optional module from the default build since this contains a
dependency that cannot
- be automatically downloaded from a maven repository
<module>activeio-aio</module>
<module>activeio-oneport-jetty</module>
+<!--
<module>activeio-oneport-openorb</module>
- <module>activeio-jxta</module>
-->
-
+ <module>activeio-jxta</module>
</modules>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>4.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>2.0_01_pd</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.1.1</version>
- <configuration>
- <!-- <forkMode>pertest</forkMode> -->
- <forkMode>none</forkMode>
- <includes>
- <include implementation="java.lang.String">**/*Test.*</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <outputDirectory>bin</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: incubator/activemq/trunk/activemq-console/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-console/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-console/pom.xml (original)
+++ incubator/activemq/trunk/activemq-console/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,93 +14,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-console</artifactId>
- <packaging>jar</packaging>
<name>ActiveMQ :: Console</name>
<description>ActiveMQ Management Console</description>
<dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
-
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-management</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+ <version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
-
- <dependency>
- <groupId>axion</groupId>
- <artifactId>axion</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- </dependency>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- </dependency>
<dependency>
<groupId>mx4j</groupId>
@@ -171,4 +107,4 @@
</plugins>
</build>
-</model>
+</project>
Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,45 +14,39 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-core</artifactId>
- <packaging>jar</packaging>
<name>ActiveMQ :: Core</name>
<description>The ActiveMQ Message Broker and Client
implementations</description>
<dependencies>
-
+
+ <!--
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <groupId>org.apache.activemq.activeio</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>3.0-SNAPSHOT</version>
</dependency>
-
+ -->
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
+ <version>2.1</version>
</dependency>
-
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -75,16 +69,6 @@
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
-
- <dependency>
- <groupId>activecluster</groupId>
- <artifactId>activecluster</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
@@ -148,7 +132,7 @@
<exclusion>
<groupId>xmlbeans</groupId>
<artifactId>xmlbeans-jsr173-api</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -216,24 +200,9 @@
<exclude>**/*ItStillMarshallsTheSameTest.*</exclude>
</excludes>
- <includes>
- <include>**/*Test.*</include>
- </includes>
</configuration>
</plugin>
- <!-- generate the attached tests jar -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -245,7 +214,7 @@
<mkdir dir="${basedir}/target/generated"/>
<taskdef name="xsdGenerate"
classname="org.apache.xbean.spring.generator.MappingGeneratorTask"/>
<xsdGenerate
- destFile="${basedir}/target/activemq-${version}.xsd"
+
destFile="${basedir}/target/activemq-${project.version}.xsd"
namespace="http://activemq.org/config/1.0";
srcdir="${basedir}/src/main/java"
metaInfDir="${basedir}/target/generated/"/>
@@ -253,8 +222,8 @@
<copy todir="${basedir}/target/classes">
<fileset dir="${basedir}/target/generated"/>
</copy>
- <copy file="${basedir}/target/activemq-${version}.xsd"
todir="${basedir}/../xdocs"/>
- <copy file="${basedir}/target/activemq-${version}.xsd.html"
todir="${basedir}/../xdocs"/>
+ <copy file="${basedir}/target/activemq-${project.version}.xsd"
todir="${basedir}/../xdocs"/>
+ <copy
file="${basedir}/target/activemq-${project.version}.xsd.html"
todir="${basedir}/../xdocs"/>
</tasks>
</configuration>
@@ -267,7 +236,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2</version>
</dependency>
</dependencies>
</plugin>
@@ -293,4 +262,4 @@
</plugins>
</build>
-</model>
+</project>
Modified: incubator/activemq/trunk/activemq-jaas/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/pom.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,18 +14,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-jaas</artifactId>
- <packaging>jar</packaging>
<name>ActiveMQ :: JAAS</name>
<description>A collection of generic JAAS Login Modules</description>
@@ -59,38 +59,6 @@
<dependencies>
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
-
- <dependency>
- <groupId>axion</groupId>
- <artifactId>axion</artifactId>
- </dependency>
-
-
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-core</artifactId>
@@ -121,6 +89,12 @@
<groupId>directory-asn1</groupId>
<artifactId>asn1-ber</artifactId>
<version>0.3.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-test</groupId>
+ <artifactId>commons-test</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
@@ -139,11 +113,25 @@
<artifactId>mina</artifactId>
<version>0.7.3</version>
</dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-kerberos</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ -->
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>kerberos-protocol</artifactId>
<version>0.5</version>
</dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-ldap</artifactId>
+ <version>1.0-RC1-SNAPSHOT</version>
+ </dependency>
+ -->
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>ldap-protocol</artifactId>
@@ -152,4 +140,4 @@
</dependencies>
-</model>
+</project>
Modified: incubator/activemq/trunk/activemq-optional/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/pom.xml (original)
+++ incubator/activemq/trunk/activemq-optional/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,14 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-optional</artifactId>
@@ -33,12 +32,12 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
</dependency>
@@ -47,40 +46,6 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -129,15 +94,10 @@
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
</dependencies>
-</model>
+</project>
Modified: incubator/activemq/trunk/activemq-ra/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/pom.xml (original)
+++ incubator/activemq/trunk/activemq-ra/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,14 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-ra</artifactId>
@@ -30,65 +29,23 @@
<description>A JCA Resource Adapter used to integrate ActiveMQ with
transactional enterprise containers</description>
<dependencies>
-
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-connector</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
-
<dependency>
<groupId>activemq</groupId>
<artifactId>jmdns</artifactId>
</dependency>
-
</dependencies>
-</model>
+</project>
Modified: incubator/activemq/trunk/activemq-systest/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-systest/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-systest/pom.xml (original)
+++ incubator/activemq/trunk/activemq-systest/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,14 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-systest</artifactId>
@@ -30,7 +29,7 @@
<description>System Testing Framework for ActiveMQ</description>
<dependencies>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -40,36 +39,10 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>
@@ -96,7 +69,7 @@
<groupId>activemq</groupId>
<artifactId>jmdns</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -113,4 +86,4 @@
</dependencies>
-</model>
+</project>
Modified: incubator/activemq/trunk/activemq-web/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/pom.xml (original)
+++ incubator/activemq/trunk/activemq-web/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,14 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-web</artifactId>
@@ -30,39 +29,15 @@
<description>Web Connector for REST API and Streamlets support</description>
<dependencies>
-
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- </dependency>
- <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jsp</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
@@ -71,7 +46,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
-
<dependency>
<groupId>jetty</groupId>
<artifactId>servlet-api</artifactId>
@@ -80,7 +54,6 @@
<groupId>jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
-
</dependencies>
-</model>
+</project>
Modified: incubator/activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,17 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-assembly</artifactId>
<packaging>pom</packaging>
<name>ActiveMQ :: Assembly</name>
<description>Puts together the ActiveMQ distribution</description>
@@ -34,40 +33,40 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<type>rar</type>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
<type>war</type>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -75,14 +74,6 @@
<artifactId>backport-util-concurrent</artifactId>
</dependency>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -176,4 +167,4 @@
</plugins>
</build>
-</model>
+</project>
Modified: incubator/activemq/trunk/jmeter/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/pom.xml (original)
+++ incubator/activemq/trunk/jmeter/pom.xml Fri Feb 17 22:03:51 2006
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -399,4 +399,4 @@
</dependencies>
-</model>
+</project>
Modified: incubator/activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Fri Feb 17 22:03:51 2006
@@ -1,10 +1,13 @@
-<model>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-project</artifactId>
+ <artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ActiveMQ Project</name>
+ <name>ActiveMQ</name>
<ciManagement>
<system>continuum</system>
@@ -27,49 +30,34 @@
</mailingList>
</mailingLists>
- <repositories>
+ <repositories>
<repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://cvs.apache.org/maven-snapshot-repository</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
- <id>codehaus</id>
- <name>Codehaus Repository</name>
- <url>http://dist.codehaus.org</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>codehaus</id>
- <name>Ibiblio Repository</name>
- <url>http://www.ibiblio.org/maven</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache</id>
- <name>Apche Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>snapshots</id>
+ <id>codehaus.snapshots</id>
<name>Maven Central Plugins Development Repository</name>
<url>http://snapshots.maven.codehaus.org/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</pluginRepository>
</pluginRepositories>
-
+
<build>
<plugins>
<plugin>
@@ -96,6 +84,17 @@
<forkMode>none</forkMode>
</configuration>
</plugin>
+ <!-- generate the attached tests jar -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -141,12 +140,6 @@
<!-- Required dependencies -->
<!-- =============================== -->
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>2.0_01_pd</version>
@@ -202,7 +195,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2</version>
</dependency>
<!-- Used to configure the activemq logs -->
@@ -273,7 +266,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.7.2.2}</version>
+ <version>1.7.2.2</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
@@ -483,20 +476,39 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
-</model>
+ <distributionManagement>
+ <!--
+ <repository>
+ <id>apache.releases</id>
+ <name>Apache Repository</name>
+
<url>scpexe://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>
+ </repository>
+ -->
+ <snapshotRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Repository</name>
+
<url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Modified: incubator/activemq/trunk/sandbox/activemq-gbean-management/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/sandbox/activemq-gbean-management/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/sandbox/activemq-gbean-management/pom.xml
(original)
+++ incubator/activemq/trunk/sandbox/activemq-gbean-management/pom.xml Fri Feb
17 22:03:51 2006
@@ -1,14 +1,13 @@
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>activemq</groupId>
- <artifactId>activemq</artifactId>
+ <groupId>org.apache.activemq.sandbox</groupId>
+ <artifactId>activemq-sandbox</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-gbean-management</artifactId>
- <packaging>jar</packaging>
<name>ActiveMQ :: GBean Interfaces</name>
<build>
@@ -22,7 +21,6 @@
<artifactId>geronimo-management</artifactId>
</dependency>
-
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
@@ -53,11 +51,6 @@
<artifactId>log4j</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
</dependencies>
-</model>
+</project>
Modified: incubator/activemq/trunk/sandbox/activemq-gbean/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/sandbox/activemq-gbean/pom.xml?rev=378696&r1=378695&r2=378696&view=diff
==============================================================================
--- incubator/activemq/trunk/sandbox/activemq-gbean/pom.xml (original)
+++ incubator/activemq/trunk/sandbox/activemq-gbean/pom.xml Fri Feb 17 22:03:51
2006
@@ -1,14 +1,13 @@
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>activemq</groupId>
- <artifactId>activemq</artifactId>
+ <groupId>org.apache.activemq.sandbox</groupId>
+ <artifactId>activemq-sandbox</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-gbean</artifactId>
- <packaging>jar</packaging>
<name>ActiveMQ :: GBeans</name>
<build>
@@ -21,18 +20,20 @@
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq-gbean-management</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
- <dependency> <!-- Used for unit tests -->
+ <dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-core-test</artifactId>
- <version>${version}</version>
+ <artifactId>activemq-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -61,43 +62,7 @@
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
-
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-management</artifactId>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
</dependencies>
-</model>
+</project>
