Attachment 681642 Details for Bug 900343 – httpcomponents-vman.patch

httpcomponents-vman.patch

httpcomponents-vman.patch (text/x-patch), 48.67 KB, created by David Walluck on 2012-05-01 19:25:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Walluck

Created: 2012-05-01 19:25:15 UTC

Size: 48.67 KB

patch

obsolete

>diff -up httpcomponents-5/httpclient/httpclient-benchmark/pom.xml.sav6 httpcomponents-5/httpclient/httpclient-benchmark/pom.xml
>diff -up httpcomponents-5/httpclient/httpclient-cache/pom.xml.sav6 httpcomponents-5/httpclient/httpclient-cache/pom.xml
>--- httpcomponents-5/httpclient/httpclient-cache/pom.xml.sav6	2012-05-01 15:06:48.665128706 -0400
>+++ httpcomponents-5/httpclient/httpclient-cache/pom.xml	2012-05-01 15:08:08.042100376 -0400
>@@ -23,34 +23,18 @@
>    individuals on behalf of the Apache Software Foundation.  For more
>    information on the Apache Software Foundation, please see
>    <http://www.apache.org />.
>- -->
>-
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <modelVersion>4.0.0</modelVersion>
>   <parent>
>     <groupId>org.apache.httpcomponents</groupId>
>     <artifactId>httpcomponents-client</artifactId>
>-    <version>4.1.3</version>
>+    <version>4.1.3-redhat-1</version>
>   </parent>
>   <artifactId>httpclient-cache</artifactId>
>   <name>HttpClient Cache</name>
>-  <description>
>-   HttpComponents HttpClient - Cache
>-  </description>
>+  <description>HttpComponents HttpClient - Cache</description>
>   <url>http://hc.apache.org/httpcomponents-client</url>
>   <packaging>jar</packaging>
>-
>-  <repositories>
>-    <repository>
>-      <id>spy</id>
>-      <name>Spy Repository</name>
>-      <layout>default</layout>
>-      <url>http://bleu.west.spy.net/~dustin/m2repo/</url>
>-      <snapshots>
>-        <enabled>false</enabled>
>-      </snapshots>
>-    </repository>
>-  </repositories>
>   <dependencies>
>     <dependency>
>       <groupId>org.apache.httpcomponents</groupId>
>@@ -61,25 +45,21 @@
>     <dependency>
>       <groupId>commons-logging</groupId>
>       <artifactId>commons-logging</artifactId>
>-      <version>${commons-logging.version}</version>
>       <scope>compile</scope>
>     </dependency>
>     <dependency>
>       <groupId>junit</groupId>
>       <artifactId>junit</artifactId>
>-      <version>${junit.version}</version>
>       <scope>test</scope>
>     </dependency>
>     <dependency>
>       <groupId>org.easymock</groupId>
>       <artifactId>easymock</artifactId>
>-      <version>${easymock.version}</version>
>       <scope>test</scope>
>     </dependency>
>     <dependency>
>       <groupId>org.easymock</groupId>
>       <artifactId>easymockclassextension</artifactId>
>-      <version>${easymock.version}</version>
>       <scope>test</scope>
>     </dependency>
>     
>-
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <modelVersion>4.0.0</modelVersion>
>   <parent>
>     <groupId>org.apache.httpcomponents</groupId>
>     <artifactId>httpcomponents-client</artifactId>
>-    <version>4.1.3</version>
>+    <version>4.1.3-redhat-1</version>
>   </parent>
>   <artifactId>httpclient-osgi</artifactId>
>   <name>HttpClient OSGi bundle</name>
>   <inceptionYear>1999</inceptionYear>
>-  <description>
>-   HttpComponents Client (OSGi bundle)
>-  </description>
>+  <description>HttpComponents Client (OSGi bundle)</description>
>   <url>http://hc.apache.org/httpcomponents-client</url>
>   <packaging>bundle</packaging>
> 
>@@ -51,7 +47,6 @@
>     <dependency>
>       <groupId>commons-codec</groupId>
>       <artifactId>commons-codec</artifactId>
>-      <version>${commons-codec.version}</version>
>       <scope>compile</scope>
>     </dependency>
>     <dependency>
>@@ -94,8 +89,7 @@
>           <instructions>
>             <Bundle-Name>Apache ${project.name}</Bundle-Name>
>             <Bundle-SymbolicName>${project.groupId}.httpclient</Bundle-SymbolicName>
>-            <_exportcontents>
>-            org.apache.http.auth.*;version=${project.version},
>+            <_exportcontents>org.apache.http.auth.*;version=${project.version},
>             org.apache.http.cookie.*;version=${project.version},
>             org.apache.http.conn.*;version=${project.version},
>             org.apache.http.client.*;version=${project.version},
>@@ -103,11 +97,9 @@
>             org.apache.http.impl.auth.*;version=${project.version},
>             org.apache.http.impl.cookie.*;version=${project.version},
>             org.apache.http.impl.conn.*;version=${project.version},
>-            org.apache.http.impl.client.*;version=${project.version}
>-            </_exportcontents>
>+            org.apache.http.impl.client.*;version=${project.version}</_exportcontents>
>             <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
>-            <Import-Package>
>-            javax.crypto,
>+            <Import-Package>javax.crypto,
>             javax.crypto.spec,
>             javax.net.ssl,javax.security.auth.x500,
>             org.ietf.jgss,
>@@ -123,8 +115,7 @@
>             org.apache.http.impl.entity;version=${httpcore.version},
>             org.apache.http.impl.io;version=${httpcore.version},
>             net.sf.ehcache.*;resolution:=optional,
>-            net.spy.memcached.*;resolution:=optional
>-            </Import-Package>
>+            net.spy.memcached.*;resolution:=optional</Import-Package>
>             
>             <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME</_removeheaders>
>           </instructions>
>diff -up httpcomponents-5/httpclient/httpclient/pom.xml.sav6 httpcomponents-5/httpclient/httpclient/pom.xml
>--- httpcomponents-5/httpclient/httpclient/pom.xml.sav6	2012-02-02 06:41:02.000000000 -0500
>+++ httpcomponents-5/httpclient/httpclient/pom.xml	2012-05-01 15:08:07.963107485 -0400
>@@ -23,20 +23,16 @@
>    individuals on behalf of the Apache Software Foundation.  For more
>    information on the Apache Software Foundation, please see
>    <http://www.apache.org />.
>- -->
>-
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <modelVersion>4.0.0</modelVersion>
>   <parent>
>     <groupId>org.apache.httpcomponents</groupId>
>     <artifactId>httpcomponents-client</artifactId>
>-    <version>4.1.3</version>
>+    <version>4.1.3-redhat-1</version>
>   </parent>
>   <artifactId>httpclient</artifactId>
>   <name>HttpClient</name>
>-  <description>
>-   HttpComponents Client (base module)
>-  </description>
>+  <description>HttpComponents Client (base module)</description>
>   <url>http://hc.apache.org/httpcomponents-client</url>
>   <packaging>jar</packaging>
> 
>@@ -44,31 +40,26 @@
>     <dependency>
>       <groupId>org.apache.httpcomponents</groupId>
>       <artifactId>httpcore</artifactId>
>-      <version>${httpcore.version}</version>
>       <scope>compile</scope>
>     </dependency>
>     <dependency>
>       <groupId>commons-logging</groupId>
>       <artifactId>commons-logging</artifactId>
>-      <version>${commons-logging.version}</version>
>       <scope>compile</scope>
>     </dependency>
>     <dependency>
>       <groupId>commons-codec</groupId>
>       <artifactId>commons-codec</artifactId>
>-      <version>${commons-codec.version}</version>
>       <scope>compile</scope>
>     </dependency>
>     <dependency>
>       <groupId>junit</groupId>
>       <artifactId>junit</artifactId>
>-      <version>${junit.version}</version>
>       <scope>test</scope>
>     </dependency>
>     <dependency>
>       <groupId>org.mockito</groupId>
>       <artifactId>mockito-core</artifactId>
>-      <version>${mockito.version}</version>
>       <scope>test</scope>
>     </dependency>
>   </dependencies>
>@@ -104,36 +95,34 @@
>         </configuration>
>       </plugin>
>       <plugin>
>-        <artifactId>maven-surefire-plugin</artifactId>
>-      </plugin>
>-      <plugin>
>         <artifactId>maven-jar-plugin</artifactId>
>         <executions>
>-          <execution>
>-            <goals>
>-              <goal>test-jar</goal>
>-            </goals>
>-          </execution>
>-        </executions>
>+                    <execution>
>+                        <goals>
>+                            <goal>test-jar</goal>
>+                        </goals>
>+                    </execution>
>+                </executions>
>       </plugin>
>       <plugin>
>-        <groupId>com.atlassian.maven.plugins</groupId>
>         <artifactId>maven-clover2-plugin</artifactId>
>-        <configuration>
>-          <flushPolicy>threaded</flushPolicy>
>-          <flushInterval>100</flushInterval>
>-          <targetPercentage>50%</targetPercentage>
>-        </configuration>
>+        <groupId>com.atlassian.maven.plugins</groupId>
>         <executions>
>           <execution>
>-            <id>site</id>
>-            <phase>pre-site</phase>
>             <goals>
>               <goal>instrument</goal>
>             </goals>
>+            <id>site</id>
>+            <phase>pre-site</phase>
>           </execution>
>         </executions>
>+        <configuration>
>+                    <flushPolicy>threaded</flushPolicy>
>+                    <flushInterval>100</flushInterval>
>+                    <targetPercentage>50%</targetPercentage>
>+                </configuration>
>       </plugin>
>+      
>     </plugins>
>   </build>
> 
>@@ -151,6 +140,7 @@
>             <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
>           </links>
>         </configuration>
>+        <version>2.8-redhat-1</version>
>         <reportSets>
>           <reportSet>
>             <reports>
>@@ -163,7 +153,7 @@
>       <plugin>
>         <groupId>com.atlassian.maven.plugins</groupId>
>         <artifactId>maven-clover2-plugin</artifactId>
>-        <version>${clover.version}</version>
>+        <version>3.0.2-redhat-1</version>
>         <configuration>
>           <jdk>1.5</jdk>
>         </configuration>
>@@ -171,10 +161,12 @@
> 
>       <plugin>
>         <artifactId>maven-jxr-plugin</artifactId>
>+        <version>2.2-redhat-1</version>
>       </plugin>
> 
>       <plugin>
>         <artifactId>maven-surefire-report-plugin</artifactId>
>+        <version>2.10-redhat-1</version>
>       </plugin>
> 
>     </plugins>
>diff -up httpcomponents-5/httpclient/httpmime/pom.xml.sav6 httpcomponents-5/httpclient/httpmime/pom.xml
>--- httpcomponents-5/httpclient/httpmime/pom.xml.sav6	2012-02-02 06:41:02.000000000 -0500
>+++ httpcomponents-5/httpclient/httpmime/pom.xml	2012-05-01 15:08:07.995100546 -0400
>@@ -23,20 +23,16 @@
>    individuals on behalf of the Apache Software Foundation.  For more
>    information on the Apache Software Foundation, please see
>    <http://www.apache.org />.
>- -->
>-
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <modelVersion>4.0.0</modelVersion>
>   <parent>
>     <groupId>org.apache.httpcomponents</groupId>
>     <artifactId>httpcomponents-client</artifactId>
>-    <version>4.1.3</version>
>+    <version>4.1.3-redhat-1</version>
>   </parent>
>   <artifactId>httpmime</artifactId>
>   <name>HttpMime</name>
>-  <description>
>-   HttpComponents HttpClient - MIME coded entities
>-  </description>
>+  <description>HttpComponents HttpClient - MIME coded entities</description>
>   <url>http://hc.apache.org/httpcomponents-client</url>
>   <packaging>jar</packaging>
> 
>@@ -44,19 +40,16 @@
>     <dependency>
>       <groupId>org.apache.httpcomponents</groupId>
>       <artifactId>httpcore</artifactId>
>-      <version>${httpcore.version}</version>
>       <scope>compile</scope>
>     </dependency>
>     <dependency>
>       <groupId>commons-logging</groupId>
>       <artifactId>commons-logging</artifactId>
>-      <version>${commons-logging.version}</version>
>       <scope>compile</scope>
>     </dependency>
>     <dependency>
>       <groupId>junit</groupId>
>       <artifactId>junit</artifactId>
>-      <version>${junit.version}</version>
>       <scope>test</scope>
>     </dependency>
>   </dependencies>
>@@ -92,26 +85,24 @@
>         </configuration>
>       </plugin>
>       <plugin>
>-        <artifactId>maven-surefire-plugin</artifactId>
>-      </plugin>
>-      <plugin>
>-        <groupId>com.atlassian.maven.plugins</groupId>
>         <artifactId>maven-clover2-plugin</artifactId>
>-        <configuration>
>-          <flushPolicy>threaded</flushPolicy>
>-          <flushInterval>100</flushInterval>
>-          <targetPercentage>50%</targetPercentage>
>-        </configuration>
>+        <groupId>com.atlassian.maven.plugins</groupId>
>         <executions>
>-          <execution>
>-            <id>site</id>
>-            <phase>pre-site</phase>
>-            <goals>
>-              <goal>instrument</goal>
>-            </goals>
>-          </execution>
>-        </executions>
>+                    <execution>
>+                        <id>site</id>
>+                        <phase>pre-site</phase>
>+                        <goals>
>+                            <goal>instrument</goal>
>+                        </goals>
>+                    </execution>
>+                </executions>
>+        <configuration>
>+                    <flushPolicy>threaded</flushPolicy>
>+                    <flushInterval>100</flushInterval>
>+                    <targetPercentage>50%</targetPercentage>
>+                </configuration>
>       </plugin>
>+      
>     </plugins>
>   </build>
> 
>@@ -129,6 +120,7 @@
>             <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
>           </links>
>         </configuration>
>+        <version>2.8-redhat-1</version>
>         <reportSets>
>           <reportSet>
>             <reports>
>@@ -141,7 +133,7 @@
>       <plugin>
>         <groupId>com.atlassian.maven.plugins</groupId>
>         <artifactId>maven-clover2-plugin</artifactId>
>-        <version>${clover.version}</version>
>+        <version>3.0.2-redhat-1</version>
>         <configuration>
>           <jdk>1.5</jdk>
>         </configuration>
>@@ -149,10 +141,12 @@
> 
>       <plugin>
>         <artifactId>maven-jxr-plugin</artifactId>
>+        <version>2.2-redhat-1</version>
>       </plugin>
> 
>       <plugin>
>         <artifactId>maven-surefire-report-plugin</artifactId>
>+        <version>2.10-redhat-1</version>
>       </plugin>
> 
>     </plugins>
>diff -up httpcomponents-5/httpclient/pom.xml.sav6 httpcomponents-5/httpclient/pom.xml
>--- httpcomponents-5/httpclient/pom.xml.sav6	2012-05-01 15:06:48.619128735 -0400
>+++ httpcomponents-5/httpclient/pom.xml	2012-05-01 15:08:07.917100689 -0400
>@@ -23,19 +23,18 @@
>    individuals on behalf of the Apache Software Foundation.  For more
>    information on the Apache Software Foundation, please see
>    <http://www.apache.org />.
>- -->
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <parent>
>     <artifactId>project</artifactId>
>     <groupId>org.apache.httpcomponents</groupId>
>-    <version>5</version>
>+    <version>5-redhat-1</version>
>     <relativePath>../project/pom.xml</relativePath>
>   </parent>
>   <modelVersion>4.0.0</modelVersion>
>   <groupId>org.apache.httpcomponents</groupId>
>   <artifactId>httpcomponents-client</artifactId>
>   <name>HttpComponents Client</name>
>-  <version>4.1.3</version>
>+  <version>4.1.3-redhat-1</version>
>   <description>Apache HttpComponents Client is a library of components for building client side HTTP services</description>
>   <url>http://hc.apache.org/httpcomponents-client</url>
>   <inceptionYear>1999</inceptionYear>
>@@ -90,7 +89,7 @@
>     <plugins>
>       <plugin>
>         <artifactId>maven-notice-plugin</artifactId>
>-        <groupId>org.apache.httpcomponents</groupId><version>0.0.2</version>
>+        <groupId>org.apache.httpcomponents</groupId>
>         <executions>
>           <execution>
>             <id>attach-notice-license</id>
>@@ -167,60 +166,59 @@
>         </configuration>
>       </plugin>
>       <plugin>
>-        <artifactId>maven-site-plugin</artifactId>
>-      </plugin>
>-      <plugin>
>         <artifactId>maven-assembly-plugin</artifactId>
>         <configuration>
>-          <descriptors>
>-            <descriptor>src/main/assembly/bin.xml</descriptor>
>-            <descriptor>src/main/assembly/osgi-bin.xml</descriptor>
>-            <descriptor>src/main/assembly/src.xml</descriptor>
>-          </descriptors>
>-          <tarLongFileMode>gnu</tarLongFileMode>
>-        </configuration>
>+                    <descriptors>
>+                        <descriptor>src/main/assembly/bin.xml</descriptor>
>+                        <descriptor>src/main/assembly/osgi-bin.xml</descriptor>
>+                        <descriptor>src/main/assembly/src.xml</descriptor>
>+                    </descriptors>
>+                    <tarLongFileMode>gnu</tarLongFileMode>
>+                </configuration>
>       </plugin>
>       <plugin>
>         <artifactId>maven-antrun-plugin</artifactId>
>-        <inherited>false</inherited>
>         <configuration>
>           <tasks>
>-            <ant antfile="src/main/assembly/build.xml">
>-              <property name="target" value="${project.build.directory}" />
>-              <property name="package.name" value="${project.artifactId}-${project.version}-bin" />
>-            </ant>
>-            <ant antfile="src/main/assembly/build.xml">
>-              <property name="target" value="${project.build.directory}" />
>-              <property name="package.name" value="${project.artifactId}-${project.version}-osgi-bin" />
>-            </ant>
>-            <ant antfile="src/main/assembly/build.xml">
>-              <property name="target" value="${project.build.directory}" />
>-              <property name="package.name" value="${project.artifactId}-${project.version}-src" />
>-            </ant>
>-          </tasks>
>+                        <ant>
>+                            <property />
>+                            <property />
>+                        </ant>
>+                        <ant>
>+                            <property />
>+                            <property />
>+                        </ant>
>+                        <ant>
>+                            <property />
>+                            <property />
>+                        </ant>
>+                    </tasks>
>+          
>+          
>         </configuration>
>+        <inherited>false</inherited>
>       </plugin>
>       <plugin>
>-        <groupId>com.agilejava.docbkx</groupId>
>         <artifactId>docbkx-maven-plugin</artifactId>
>-        <dependencies>
>-          <dependency>
>-            <groupId>org.docbook</groupId>
>-            <artifactId>docbook-xml</artifactId>
>-            <version>5.0-all</version>
>-            <scope>runtime</scope>
>-          </dependency>
>-        </dependencies>
>+        <groupId>com.agilejava.docbkx</groupId>
>         <executions>
>-          <execution>
>-            <id>tutorial-site</id>
>-            <goals>
>-              <goal>generate-html</goal>
>-              <goal>generate-pdf</goal>
>-            </goals>
>-            <phase>pre-site</phase>
>-          </execution>
>-        </executions>        
>+                    <execution>
>+                        <id>tutorial-site</id>
>+                        <phase>pre-site</phase>
>+                        <goals>
>+                            <goal>generate-html</goal>
>+                            <goal>generate-pdf</goal>
>+                        </goals>
>+                    </execution>
>+                </executions>
>+        <dependencies>
>+                    <dependency>
>+                        <groupId>org.docbook</groupId>
>+                        <artifactId>docbook-xml</artifactId>
>+                        <version>5.0-all</version>
>+                        <scope>runtime</scope>
>+                    </dependency>
>+                </dependencies>
>         <configuration>
>           <includes>index.xml</includes>
>           <chunkedOutput>true</chunkedOutput>
>@@ -229,54 +227,54 @@
>           <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>
>+                        <entity>
>+                            <name>version</name>
>+                            <value>${project.version}</value>
>+                        </entity>
>+                    </entities>
>           <postProcess>
>-            <copy todir="target/site/tutorial/html" 
>-              failonerror="false">
>-              <fileset dir="target/docbkx/html/index">
>-                <include name="**/*.html" />
>-              </fileset>
>-            </copy>
>-            <copy todir="target/site/tutorial/html" 
>-              failonerror="false">
>-              <fileset dir="src/docbkx/resources">
>-                <include name="**/*.css" />
>-                <include name="**/*.png" />
>-                <include name="**/*.gif" />
>-                <include name="**/*.jpg" />
>-              </fileset>
>-            </copy>
>-            <copy file="target/docbkx/pdf/index.pdf" 
>-                  tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" 
>-                  failonerror="false"/>
>-          </postProcess>
>+                        <copy>
>+                            <fileset>
>+                                <include />
>+                            </fileset>
>+                        </copy>
>+                        <copy>
>+                            <fileset>
>+                                <include />
>+                                <include />
>+                                <include />
>+                                <include />
>+                            </fileset>
>+                        </copy>
>+                        <copy />
>+                    </postProcess>
>+          
>         </configuration>
>       </plugin>
>-        <plugin>
>-          <artifactId>maven-resources-plugin</artifactId>
>-          <executions>
>-            <execution>
>-              <id>copy-resources</id>
>-              <phase>pre-site</phase>
>-              <goals>
>-                <goal>copy-resources</goal>
>-              </goals>
>-              <configuration>
>-                <outputDirectory>${basedir}/target/site/examples</outputDirectory>
>-                <resources>
>-                  <resource>
>-                    <directory>src/examples</directory>
>-                    <filtering>false</filtering>
>-                  </resource>
>-                </resources>
>-              </configuration>
>-            </execution>
>-          </executions>
>-        </plugin>
>+      <plugin>
>+        <groupId>org.apache.maven.plugins</groupId>
>+        <artifactId>maven-resources-plugin</artifactId>
>+        <executions>
>+          <execution>
>+            <id>copy-resources</id>
>+            <goals>
>+              <goal>copy-resources</goal>
>+              
>+            </goals>
>+            <phase>pre-site</phase>
>+            <configuration>
>+                            <outputDirectory>${basedir}/target/site/examples</outputDirectory>
>+                            <resources>
>+                                <resource>
>+                                    <directory>src/examples</directory>
>+                                    <filtering>false</filtering>
>+                                </resource>
>+                            </resources>
>+                        </configuration>
>+          </execution>
>+        </executions>
>+      </plugin>
>+        
>       
>-
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <modelVersion>4.0.0</modelVersion>
>   <parent>
>     <groupId>org.apache.httpcomponents</groupId>
>     <artifactId>httpcomponents-core</artifactId>
>-    <version>4.1.4-SNAPSHOT</version>
>+    <version>4.1.4-SNAPSHOT-redhat-1</version>
>   </parent>
>   <artifactId>httpcore-nio</artifactId>
>   <name>HttpCore NIO</name>
>   <inceptionYear>2005</inceptionYear>
>-  <description>
>-   HttpComponents Core (non-blocking I/O)
>-  </description>
>+  <description>HttpComponents Core (non-blocking I/O)</description>
>   <url>http://hc.apache.org/httpcomponents-core-ga</url>
>   <packaging>jar</packaging>
> 
>@@ -83,9 +79,7 @@
>           <showDeprecations>${maven.compile.deprecation}</showDeprecations>
>         </configuration>
>       </plugin>
>-      <plugin>
>-        <artifactId>maven-surefire-plugin</artifactId>
>-      </plugin>
>+      
>       
>-
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <modelVersion>4.0.0</modelVersion>
>   <parent>
>     <groupId>org.apache.httpcomponents</groupId>
>     <artifactId>httpcomponents-core</artifactId>
>-    <version>4.1.4-SNAPSHOT</version>
>+    <version>4.1.4-SNAPSHOT-redhat-1</version>
>   </parent>
>   <artifactId>httpcore-osgi</artifactId>
>   <name>HttpCore OSGi bundle</name>
>   <inceptionYear>2005</inceptionYear>
>-  <description>
>-   HttpComponents Core (OSGi bundle)
>-  </description>
>+  <description>HttpComponents Core (OSGi bundle)</description>
>   <url>http://hc.apache.org/httpcomponents-core-ga</url>
>   <packaging>bundle</packaging>  
> 
>diff -up httpcomponents-5/httpcore/httpcore/pom.xml.sav6 httpcomponents-5/httpcore/httpcore/pom.xml
>--- httpcomponents-5/httpcore/httpcore/pom.xml.sav6	2012-05-01 15:06:48.623106522 -0400
>+++ httpcomponents-5/httpcore/httpcore/pom.xml	2012-05-01 15:07:51.756109944 -0400
>@@ -23,21 +23,17 @@
>    individuals on behalf of the Apache Software Foundation.  For more
>    information on the Apache Software Foundation, please see
>    <http://www.apache.org />.
>- -->
>-
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <modelVersion>4.0.0</modelVersion>
>   <parent>
>     <groupId>org.apache.httpcomponents</groupId>
>     <artifactId>httpcomponents-core</artifactId>
>-    <version>4.1.4-SNAPSHOT</version>
>+    <version>4.1.4-SNAPSHOT-redhat-1</version>
>   </parent>
>   <artifactId>httpcore</artifactId>
>   <name>HttpCore</name>
>   <inceptionYear>2005</inceptionYear>
>-  <description>
>-   HttpComponents Core (blocking I/O)
>-  </description>
>+  <description>HttpComponents Core (blocking I/O)</description>
>   <url>http://hc.apache.org/httpcomponents-core-ga</url>
>   <packaging>jar</packaging>
> 
>@@ -50,9 +46,6 @@
>     <maven.compile.deprecation>true</maven.compile.deprecation>
>     
>     <httpcore.compiler.fork>false</httpcore.compiler.fork>
>-    <httpcore.compiler.compilerVersion />
>-    <httpcore.compiler.javac />
>-    <httpcore.surefire.java />
>   </properties>
> 
>   <dependencies>
>@@ -126,6 +119,7 @@
>             <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
>           </links>
>         </configuration>
>+        <version>2.8-redhat-1</version>
>         <reportSets>
>           <reportSet>
>             <reports>
>@@ -154,10 +148,12 @@
> 
>       <plugin>
>         <artifactId>maven-jxr-plugin</artifactId>
>+        <version>2.2-redhat-1</version>
>       </plugin>
> 
>       <plugin>
>         <artifactId>maven-surefire-report-plugin</artifactId>
>+        <version>2.10-redhat-1</version>
>       </plugin>
> 
>     </plugins>
>diff -up httpcomponents-5/httpcore/pom.xml.sav6 httpcomponents-5/httpcore/pom.xml
>--- httpcomponents-5/httpcore/pom.xml.sav6	2011-12-18 11:07:56.000000000 -0500
>+++ httpcomponents-5/httpcore/pom.xml	2012-05-01 15:07:51.720347425 -0400
>@@ -23,19 +23,18 @@
>    individuals on behalf of the Apache Software Foundation.  For more
>    information on the Apache Software Foundation, please see
>    <http://www.apache.org />.
>- -->
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <parent>
>     <artifactId>project</artifactId>
>     <groupId>org.apache.httpcomponents</groupId>
>-    <version>5</version>
>+    <version>5-redhat-1</version>
>     <relativePath>../project/pom.xml</relativePath>
>   </parent>
>   <modelVersion>4.0.0</modelVersion>
>   <groupId>org.apache.httpcomponents</groupId>
>   <artifactId>httpcomponents-core</artifactId>
>   <name>HttpComponents Core</name>
>-  <version>4.1.4-SNAPSHOT</version>
>+  <version>4.1.4-SNAPSHOT-redhat-1</version>
>   <description>Core components to build HTTP enabled services</description>
>   <url>http://hc.apache.org/httpcomponents-core</url>
>   <inceptionYear>2005</inceptionYear>
>@@ -77,17 +76,6 @@
>     <junit.version>4.8.2</junit.version>
>   </properties>
> 
>-  <dependencyManagement>
>-    <dependencies>
>-      <dependency>
>-        <groupId>junit</groupId>
>-        <artifactId>junit</artifactId>
>-        <version>${junit.version}</version>
>-        <scope>test</scope>
>-      </dependency>
>-    </dependencies>
>-  </dependencyManagement>
>-
>   <build>
>     <plugins>
>       <plugin>
>@@ -145,50 +133,49 @@
>         </configuration>
>       </plugin>
>       <plugin>
>-        <artifactId>maven-site-plugin</artifactId>
>-      </plugin>
>-      <plugin>
>         <artifactId>maven-assembly-plugin</artifactId>
>         <configuration>
>-          <descriptors>
>-            <descriptor>src/main/assembly/bin.xml</descriptor>
>-            <descriptor>src/main/assembly/osgi-bin.xml</descriptor>
>-            <descriptor>src/main/assembly/src.xml</descriptor>
>-          </descriptors>
>-          <tarLongFileMode>gnu</tarLongFileMode>
>-        </configuration>
>+                    <descriptors>
>+                        <descriptor>src/main/assembly/bin.xml</descriptor>
>+                        <descriptor>src/main/assembly/osgi-bin.xml</descriptor>
>+                        <descriptor>src/main/assembly/src.xml</descriptor>
>+                    </descriptors>
>+                    <tarLongFileMode>gnu</tarLongFileMode>
>+                </configuration>
>       </plugin>
>       <plugin>
>         <artifactId>maven-antrun-plugin</artifactId>
>-        <inherited>false</inherited>
>         <configuration>
>           <tasks>
>-            <ant antfile="src/main/assembly/build.xml">
>-              <property name="target" value="${project.build.directory}" />
>-              <property name="package.name" value="${project.artifactId}-${project.version}-bin" />
>-            </ant>
>-            <ant antfile="src/main/assembly/build.xml">
>-              <property name="target" value="${project.build.directory}" />
>-              <property name="package.name" value="${project.artifactId}-${project.version}-src" />
>-            </ant>
>-            <ant antfile="src/main/assembly/build.xml">
>-              <property name="target" value="${project.build.directory}" />
>-              <property name="package.name" value="${project.artifactId}-${project.version}-osgi-bin" />
>-            </ant>
>-          </tasks>
>+                        <ant>
>+                            <property />
>+                            <property />
>+                        </ant>
>+                        <ant>
>+                            <property />
>+                            <property />
>+                        </ant>
>+                        <ant>
>+                            <property />
>+                            <property />
>+                        </ant>
>+                    </tasks>
>+          
>+          
>         </configuration>
>+        <inherited>false</inherited>
>       </plugin>
>       <plugin>
>-        <groupId>com.agilejava.docbkx</groupId>
>         <artifactId>docbkx-maven-plugin</artifactId>
>+        <groupId>com.agilejava.docbkx</groupId>
>         <dependencies>
>-          <dependency>
>-            <groupId>org.docbook</groupId>
>-            <artifactId>docbook-xml</artifactId>
>-            <version>4.4</version>
>-            <scope>runtime</scope>
>-          </dependency>
>-        </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>
>@@ -197,54 +184,76 @@
>           <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>
>+                        <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/httpcore-tutorial.pdf" failonerror="false" />
>-          </postProcess>
>+                        <copy>
>+                            <fileset>
>+                                <include />
>+                                <include />
>+                            </fileset>
>+                        </copy>
>+                        <copy>
>+                            <fileset>
>+                                <include />
>+                                <include />
>+                                <include />
>+                                <include />
>+                            </fileset>
>+                        </copy>
>+                        <move />
>+                    </postProcess>
>+          
>         </configuration>
>       </plugin>
>       <plugin>
>+        <groupId>org.apache.maven.plugins</groupId>
>         <artifactId>maven-resources-plugin</artifactId>
>         <executions>
>-          <execution>
>-            <id>copy-resources</id>
>-            <phase>pre-site</phase>
>-            <goals>
>-              <goal>copy-resources</goal>
>-            </goals>
>-            <configuration>
>-              <outputDirectory>${basedir}/target/site/examples</outputDirectory>
>-              <resources>
>-                <resource>
>-                  <directory>src/examples</directory>
>-                  <filtering>false</filtering>
>-                </resource>
>-              </resources>
>-            </configuration>
>-          </execution>
>-        </executions>
>+                    <execution>
>+                        <id>copy-resources</id>
>+                        <phase>pre-site</phase>
>+                        <goals>
>+                            <goal>copy-resources</goal>
>+                        </goals>
>+                        <configuration>
>+                            <outputDirectory>${basedir}/target/site/examples</outputDirectory>
>+                            <resources>
>+                                <resource>
>+                                    <directory>src/examples</directory>
>+                                    <filtering>false</filtering>
>+                                </resource>
>+                            </resources>
>+                        </configuration>
>+                    </execution>
>+                </executions>
>       </plugin>
>+      
>     </plugins>
>   </build>
> 
>+  <dependencyManagement>
>+        <dependencies>
>+            <dependency>
>+                <groupId>org.jboss.component.management</groupId>
>+                <artifactId>jboss-dependency-management-all</artifactId>
>+                <version>6.0.0-redhat-1</version>
>+                <type>pom</type>
>+                <scope>import</scope>
>+            </dependency>
>+            <dependency>
>+                <groupId>org.jboss.component.management</groupId>
>+                <artifactId>jboss-project-dependency-relocations</artifactId>
>+                <version>6.0.0-redhat-1</version>
>+                <type>pom</type>
>+                <scope>import</scope>
>+            </dependency>
>+        </dependencies>
>+    </dependencyManagement>
>+
>   <reporting>
>     <plugins>
> 
>@@ -261,6 +270,7 @@
>              </reports>
>            </reportSet>
>          </reportSets>
>+         <version>2.2-redhat-1</version>
>       </plugin>
> 
>     </plugins>
>diff -up httpcomponents-5/project/pom.xml.sav6 httpcomponents-5/project/pom.xml
>--- httpcomponents-5/project/pom.xml.sav6	2012-05-01 15:06:48.607105970 -0400
>+++ httpcomponents-5/project/pom.xml	2012-05-01 15:07:39.776100759 -0400
>@@ -27,13 +27,16 @@
>    individuals on behalf of the Apache Software Foundation.  For more
>    information on the Apache Software Foundation, please see
>    <http://www.apache.org/>.
>- -->
>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>   <modelVersion>4.0.0</modelVersion>
>   <groupId>org.apache.httpcomponents</groupId>
>+  <parent>
>+        <artifactId>jboss-parent</artifactId>
>+        <groupId>org.jboss</groupId>
>+        <version>8-redhat-1</version>
>+    </parent>
>   <artifactId>project</artifactId>
>-  <version>5</version>
>+  <version>5-redhat-1</version>
>   <packaging>pom</packaging>
>   <name>HttpComponents</name>
>   <url>http://hc.apache.org/</url>
>@@ -61,7 +64,6 @@
>       <name>Ortwin Glueck</name>
>       <id>oglueck</id>
>       <email>oglueck -at- apache.org</email>
>-      <organization></organization>
>       <roles>
>         <role>Emeritus PMC</role>
>       </roles>
>@@ -97,7 +99,6 @@
>         <role>Java Developer</role>
>         <role>PMC</role>
>       </roles>
>-      <timezone></timezone>
>     </developer>
>     <developer>
>       <name>Erik Abele</name>
>@@ -118,7 +119,6 @@
>         <role>Java Developer</role>
>         <role>PMC</role>
>       </roles>
>-      <timezone></timezone>
>     </developer>
>     <developer>
>       <name>Paul Fremantle</name>
>@@ -128,7 +128,6 @@
>         <role>Java Developer</role>
>         <role>PMC</role>
>       </roles>
>-      <timezone></timezone>
>     </developer>
>     <developer>
>       <name>Roland Weber</name>
>@@ -266,18 +265,6 @@
>     </site>
>   </distributionManagement>
> 
>-  <repositories>
>-    
>-    <repository>
>-      <id>apache.snapshots</id>
>-      <name>Apache Snapshot Repository</name>
>-      <url>http://repository.apache.org/snapshots</url>
>-      <releases>
>-        <enabled>false</enabled>
>-      </releases>
>-    </repository>
>-  </repositories>
>-
>   <build>
>     <plugins>
>       <plugin>
>@@ -307,10 +294,7 @@
>           </archive>
>         </configuration>
>       </plugin>
>-      <plugin>
>-        <groupId>org.apache.maven.plugins</groupId>
>-        <artifactId>maven-site-plugin</artifactId>
>-      </plugin>
>+      
>       
>+           <version>2.2-redhat-1</version>
>            
>            <inherited>false</inherited>
>            <reportSets>
>@@ -529,6 +513,25 @@
>     </plugins>
>   </reporting>
> 
>+  <dependencyManagement>
>+        <dependencies>
>+            <dependency>
>+                <groupId>org.jboss.component.management</groupId>
>+                <artifactId>jboss-dependency-management-all</artifactId>
>+                <version>6.0.0-redhat-1</version>
>+                <type>pom</type>
>+                <scope>import</scope>
>+            </dependency>
>+            <dependency>
>+                <groupId>org.jboss.component.management</groupId>
>+                <artifactId>jboss-project-dependency-relocations</artifactId>
>+                <version>6.0.0-redhat-1</version>
>+                <type>pom</type>
>+                <scope>import</scope>
>+            </dependency>
>+        </dependencies>
>+    </dependencyManagement>
>+
>   <modules>
>     <module>../httpcore</module>
>     <module>../httpclient</module>

Actions: View

Attachments on bug 900343: 681642