hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1026503 - in /httpcomponents/httpclient/branches/notice-plugin-test: ./ httpclient-benchmark/ httpclient-cache/ httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ httpclient-cache/src/test/java/org/apache/http/impl/client/ca...
Date Fri, 22 Oct 2010 21:47:46 GMT
Author: olegk
Date: Fri Oct 22 21:47:45 2010
New Revision: 1026503

URL: http://svn.apache.org/viewvc?rev=1026503&view=rev
Log:
Dedicated branch for testing maven-notice-plugin

Added:
    httpcomponents/httpclient/branches/notice-plugin-test/   (props changed)
      - copied from r1024347, httpcomponents/httpclient/trunk/
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java
      - copied unchanged from r1024393, httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java
      - copied unchanged from r1024393, httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java
      - copied unchanged from r1024393, httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
      - copied unchanged from r1024383, httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java
      - copied unchanged from r1024393, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java
      - copied unchanged from r1024393, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java
      - copied unchanged from r1024383, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientFormLogin.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientFormLogin.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientKerberosAuthentication.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientKerberosAuthentication.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
      - copied unchanged from r1026121, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
Removed:
    httpcomponents/httpclient/branches/notice-plugin-test/src/main/resources/
Modified:
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-benchmark/pom.xml
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/pom.xml
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-contrib/pom.xml
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient-osgi/pom.xml
    httpcomponents/httpclient/branches/notice-plugin-test/httpclient/pom.xml
    httpcomponents/httpclient/branches/notice-plugin-test/httpmime/pom.xml
    httpcomponents/httpclient/branches/notice-plugin-test/pom.xml

Propchange: httpcomponents/httpclient/branches/notice-plugin-test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 22 21:47:45 2010
@@ -0,0 +1,8 @@
+bin
+.classpath
+.project
+dist
+target
+.fbprefs
+.settings
+.pmd

Propchange: httpcomponents/httpclient/branches/notice-plugin-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 22 21:47:45 2010
@@ -0,0 +1,2 @@
+/httpcomponents/httpclient/branches/4.0.x:950681-950688
+/httpcomponents/httpclient/branches/branch_4_1:755593-811107

Modified: httpcomponents/httpclient/branches/notice-plugin-test/httpclient-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/notice-plugin-test/httpclient-benchmark/pom.xml?rev=1026503&r1=1024347&r2=1026503&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/notice-plugin-test/httpclient-benchmark/pom.xml (original)
+++ httpcomponents/httpclient/branches/notice-plugin-test/httpclient-benchmark/pom.xml Fri
Oct 22 21:47:45 2010
@@ -38,15 +38,7 @@
    HttpComponents HttpClient - Benchmarks
   </description>
   <url>http://hc.apache.org/httpcomponents-client</url>
-  <packaging>jar</packaging>  
-
-  <licenses>
-    <license>
-      <name>Apache License</name>
-      <url>../LICENSE.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
@@ -126,7 +118,7 @@
               <goal>java</goal>
             </goals>
             <configuration>
-              <mainClass>org.apache.http.client.benchmark.Benchmark</mainClass>
       
+              <mainClass>org.apache.http.client.benchmark.Benchmark</mainClass>
             </configuration>
           </execution>
         </executions>

Modified: httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/pom.xml?rev=1026503&r1=1024347&r2=1026503&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/pom.xml (original)
+++ httpcomponents/httpclient/branches/notice-plugin-test/httpclient-cache/pom.xml Fri Oct
22 21:47:45 2010
@@ -40,13 +40,6 @@
   <url>http://hc.apache.org/httpcomponents-client</url>
   <packaging>jar</packaging>
 
-  <licenses>
-    <license>
-      <name>Apache License</name>
-      <url>../LICENSE.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
   <repositories>
     <repository>
       <id>spy</id>
