Index: pom.xml
===================================================================
--- pom.xml	(revision 65)
+++ pom.xml	(revision )
@@ -136,11 +136,16 @@
       <version>129</version>
     </dependency>
     <!-- NEED TO DEAL WITH THESE JARS -->
-    
+
     <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1.1</version>
+    </dependency>    
+    <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4</version>
+      <version>1.4.1</version>
     </dependency>
 
     <dependency>
@@ -148,7 +153,6 @@
       <artifactId>avalon-framework-api</artifactId>
       <version>4.3</version>
     </dependency>
-
     <dependency>
       <groupId>avalon-framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
@@ -170,10 +174,28 @@
           <groupId>xml-apis</groupId>
           <artifactId>xmlParserAPIs</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>        
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>        
       </exclusions>
     </dependency>
 
     <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+
+    <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
       <version>1.2.1</version>
@@ -182,6 +204,10 @@
           <groupId>xerces</groupId>
           <artifactId>xercesImpl</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>        
       </exclusions>
     </dependency>
 
@@ -202,6 +228,24 @@
       <groupId>cornerstone-connection</groupId>
       <artifactId>cornerstone-connection-impl</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>        
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>        
+      </exclusions>      
     </dependency>
 
     <dependency>
@@ -216,6 +260,10 @@
       <version>2.1</version>
       <exclusions>
         <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>        
+        <exclusion>
           <groupId>xml-apis</groupId>
           <artifactId>xml-apis</artifactId>
         </exclusion>
@@ -254,6 +302,10 @@
           <artifactId>excalibur-fortress-container-api</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>excalibur-instrument</groupId>
+          <artifactId>excalibur-instrument-api</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>excalibur-logger</groupId>
           <artifactId>excalibur-logger</artifactId>
         </exclusion>
@@ -265,6 +317,14 @@
           <groupId>excalibur-fortress</groupId>
           <artifactId>excalibur-fortress-meta</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>junitperf</groupId>
+          <artifactId>junitperf</artifactId>
+        </exclusion>        
+        <exclusion>
+          <groupId>qdox</groupId>
+          <artifactId>qdox</artifactId>
+        </exclusion>        
       </exclusions>
     </dependency>
 
@@ -277,6 +337,14 @@
           <groupId>d-haven-managed-pool</groupId>
           <artifactId>d-haven-managed-pool</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>        
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>        
       </exclusions>
     </dependency>
 
@@ -284,12 +352,32 @@
       <groupId>cornerstone-scheduler</groupId>
       <artifactId>cornerstone-scheduler-api</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>        
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>        
+      </exclusions>      
     </dependency>
 
     <dependency>
       <groupId>cornerstone-scheduler</groupId>
       <artifactId>cornerstone-scheduler-impl</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>        
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>        
+      </exclusions>            
     </dependency>
 
     <dependency>
@@ -302,9 +390,25 @@
       <groupId>cornerstone-store</groupId>
       <artifactId>cornerstone-store-impl</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>        
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>        
+      </exclusions>                  
     </dependency>
 
     <dependency>
+      <groupId>cornerstone-threads</groupId>
+      <artifactId>cornerstone-threads-impl</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
       <groupId>dnsjava</groupId>
       <artifactId>dnsjava</artifactId>
       <version>2.0.6</version>
@@ -333,6 +437,10 @@
       <version>2.1</version>
       <exclusions>
         <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>geronimo-spec</groupId>
           <artifactId>geronimo-spec-javamail</artifactId>
         </exclusion>
@@ -415,8 +523,9 @@
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.5</version>        
         <configuration>
-          <targetjdk>1.4</targetjdk>
+          <targetjdk>1.6</targetjdk>
           <rulesets>
             <ruleset>/rulesets/basic.xml</ruleset>
             <ruleset>/rulesets/controversial.xml</ruleset>
@@ -443,6 +552,9 @@
     <!-- Default configuration for compiler source and target JVM -->
     <maven.compile.source>1.6</maven.compile.source>
     <maven.compile.target>1.6</maven.compile.target>
+    <!-- Define encoding for filtering -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
 
 </project>