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 2009/02/25 15:43:59 UTC
svn commit: r747800 - in /maven/components/branches/maven-2.0.x: ./
apache-maven/ apache-maven/src/test/ maven-integration-tests/
maven-model/src/test/ maven-settings/src/test/java/org/apache/maven/settings/
maven-settings/src/test/resources/ maven-set...
Author: brett
Date: Wed Feb 25 14:43:58 2009
New Revision: 747800
URL: http://svn.apache.org/viewvc?rev=747800&view=rev
Log:
[MNG-2387] <active> on <proxy> in settings is misleading (test cases)
Submitted by: Torben S. Giesselmann
Merged from: r747799
Added:
maven/components/branches/maven-2.0.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
- copied unchanged from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/
- copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/
maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/
- copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/
maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/
- copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/
maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/
- copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/
maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/settings/
- copied from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/
maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
- copied unchanged from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
- copied unchanged from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
maven/components/branches/maven-2.0.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml
- copied unchanged from r747799, maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props changed)
maven/components/branches/maven-2.0.x/maven-integration-tests/ (props changed)
maven/components/branches/maven-2.0.x/maven-model/src/test/ (props changed)
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 14:43:58 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799
/maven/components/trunk:720001,721902,726845,729292
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 14:43:58 2009
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
-/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683
+/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799
/maven/components/trunk/apache-maven:720001,721902,726845
/maven/components/trunk/maven-distribution:727688
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 14:43:58 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 14:43:58 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
-/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683
+/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 14:43:58 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
-/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683
+/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799