@@ -124,33 +117,11 @@
     <resources>
       <resource>
         <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-            <include>META-INF/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
         <filtering>true</filtering>
         <includes>
             <include>**/*.properties</include>
         </includes>
       </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>../src/main/resources</directory>
-        <targetPath>META-INF</targetPath>
-        <filtering>true</filtering>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
     </resources>
     <plugins>
       <plugin>

Modified: httpcomponents/httpclient/branches/notice-plugin-test/httpclient-contrib/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/notice-plugin-test/httpclient-contrib/pom.xml?rev=1026503&r1=1024347&r2=1026503&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/notice-plugin-test/httpclient-contrib/pom.xml (original)
+++ httpcomponents/httpclient/branches/notice-plugin-test/httpclient-contrib/pom.xml Fri Oct
22 21:47:45 2010
@@ -38,15 +38,7 @@
    HttpComponents HttpClient - Contributed Components
   </description>
   <url>http://hc.apache.org/httpcomponents-client</url>
-  <packaging>jar</packaging>  
-
-  <licenses>
-    <license>
-      <name>Apache License</name>
-      <url>../LICENSE.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>

Modified: httpcomponents/httpclient/branches/notice-plugin-test/httpclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/notice-plugin-test/httpclient-osgi/pom.xml?rev=1026503&r1=1024347&r2=1026503&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/notice-plugin-test/httpclient-osgi/pom.xml (original)
+++ httpcomponents/httpclient/branches/notice-plugin-test/httpclient-osgi/pom.xml Fri Oct
22 21:47:45 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
    ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -39,7 +39,7 @@
    HttpComponents Client (OSGi bundle)
   </description>
   <url>http://hc.apache.org/httpcomponents-client</url>
-  <packaging>bundle</packaging>  
+  <packaging>bundle</packaging>
 
   <licenses>
     <license>
@@ -81,33 +81,11 @@
     <resources>
       <resource>
         <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-            <include>META-INF/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
         <filtering>true</filtering>
         <includes>
             <include>**/*.properties</include>
         </includes>
       </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>../src/main/resources</directory>
-        <targetPath>META-INF</targetPath>
-        <filtering>true</filtering>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
     </resources>
     <plugins>
       <plugin>

Modified: httpcomponents/httpclient/branches/notice-plugin-test/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/notice-plugin-test/httpclient/pom.xml?rev=1026503&r1=1024347&r2=1026503&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/notice-plugin-test/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/branches/notice-plugin-test/httpclient/pom.xml Fri Oct 22 21:47:45
2010
@@ -38,15 +38,7 @@
    HttpComponents Client (base module)
   </description>
   <url>http://hc.apache.org/httpcomponents-client</url>
-  <packaging>jar</packaging>  
-
-  <licenses>
-    <license>
-      <name>Apache License</name>
-      <url>../LICENSE.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
@@ -100,58 +92,12 @@
     <resources>
       <resource>
         <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-            <include>META-INF/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
         <filtering>true</filtering>
         <includes>
             <include>**/*.properties</include>
         </includes>
       </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>../src/main/resources</directory>
-        <targetPath>META-INF</targetPath>
-        <filtering>true</filtering>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
     </resources>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-            <include>*</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE.txt</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>../src/main/resources</directory>
-        <targetPath>META-INF</targetPath>
-        <filtering>true</filtering>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: httpcomponents/httpclient/branches/notice-plugin-test/httpmime/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/notice-plugin-test/httpmime/pom.xml?rev=1026503&r1=1024347&r2=1026503&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/notice-plugin-test/httpmime/pom.xml (original)
+++ httpcomponents/httpclient/branches/notice-plugin-test/httpmime/pom.xml Fri Oct 22 21:47:45
2010
@@ -38,15 +38,7 @@
    HttpComponents HttpClient - MIME coded entities
   </description>
   <url>http://hc.apache.org/httpcomponents-client</url>
-  <packaging>jar</packaging>  
-
-  <licenses>
-    <license>
-      <name>Apache License</name>
-      <url>../LICENSE.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
@@ -82,33 +74,11 @@
     <resources>
       <resource>
         <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-            <include>META-INF/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
         <filtering>true</filtering>
         <includes>
             <include>**/*.properties</include>
         </includes>
       </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>../src/main/resources</directory>
-        <targetPath>META-INF</targetPath>
-        <filtering>true</filtering>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
     </resources>
     <plugins>
       <plugin>

Modified: httpcomponents/httpclient/branches/notice-plugin-test/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/notice-plugin-test/pom.xml?rev=1026503&r1=1024347&r2=1026503&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/notice-plugin-test/pom.xml (original)
+++ httpcomponents/httpclient/branches/notice-plugin-test/pom.xml Fri Oct 22 21:47:45 2010
@@ -87,6 +87,19 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-notice-plugin</artifactId>
+        <groupId>org.apache.httpcomponents</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>attach-notice-license</id>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
           <execution>



Mime
View raw message