From f6fb6438054a38890e8dae995775d3fa6f2b618f Mon Sep 17 00:00:00 2001
From: Rupert Smith <rupertlssmith@apache.org>
Date: Fri, 30 Nov 2007 13:10:09 +0000
Subject: Merged revisions
 594992-595694,595697-596350,596352-596362,596364-598327 via svnmerge from
 https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r594992 | ritchiem | 2007-11-14 18:00:28 +0000 (Wed, 14 Nov 2007) | 1 line

  QPID-685 : Update to address dependency issues and update the NOTICE file.
........
  r595687 | rajith | 2007-11-16 14:54:01 +0000 (Fri, 16 Nov 2007) | 1 line

  moved the keys file to the parent folder
........
  r595688 | rajith | 2007-11-16 15:00:22 +0000 (Fri, 16 Nov 2007) | 1 line

  removed the KEYS file, as now it is in the parent folder
........
  r595740 | ritchiem | 2007-11-16 17:06:04 +0000 (Fri, 16 Nov 2007) | 1 line

  Fixed runtime dependency in the management console.
........
  r596342 | rajith | 2007-11-19 15:56:29 +0000 (Mon, 19 Nov 2007) | 1 line

  added eclipse license details to the NOTICE file
........
  r596650 | ritchiem | 2007-11-20 13:14:32 +0000 (Tue, 20 Nov 2007) | 1 line

  Added the full text of the additional licenses.
........
  r596655 | ritchiem | 2007-11-20 13:22:53 +0000 (Tue, 20 Nov 2007) | 2 lines

  Added the full text of the additional licenses.
  Moved ICU licence text from NOTICE to LICENSE
........
  r596657 | gsim | 2007-11-20 13:32:25 +0000 (Tue, 20 Nov 2007) | 3 lines

  Added boost license
........
  r596665 | ritchiem | 2007-11-20 13:49:34 +0000 (Tue, 20 Nov 2007) | 1 line

  Added source links for EPL and MPL libraries
........
  r598292 | rupertlssmith | 2007-11-26 14:45:15 +0000 (Mon, 26 Nov 2007) | 1 line

  Added incubator disclaimer.
........
  r598311 | rupertlssmith | 2007-11-26 15:40:54 +0000 (Mon, 26 Nov 2007) | 1 line

  Added AMQP licence information.
........
  r598327 | rajith | 2007-11-26 16:04:50 +0000 (Mon, 26 Nov 2007) | 1 line

  added disclaimers and AMP license to all languages
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599814 13f79535-47bb-0310-9956-ffa450edef68
---
 java/common/pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'java/common')

diff --git a/java/common/pom.xml b/java/common/pom.xml
index eea4580c8d..8b7a2c1f89 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -99,18 +99,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-
-
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-- 
cgit v1.2.1