You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/12/10 05:03:50 UTC

svn commit: r724966 - in /maven/components/branches/maven-2.0.10-RC: maven-core/pom.xml maven-core/src/main/resources/META-INF/plexus/components.xml pom.xml

Author: brett
Date: Tue Dec  9 20:03:49 2008
New Revision: 724966

URL: http://svn.apache.org/viewvc?rev=724966&view=rev
Log:
remove a couple more remnants of the user agent setting that was rolled back

Modified:
    maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml
    maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml
    maven/components/branches/maven-2.0.10-RC/pom.xml

Modified: maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml?rev=724966&r1=724965&r2=724966&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml Tue Dec  9 20:03:49 2008
@@ -186,15 +186,6 @@
     </plugins>
   </reporting>
 
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-  </build>
-
   <profiles>
     <profile>
       <id>include-site</id>

Modified: maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=724966&r1=724965&r2=724966&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml Tue Dec  9 20:03:49 2008
@@ -583,38 +583,5 @@
         </requirement>
       </requirements>
     </component>
-    
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>http</role-hint>
-      <implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <description>LightweightHttpWagon</description>
-      <isolated-realm>false</isolated-realm>
-      <configuration>
-        <httpHeaders>
-          <property>
-            <name>User-Agent</name>
-            <value>Apache Maven/${project.version}</value>
-          </property>
-        </httpHeaders>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>https</role-hint>
-      <implementation>org.apache.maven.wagon.providers.http.LightweightHttpsWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <description>LIghtweightHttpsWagon</description>
-      <isolated-realm>false</isolated-realm>
-      <configuration>
-        <httpHeaders>
-          <property>
-            <name>User-Agent</name>
-            <value>Apache Maven/${project.version}</value>
-          </property>
-        </httpHeaders>
-      </configuration>
-    </component>
   </components>
 </component-set>

Modified: maven/components/branches/maven-2.0.10-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/pom.xml?rev=724966&r1=724965&r2=724966&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/pom.xml Tue Dec  9 20:03:49 2008
@@ -417,7 +417,7 @@
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-webdav</artifactId>
-        <version>1.0-beta-2</version>
+        <version>${wagonVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
@@ -579,4 +579,4 @@
       </reporting>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>