svn commit: r592884 - in /commons/proper/configuration/trunk: pom.xml project.xml

[joehni]

Author: joehni
Date: Wed Nov  7 12:40:32 2007
New Revision: 592884

URL: http://svn.apache.org/viewvc?rev=592884&view=rev
Log:
Optimize, update and armonize dependencies for M2 + M1.

Modified:
    commons/proper/configuration/trunk/pom.xml
    commons/proper/configuration/trunk/project.xml

Modified: commons/proper/configuration/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=592884&r1=592883&r2=592884&view=diff
==============================================================================
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Wed Nov  7 12:40:32 2007
@@ -145,16 +145,19 @@
             <role>Java Developer</role>
           </roles>
         </developer>
-    </developers>
 
-    <contributors>
-        <contributor>
+        <developer>
           <name>J&#xF6;rg Schaible</name>
+          <id>joehni</id>
           <email>[EMAIL PROTECTED]</email>
-          <organization>Elsag-Solutions AG</organization>
           <timezone>+1</timezone>
-        </contributor>
+          <roles>
+            <role>Java Developer</role>
+          </roles>
+        </developer>
+    </developers>
 
+    <contributors>
         <contributor>
           <name>Konstantin Shaposhnikov</name>
           <email>[EMAIL PROTECTED]</email>
@@ -202,8 +205,18 @@
 
     <dependency>
       <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-      <version>1.0.4</version>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+      <exclusions>
+        <exclusion>
+            <groupId>logkit</groupId>
+            <artifactId>logkit</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>avalon-framework</groupId>
+            <artifactId>avalon-framework</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -230,6 +243,16 @@
       <artifactId>commons-jxpath</artifactId>
       <version>1.2</version>
       <optional>true</optional>
+      <exclusions>
+        <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xerces</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>ant</groupId>
+            <artifactId>ant-optional</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -259,7 +282,7 @@
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
-      <optional>true</optional>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -311,6 +334,12 @@
       <artifactId>junit-addons</artifactId>
       <version>1.4</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -332,6 +361,13 @@
       <artifactId>mail</artifactId>
       <version>1.4</version>
       <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.8</version>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 

Modified: commons/proper/configuration/trunk/project.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/project.xml?rev=592884&r1=592883&r2=592884&view=diff
==============================================================================
--- commons/proper/configuration/trunk/project.xml (original)
+++ commons/proper/configuration/trunk/project.xml Wed Nov  7 12:40:32 2007
@@ -184,16 +184,16 @@
       <timezone>+1</timezone>
     </developer>
 
-  </developers>
-
-  <contributors>
-
-    <contributor>
+    <developer>
       <name>J&#xF6;rg Schaible</name>
+      <id>oheger</id>
       <email>[EMAIL PROTECTED]</email>
-      <organization>Elsag-Solutions AG</organization>
       <timezone>+1</timezone>
-    </contributor>
+    </developer>
+
+  </developers>
+
+  <contributors>
 
     <contributor>
       <name>Konstantin Shaposhnikov</name>
@@ -248,8 +248,8 @@
 
     <dependency>
       <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-      <version>1.0.4</version>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -295,8 +295,8 @@
 
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.2.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.3.0</version>
       <url>http://xml.apache.org/xerces2-j/</url>
       <properties>
         <scope>provided</scope>
@@ -327,8 +327,8 @@
     </dependency>
 
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
       <version>2.4</version>
       <properties>
         <optional>true</optional>
@@ -423,6 +423,15 @@
       <groupId>mockobjects</groupId>
       <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
       <version>0.09</version>
+      <properties>
+        <scope>test</scope>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.8</version>
       <properties>
         <scope>test</scope>
       </properties>