diff options
| -rw-r--r-- | qpid/tools/src/java/pom.xml | 38 | ||||
| -rw-r--r-- | qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml | 3 | ||||
| -rw-r--r-- | qpid/tools/src/java/qpid-qmf2-test/pom.xml | 11 | ||||
| -rw-r--r-- | qpid/tools/src/java/qpid-qmf2-tools/pom.xml | 12 | ||||
| -rw-r--r-- | qpid/tools/src/java/qpid-qmf2/pom.xml | 6 |
5 files changed, 15 insertions, 55 deletions
diff --git a/qpid/tools/src/java/pom.xml b/qpid/tools/src/java/pom.xml index f7172abb68..6941e00486 100644 --- a/qpid/tools/src/java/pom.xml +++ b/qpid/tools/src/java/pom.xml @@ -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> diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml index fb6bb70fc0..28b7804afb 100644 --- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml +++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml @@ -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> diff --git a/qpid/tools/src/java/qpid-qmf2-test/pom.xml b/qpid/tools/src/java/qpid-qmf2-test/pom.xml index 9edce2f221..b649bc910a 100644 --- a/qpid/tools/src/java/qpid-qmf2-test/pom.xml +++ b/qpid/tools/src/java/qpid-qmf2-test/pom.xml @@ -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> diff --git a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml index e5d70795d0..96d26093bb 100644 --- a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml +++ b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml @@ -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> diff --git a/qpid/tools/src/java/qpid-qmf2/pom.xml b/qpid/tools/src/java/qpid-qmf2/pom.xml index 83f9962ecc..0626f94333 100644 --- a/qpid/tools/src/java/qpid-qmf2/pom.xml +++ b/qpid/tools/src/java/qpid-qmf2/pom.xml @@ -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> |