Author: robbie
Date: Tue Apr 22 15:46:53 2014
New Revision: 1589181
URL: http://svn.apache.org/r1589181
Log:
QPID-5610: update poms to account for recent qpid-parent changes
Modified:
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/pom.xml
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-test/pom.xml
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2/pom.xml
Modified:
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/pom.xml?rev=1589181&r1=1589180&r2=1589181&view=diff
==============================================================================
--- qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/pom.xml
(original)
+++ qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/pom.xml
Tue Apr 22 15:46:53 2014
@@ -30,44 +30,6 @@
<version>0.30-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <!-- TODO: move default to qpid-parent -->
- <java.source>1.6</java.source>
- <java.target>1.6</java.target>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-1-1-version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<modules>
<module>qpid-qmf2</module>
<module>qpid-qmf2-rest</module>
Modified:
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml?rev=1589181&r1=1589180&r2=1589181&view=diff
==============================================================================
---
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
(original)
+++
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
Tue Apr 22 15:46:53 2014
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <!-- version specified in parent pluginManagement -->
+ <version>${slf4j-version}</version>
</dependency>
</dependencies>
@@ -55,6 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <!--version specified in qpid-parent pluginManagement -->
<configuration>
<descriptors>
<descriptor>src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml</descriptor>
Modified:
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-test/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-test/pom.xml?rev=1589181&r1=1589180&r2=1589181&view=diff
==============================================================================
---
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-test/pom.xml
(original)
+++
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-test/pom.xml
Tue Apr 22 15:46:53 2014
@@ -54,23 +54,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <!-- version specified in parent pluginManagement -->
- <!-- scope specified in parent pluginManagement -->
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <!-- version specified in parent pluginManagement -->
- <!-- scope specified in parent pluginManagement -->
+ <version>${slf4j-version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <!-- version specified in parent pluginManagement -->
- <!-- scope specified in parent pluginManagement -->
+ <version>${log4j-version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Modified:
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-tools/pom.xml?rev=1589181&r1=1589180&r2=1589181&view=diff
==============================================================================
---
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
(original)
+++
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
Tue Apr 22 15:46:53 2014
@@ -45,23 +45,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <!-- version specified in parent pluginManagement -->
- <!-- scope specified in parent pluginManagement -->
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <!-- version specified in parent pluginManagement -->
- <!-- scope specified in parent pluginManagement -->
+ <version>${slf4j-version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <!-- version specified in parent pluginManagement -->
- <!-- scope specified in parent pluginManagement -->
+ <version>${log4j-version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
@@ -70,6 +69,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <!--version specified in qpid-parent pluginManagement -->
<configuration>
<descriptors>
<descriptor>src/main/assembly/qpid-qmf-tools-bin.xml</descriptor>
Modified:
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2/pom.xml?rev=1589181&r1=1589180&r2=1589181&view=diff
==============================================================================
---
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2/pom.xml
(original)
+++
qpid/branches/QPID-5610-maven3-build-qmf-tools/qpid/tools/src/java/qpid-qmf2/pom.xml
Tue Apr 22 15:46:53 2014
@@ -38,15 +38,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <!-- version specified in parent pluginManagement -->
- <!-- scope specified in parent pluginManagement -->
+ <version>${geronimo-jms-1-1-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <!-- version specified in parent pluginManagement -->
- <!-- scope specified in parent pluginManagement -->
+ <version>${slf4j-version}</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
