diff -ur logback-0.9.18.orig/logback-access/pom.xml logback-0.9.18/logback-access/pom.xml
--- logback-0.9.18.orig/logback-access/pom.xml	2009-12-03 19:28:59.000000000 +0000
+++ logback-0.9.18/logback-access/pom.xml	2010-01-11 14:54:19.408869342 +0000
@@ -64,7 +64,7 @@
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api-2.5</artifactId>
+      <artifactId>jetty-util</artifactId>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -77,6 +77,13 @@
     </dependency>
 
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <scope>test</scope>
@@ -202,4 +209,4 @@
   </profiles>
 
 
-</project>
\ No newline at end of file
+</project>
diff -ur logback-0.9.18.orig/logback-classic/pom.xml logback-0.9.18/logback-classic/pom.xml
--- logback-0.9.18.orig/logback-classic/pom.xml	2009-12-03 19:28:59.000000000 +0000
+++ logback-0.9.18/logback-classic/pom.xml	2010-01-11 14:55:44.561970153 +0000
@@ -103,13 +103,6 @@
     </dependency>
     
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>integration</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
       <scope>compile</scope>
@@ -122,40 +115,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-
-    <dependency>
-      <groupId>com.icegreen</groupId>
-      <artifactId>greenmail</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.subethamail</groupId>
-      <artifactId>subethasmtp</artifactId>
-      <version>2.1.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>1.6</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.main</artifactId>
-      <version>2.0.2</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -194,44 +153,6 @@
 
       
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.2</version>
-        <dependencies>
-          <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-          </dependency>
-          <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant-junit</artifactId>
-            <version>1.6.5</version>    
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>ant-osgi-test</id>
-            <phase>package</phase>
-            <configuration>
-              <tasks>      
-                <property name="currentVersion" value="${version}" />
-                <property name="slf4j.version" value="${slf4j.version}"/>
-                <property name="test_classpath" refid="maven.test.classpath"/>
-                <property name="slf4jJAR"
-                          value="${settings.localRepository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar" />
-                <property name="basedir" value="${basedir}"/>
-                <ant antfile="${basedir}/osgi-build.xml"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-        </executions>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -326,4 +247,4 @@
 
   </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff -ur logback-0.9.18.orig/logback-core/pom.xml logback-0.9.18/logback-core/pom.xml
--- logback-0.9.18.orig/logback-core/pom.xml	2009-12-03 19:28:59.000000000 +0000
+++ logback-0.9.18/logback-core/pom.xml	2010-01-11 14:55:58.054842609 +0000
@@ -59,8 +59,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
+      <groupId>easymock2</groupId>
+      <artifactId>easymock2</artifactId>
       <version>2.4</version>
       <scope>test</scope>
     </dependency>
@@ -148,4 +148,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff -ur logback-0.9.18.orig/pom.xml logback-0.9.18/pom.xml
--- logback-0.9.18.orig/pom.xml	2010-01-11 14:52:42.285869208 +0000
+++ logback-0.9.18/pom.xml	2010-01-11 14:56:12.036825749 +0000
@@ -21,8 +21,6 @@
     <module>logback-core</module>
     <module>logback-classic</module>
     <module>logback-access</module>
-    <module>logback-site</module>
-    <module>logback-examples</module>
   </modules>
 
   <dependencies>
@@ -161,13 +159,6 @@
           <downloadJavadocs>true</downloadJavadocs>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <downloadSources>true</downloadSources>
-        </configuration>
-      </plugin>   			
 
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -341,4 +332,4 @@
    </profile>
  </profiles>
 
-</project>
\ No newline at end of file
+</project>