--- pom.xml.sav	2011-03-14 16:54:35.000000000 -0400
+++ pom.xml	2011-07-15 13:51:08.537725611 -0400
@@ -82,28 +82,11 @@
   <modules>
     <module>httpclient</module>
     <module>httpmime</module>
-    <module>httpclient-cache</module>
-    <module>httpclient-osgi</module>
   </modules>
 
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-notice-plugin</artifactId>
-        <groupId>org.apache.httpcomponents</groupId>
-        <executions>
-          <execution>
-            <id>attach-notice-license</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <projectTitle>Apache HttpComponents</projectTitle>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -190,49 +173,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.docbook</groupId>
-            <artifactId>docbook-xml</artifactId>
-            <version>4.4</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <includes>index.xml</includes>
-          <chunkedOutput>true</chunkedOutput>
-          <xincludeSupported>true</xincludeSupported>
-          <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-          <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
-          <htmlStylesheet>css/hc-tutorial.css</htmlStylesheet>
-          <entities>
-            <entity>
-              <name>version</name>
-              <value>${project.version}</value>
-            </entity>
-          </entities>
-          <postProcess>
-            <copy todir="target/site/tutorial">
-              <fileset dir="target/docbkx">
-                <include name="**/*.html" />
-                <include name="**/*.pdf" />
-              </fileset>
-            </copy>
-            <copy todir="target/site/tutorial/html">
-              <fileset dir="src/docbkx/resources">
-                <include name="**/*.css" />
-                <include name="**/*.png" />
-                <include name="**/*.gif" />
-                <include name="**/*.jpg" />
-              </fileset>
-            </copy>
-            <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" failonerror="false" />
-          </postProcess>
-        </configuration>
-      </plugin>
-        <plugin>
           <artifactId>maven-resources-plugin</artifactId>
           <executions>
             <execution>
@@ -253,14 +193,7 @@
             </execution>
           </executions>
         </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <configuration>
-          <comparisonVersion>${comparisonVersion}</comparisonVersion>
-        </configuration>
-      </plugin>
-    </plugins>
+      </plugins>
   </build>
 
   <reporting>
@@ -281,15 +214,7 @@
          </reportSets>
       </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <configuration>
-          <comparisonVersion>${comparisonVersion}</comparisonVersion>
-        </configuration>
-      </plugin>
-
-    </plugins>
+   </plugins>
   </reporting>
 
 </project>