diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-01-22 15:57:20 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-01-22 15:57:20 +0000 |
| commit | 4510276f7cdc7d574b29563b57d8576de9f63e88 (patch) | |
| tree | e7d225251fadf24962640dcb2a8974c611eeeb33 /qpid/java/perftests | |
| parent | da684a3b32132ecfce4cd865f45ab50e0d48a7f7 (diff) | |
| download | qpid-python-4510276f7cdc7d574b29563b57d8576de9f63e88.tar.gz | |
QPID-5048: Logging dependency and configuration tidy up for maven build
Patch Supplied by Andrew MacBean <andymacbean@gmail.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1560392 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/perftests')
| -rw-r--r-- | qpid/java/perftests/pom.xml | 29 | ||||
| -rw-r--r-- | qpid/java/perftests/visualisation-jfc/pom.xml | 2 |
2 files changed, 13 insertions, 18 deletions
diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml index 566f92828e..2a1dbd4350 100644 --- a/qpid/java/perftests/pom.xml +++ b/qpid/java/perftests/pom.xml @@ -42,34 +42,26 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j-version}</version> + <scope>compile</scope> </dependency> - <!-- logging deps --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> + <version>${slf4j-version}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.6.4</version> - <scope>compile</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>compile</scope> - </dependency> - <!-- other deps --> <dependency> <groupId>commons-lang</groupId> @@ -262,6 +254,9 @@ <excludes> <exclude>**/org/apache/qpid/systest/**/*.java</exclude> </excludes> + <systemPropertyVariables> + <log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file> + </systemPropertyVariables> </configuration> <executions> <execution> diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml index da84df1d2e..d677491a03 100644 --- a/qpid/java/perftests/visualisation-jfc/pom.xml +++ b/qpid/java/perftests/visualisation-jfc/pom.xml @@ -37,7 +37,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> + <version>${slf4j-version}</version> <scope>compile</scope> </dependency> |