hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r550251 - in /jakarta/httpcomponents/httpcore/trunk: pom.xml src/main/assembly/bin.xml src/main/assembly/src.xml
Date Sun, 24 Jun 2007 15:40:39 GMT
Author: olegk
Date: Sun Jun 24 08:40:38 2007
New Revision: 550251

URL: http://svn.apache.org/viewvc?view=rev&rev=550251
Log:
Updated assembly descriptors to automatically adjust line endings of text files to CRLF

Modified:
    jakarta/httpcomponents/httpcore/trunk/pom.xml
    jakarta/httpcomponents/httpcore/trunk/src/main/assembly/bin.xml
    jakarta/httpcomponents/httpcore/trunk/src/main/assembly/src.xml

Modified: jakarta/httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/pom.xml?view=diff&rev=550251&r1=550250&r2=550251
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/pom.xml (original)
+++ jakarta/httpcomponents/httpcore/trunk/pom.xml Sun Jun 24 08:40:38 2007
@@ -90,6 +90,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1</version>
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/bin.xml</descriptor>

Modified: jakarta/httpcomponents/httpcore/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/main/assembly/bin.xml?view=diff&rev=550251&r1=550250&r2=550251
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/src/main/assembly/bin.xml (original)
+++ jakarta/httpcomponents/httpcore/trunk/src/main/assembly/bin.xml Sun Jun 24 08:40:38 2007
@@ -41,6 +41,7 @@
             <include>NOTICE.txt</include>
             <include>RELEASE_NOTES.txt</include>
           </includes>
+          <lineEnding>crlf</lineEnding>
         </fileSet>
         <!-- Base module -->
         <fileSet>
@@ -57,6 +58,7 @@
         <fileSet>
           <directory>module-main/src/examples/</directory>
           <outputDirectory>examples</outputDirectory>
+          <lineEnding>crlf</lineEnding>
           <includes>
             <include>**/*.java</include>
           </includes>
@@ -76,6 +78,7 @@
         <fileSet>
           <directory>module-nio/src/examples/</directory>
           <outputDirectory>examples</outputDirectory>
+          <lineEnding>crlf</lineEnding>
           <includes>
             <include>**/*.java</include>
           </includes>
@@ -95,6 +98,7 @@
         <fileSet>
           <directory>module-niossl/src/examples/</directory>
           <outputDirectory>examples</outputDirectory>
+          <lineEnding>crlf</lineEnding>
           <includes>
             <include>**/*.java</include>
           </includes>

Modified: jakarta/httpcomponents/httpcore/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/main/assembly/src.xml?view=diff&rev=550251&r1=550250&r2=550251
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/src/main/assembly/src.xml (original)
+++ jakarta/httpcomponents/httpcore/trunk/src/main/assembly/src.xml Sun Jun 24 08:40:38 2007
@@ -34,21 +34,85 @@
         <format>zip</format>
     </formats>
     <fileSets>
+        <!-- Release materials -->
         <fileSet>
           <includes>
             <include>README.txt</include>
             <include>LICENSE.txt</include>
             <include>NOTICE.txt</include>
             <include>RELEASE_NOTES.txt</include>
-            <include>**/*.xml</include>
-            <include>**/src/**</include>
           </includes>
+          <lineEnding>crlf</lineEnding>
+        </fileSet>
+        <!-- Build files -->
+        <fileSet>
+          <includes>
+            <include>*.xml</include>
+          </includes>
+          <lineEnding>crlf</lineEnding>
+        </fileSet>
+        <!-- Base module source and text resources -->
+        <fileSet>
+          <directory>module-main/src</directory>
+          <outputDirectory>module-main/src</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+          <excludes>
+            <exclude>site/**</exclude>
+          </excludes>
+        </fileSet>
+        <!-- Base module build files -->
+        <fileSet>
+          <directory>module-main</directory>
+          <outputDirectory>module-main</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+          <includes>
+            <include>*.xml</include>
+          </includes>
+        </fileSet>
+        <!-- NIO module source and text resources -->
+        <fileSet>
+          <directory>module-nio/src</directory>
+          <outputDirectory>module-nio/src</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+          <excludes>
+            <exclude>site/**</exclude>
+          </excludes>
+        </fileSet>
+        <!-- NIO module build files -->
+        <fileSet>
+          <directory>module-nio</directory>
+          <outputDirectory>module-nio</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+          <includes>
+            <include>*.xml</include>
+          </includes>
+        </fileSet>
+        <!-- NIO SSL module source and text resources -->
+        <fileSet>
+          <directory>module-niossl/src</directory>
+          <outputDirectory>module-niossl/src</outputDirectory>
+          <lineEnding>crlf</lineEnding>
           <excludes>
-            <exclude>contrib/**</exclude>
-            <exclude>**/target/**</exclude>
-            <exclude>**/site/**</exclude>
-            <exclude>**/.*/**</exclude>
+            <exclude>site/**</exclude>
+            <exclude>test/resources/*.keystore</exclude>
           </excludes>
+        </fileSet>
+        <!-- NIO SSL module binary resources -->
+        <fileSet>
+          <directory>module-niossl/src</directory>
+          <outputDirectory>module-niossl/src</outputDirectory>
+          <includes>
+            <include>test/resources/*.keystore</include>
+          </includes>
+        </fileSet>
+        <!-- NIO SSL module build files -->
+        <fileSet>
+          <directory>module-niossl</directory>
+          <outputDirectory>module-niossl</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+          <includes>
+            <include>*.xml</include>
+          </includes>
         </fileSet>
     </fileSets>
 </assembly>



Mime
View raw message