date:20081228

svn commit: r729720 - in /maven/site/trunk: pom.xml src/site/apt/developers/conventions/code.apt src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt src/site/apt/guides/mini/guid

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 03:52:40 2008
New Revision: 729720

URL: http://svn.apache.org/viewvc?rev=729720&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations

Modified:
maven/site/trunk/pom.xml
maven/site/trunk/src/site/apt/developers/conventions/code.apt

maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt
maven/site/trunk/src/site/apt/pom.apt

Modified: maven/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=729720&r1=729719&r2=729720&view=diff
==
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Sun Dec 28 03:52:40 2008
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-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";>
+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";>
   4.0.0
 
   

Modified: maven/site/trunk/src/site/apt/developers/conventions/code.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/conventions/code.apt?rev=729720&r1=729719&r2=729720&view=diff
==
--- maven/site/trunk/src/site/apt/developers/conventions/code.apt (original)
+++ maven/site/trunk/src/site/apt/developers/conventions/code.apt Sun Dec 28 
03:52:40 2008
@@ -236,7 +236,7 @@
  The following is the recommended ordering for all Maven POM files:
 
 +-+
-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";>
+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";>
   
 
   

Modified: 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt?rev=729720&r1=729719&r2=729720&view=diff
==
--- 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
 (original)
+++ 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
 Sun Dec 28 03:52:40 2008
@@ -577,7 +577,7 @@
 ++
 
 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";>
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   4.0.0
   com.test
   bom
@@ -613,7 +613,7 @@
 ++
 
 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";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   4.0.0
   
 com.test
@@ -653,7 +653,7 @@
 ++
 
 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";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   4.0.0
   
 com.test
@@ -674,7 +674,7 @@
 
 
 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";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   4.0.0
   
 com.test
@@ -701,7 +701,7 @@
 
 ++
 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";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   4.0.0
   com.test
   use

Modified: maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt?rev=729720&r1=729719&r2=729720&view=diff
==
--- maven/site/trunk/src/site/apt/guides/mi

svn commit: r729731 - /maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo

2008-12-28 Thread hboutemy

Author: hboutemy
Date: Sun Dec 28 05:31:26 2008
New Revision: 729731

URL: http://svn.apache.org/viewvc?rev=729731&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations (see 
r729720)

Modified:
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo?rev=729731&r1=729730&r2=729731&view=diff
==
--- 
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo 
(original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo 
Sun Dec 28 05:31:26 2008
@@ -51,8 +51,8 @@
 This is a reference for the Maven project descriptor used in Maven.
 An XSD is available at:
 
-  http://maven.apache.org/maven-v3_0_0.xsd";>http://maven.apache.org/maven-v3_0_0.xsd
 for Maven 1.1.
-  http://maven.apache.org/maven-v4_0_0.xsd";>http://maven.apache.org/maven-v4_0_0.xsd
 for Maven 2.0.
+  http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd
 for Maven 1.1.
+  http://maven.apache.org/xsd/maven-4_0_0.xsd";>http://maven.apache.org/xsd/maven-4_0_0.xsd
 for Maven 2.0.
 
 ]]>
   
@@ -2126,7 +2126,7 @@

svn commit: r729732 - /maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo

2008-12-28 Thread hboutemy

Author: hboutemy
Date: Sun Dec 28 05:33:54 2008
New Revision: 729732

URL: http://svn.apache.org/viewvc?rev=729732&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations (see 
r729720) (merged from 2.0.10RC branch r729731)

Modified:
maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo

Modified: 
maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo?rev=729732&r1=729731&r2=729732&view=diff
==
--- maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo 
(original)
+++ maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo 
Sun Dec 28 05:33:54 2008
@@ -51,8 +51,8 @@
 This is a reference for the Maven project descriptor used in Maven.
 An XSD is available at:
 
-  http://maven.apache.org/maven-v3_0_0.xsd";>http://maven.apache.org/maven-v3_0_0.xsd
 for Maven 1.1.
-  http://maven.apache.org/maven-v4_0_0.xsd";>http://maven.apache.org/maven-v4_0_0.xsd
 for Maven 2.0.
+  http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd
 for Maven 1.1.
+  http://maven.apache.org/xsd/maven-4_0_0.xsd";>http://maven.apache.org/xsd/maven-4_0_0.xsd
 for Maven 2.0.
 
 ]]>
   
@@ -2126,7 +2126,7 @@

svn commit: r729733 - /maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo

2008-12-28 Thread hboutemy

Author: hboutemy
Date: Sun Dec 28 05:34:41 2008
New Revision: 729733

URL: http://svn.apache.org/viewvc?rev=729733&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations (see 
r729720) (merged from 2.0.10RC branch r729731)

Modified:
maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo

Modified: 
maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo?rev=729733&r1=729732&r2=729733&view=diff
==
--- maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo 
(original)
+++ maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo 
Sun Dec 28 05:34:41 2008
@@ -51,8 +51,8 @@
 This is a reference for the Maven project descriptor used in Maven.
 An XSD is available at:
 
-  http://maven.apache.org/maven-v3_0_0.xsd";>http://maven.apache.org/maven-v3_0_0.xsd
 for Maven 1.1.
-  http://maven.apache.org/maven-v4_0_0.xsd";>http://maven.apache.org/maven-v4_0_0.xsd
 for Maven 2.0.
+  http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd
 for Maven 1.1.
+  http://maven.apache.org/xsd/maven-4_0_0.xsd";>http://maven.apache.org/xsd/maven-4_0_0.xsd
 for Maven 2.0.
 
 ]]>
   
@@ -2126,7 +2126,7 @@

svn commit: r729734 - /maven/components/trunk/maven-model/src/main/mdo/maven.mdo

2008-12-28 Thread hboutemy

Author: hboutemy
Date: Sun Dec 28 05:35:32 2008
New Revision: 729734

URL: http://svn.apache.org/viewvc?rev=729734&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations (see 
r729720) (merged from 2.0.10RC branch r729731)

Modified:
maven/components/trunk/maven-model/src/main/mdo/maven.mdo

Modified: maven/components/trunk/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/src/main/mdo/maven.mdo?rev=729734&r1=729733&r2=729734&view=diff
==
--- maven/components/trunk/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/trunk/maven-model/src/main/mdo/maven.mdo Sun Dec 28 
05:35:32 2008
@@ -51,8 +51,8 @@
 This is a reference for the Maven project descriptor used in Maven.
 An XSD is available at:
 
-  http://maven.apache.org/maven-v3_0_0.xsd";>http://maven.apache.org/maven-v3_0_0.xsd
 for Maven 1.1.
-  http://maven.apache.org/maven-v4_0_0.xsd";>http://maven.apache.org/maven-v4_0_0.xsd
 for Maven 2.0.
+  http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd
 for Maven 1.1.
+  http://maven.apache.org/xsd/maven-4_0_0.xsd";>http://maven.apache.org/xsd/maven-4_0_0.xsd
 for Maven 2.0.
 
 ]]>
   
@@ -2126,7 +2126,7 @@

svn commit: r729738 - in /maven/components/branches/maven-2.0.x/maven-model/src: main/mdo/maven.mdo site/apt/index.apt

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 05:54:12 2008
New Revision: 729738

URL: http://svn.apache.org/viewvc?rev=729738&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations

Modified:
maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
maven/components/branches/maven-2.0.x/maven-model/src/site/apt/index.apt

Modified: 
maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo?rev=729738&r1=729737&r2=729738&view=diff
==
--- maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo 
(original)
+++ maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo 
Sun Dec 28 05:54:12 2008
@@ -52,7 +52,7 @@
 An XSD is available at:
 
   http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd
 for Maven 1.1.
-  http://maven.apache.org/xsd/maven-4_0_0.xsd";>http://maven.apache.org/xsd/maven-4_0_0.xsd
 for Maven 2.0.
+  http://maven.apache.org/xsd/maven-4.0.0.xsd";>http://maven.apache.org/xsd/maven-4.0.0.xsd
 for Maven 2.0.
 
 ]]>
   

Modified: 
maven/components/branches/maven-2.0.x/maven-model/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/src/site/apt/index.apt?rev=729738&r1=729737&r2=729738&view=diff
==
--- maven/components/branches/maven-2.0.x/maven-model/src/site/apt/index.apt 
(original)
+++ maven/components/branches/maven-2.0.x/maven-model/src/site/apt/index.apt 
Sun Dec 28 05:54:12 2008
@@ -17,4 +17,4 @@
 
* A {{{maven.html}Descriptor Reference}}
 
-   * An XSD {{{http://maven.apache.org/maven-v3_0_0.xsd}for Maven 1.1}} and 
{{{http://maven.apache.org/maven-v4_0_0.xsd}for Maven 2.0}}.
+   * An XSD {{{http://maven.apache.org/xsd/maven-v3_0_0.xsd}for Maven 1.1}} 
and {{{http://maven.apache.org/xsd/maven-4.0.0.xsd}for Maven 2.0}}.

svn commit: r729739 - in /maven/components/branches/maven-2.0.10-RC: ./ maven-model/src/main/mdo/maven.mdo maven-model/src/site/apt/index.apt

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 05:57:36 2008
New Revision: 729739

URL: http://svn.apache.org/viewvc?rev=729739&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations 
(merged from r729738)

Modified:
maven/components/branches/maven-2.0.10-RC/   (props changed)
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo
maven/components/branches/maven-2.0.10-RC/maven-model/src/site/apt/index.apt

Propchange: maven/components/branches/maven-2.0.10-RC/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 28 05:57:36 2008
@@ -1,2 +1,2 @@
-/maven/components/branches/maven-2.0.x:709032,709208,709241,725949,726541,727007,727548
+/maven/components/branches/maven-2.0.x:709032,709208,709241,725949,726541,727007,727548,729738
 /maven/components/trunk:721902,726845

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo?rev=729739&r1=729738&r2=729739&view=diff
==
--- 
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo 
(original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo 
Sun Dec 28 05:57:36 2008
@@ -52,7 +52,7 @@
 An XSD is available at:
 
   http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd
 for Maven 1.1.
-  http://maven.apache.org/xsd/maven-4_0_0.xsd";>http://maven.apache.org/xsd/maven-4_0_0.xsd
 for Maven 2.0.
+  http://maven.apache.org/xsd/maven-4.0.0.xsd";>http://maven.apache.org/xsd/maven-4.0.0.xsd
 for Maven 2.0.
 
 ]]>
   

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-model/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-model/src/site/apt/index.apt?rev=729739&r1=729738&r2=729739&view=diff
==
--- 
maven/components/branches/maven-2.0.10-RC/maven-model/src/site/apt/index.apt 
(original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-model/src/site/apt/index.apt 
Sun Dec 28 05:57:36 2008
@@ -17,4 +17,4 @@
 
* A {{{maven.html}Descriptor Reference}}
 
-   * An XSD {{{http://maven.apache.org/maven-v3_0_0.xsd}for Maven 1.1}} and 
{{{http://maven.apache.org/maven-v4_0_0.xsd}for Maven 2.0}}.
+   * An XSD {{{http://maven.apache.org/xsd/maven-v3_0_0.xsd}for Maven 1.1}} 
and {{{http://maven.apache.org/xsd/maven-4.0.0.xsd}for Maven 2.0}}.

svn commit: r729740 - in /maven/components/branches/maven-2.1.x: ./ maven-model/src/main/mdo/maven.mdo maven-model/src/site/apt/index.apt

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 05:58:31 2008
New Revision: 729740

URL: http://svn.apache.org/viewvc?rev=729740&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations 
(merged from r729738)

Modified:
maven/components/branches/maven-2.1.x/   (props changed)
maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo
maven/components/branches/maven-2.1.x/maven-model/src/site/apt/index.apt

Propchange: maven/components/branches/maven-2.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 28 05:58:31 2008
@@ -1,5 +1,5 @@
 
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-62,708790-728809,728834
-/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738
 /maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
 /maven/components/branches/maven-2.1.0-RC:63,689695,689976,689990
 /maven/components/trunk:720001,721902,726845,729292

Modified: 
maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo?rev=729740&r1=729739&r2=729740&view=diff
==
--- maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo 
(original)
+++ maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo 
Sun Dec 28 05:58:31 2008
@@ -52,7 +52,7 @@
 An XSD is available at:
 
   http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd
 for Maven 1.1.
-  http://maven.apache.org/xsd/maven-4_0_0.xsd";>http://maven.apache.org/xsd/maven-4_0_0.xsd
 for Maven 2.0.
+  http://maven.apache.org/xsd/maven-4.0.0.xsd";>http://maven.apache.org/xsd/maven-4.0.0.xsd
 for Maven 2.0.
 
 ]]>
   

Modified: 
maven/components/branches/maven-2.1.x/maven-model/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-model/src/site/apt/index.apt?rev=729740&r1=729739&r2=729740&view=diff
==
--- maven/components/branches/maven-2.1.x/maven-model/src/site/apt/index.apt 
(original)
+++ maven/components/branches/maven-2.1.x/maven-model/src/site/apt/index.apt 
Sun Dec 28 05:58:31 2008
@@ -17,4 +17,4 @@
 
* A {{{maven.html}Descriptor Reference}}
 
-   * An XSD {{{http://maven.apache.org/maven-v3_0_0.xsd}for Maven 1.1}} and 
{{{http://maven.apache.org/maven-v4_0_0.xsd}for Maven 2.0}}.
+   * An XSD {{{http://maven.apache.org/xsd/maven-v3_0_0.xsd}for Maven 1.1}} 
and {{{http://maven.apache.org/xsd/maven-4.0.0.xsd}for Maven 2.0}}.

svn commit: r729741 - in /maven/components/trunk: ./ maven-model/src/main/mdo/maven.mdo maven-model/src/site/apt/index.apt

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 06:00:38 2008
New Revision: 729741

URL: http://svn.apache.org/viewvc?rev=729741&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations 
(merged from r729738)

Modified:
maven/components/trunk/   (props changed)
maven/components/trunk/maven-model/src/main/mdo/maven.mdo
maven/components/trunk/maven-model/src/site/apt/index.apt

Propchange: maven/components/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 28 06:00:38 2008
@@ -1,3 +1,3 @@
 /maven/components/branches/maven-2.0.10-RC:680477
-/maven/components/branches/maven-2.0.x:679206,720042,726541,727548,727998,728264,728940,729060
+/maven/components/branches/maven-2.0.x:679206,720042,726541,727548,727998,728264,728940,729060,729738
 /maven/components/trunk:688587-696625,696644-699681

Modified: maven/components/trunk/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/src/main/mdo/maven.mdo?rev=729741&r1=729740&r2=729741&view=diff
==
--- maven/components/trunk/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/trunk/maven-model/src/main/mdo/maven.mdo Sun Dec 28 
06:00:38 2008
@@ -52,7 +52,7 @@
 An XSD is available at:
 
   http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd
 for Maven 1.1.
-  http://maven.apache.org/xsd/maven-4_0_0.xsd";>http://maven.apache.org/xsd/maven-4_0_0.xsd
 for Maven 2.0.
+  http://maven.apache.org/xsd/maven-4.0.0.xsd";>http://maven.apache.org/xsd/maven-4.0.0.xsd
 for Maven 2.0.
 
 ]]>
   

Modified: maven/components/trunk/maven-model/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/src/site/apt/index.apt?rev=729741&r1=729740&r2=729741&view=diff
==
--- maven/components/trunk/maven-model/src/site/apt/index.apt (original)
+++ maven/components/trunk/maven-model/src/site/apt/index.apt Sun Dec 28 
06:00:38 2008
@@ -17,4 +17,4 @@
 
* A {{{maven.html}Descriptor Reference}}
 
-   * An XSD {{{http://maven.apache.org/maven-v3_0_0.xsd}for Maven 1.1}} and 
{{{http://maven.apache.org/maven-v4_0_0.xsd}for Maven 2.0}}.
+   * An XSD {{{http://maven.apache.org/xsd/maven-v3_0_0.xsd}for Maven 1.1}} 
and {{{http://maven.apache.org/xsd/maven-4.0.0.xsd}for Maven 2.0}}.

svn commit: r729763 - /maven/skins/trunk/src/site/site.xml

2008-12-28 Thread dennisl

Author: dennisl
Date: Sun Dec 28 11:28:29 2008
New Revision: 729763

URL: http://svn.apache.org/viewvc?rev=729763&view=rev
Log:
o Remove the skin, because each skin artifact uses it's own skin. Also, we 
can't release maven-skins parent if there is a SNAPSHOT dependency.
o Add breadcrumbs.

Modified:
maven/skins/trunk/src/site/site.xml

Modified: maven/skins/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/skins/trunk/src/site/site.xml?rev=729763&r1=729762&r2=729763&view=diff
==
--- maven/skins/trunk/src/site/site.xml (original)
+++ maven/skins/trunk/src/site/site.xml Sun Dec 28 11:28:29 2008
@@ -20,13 +20,12 @@
 -->
 
 
-  
-  
-org.apache.maven.skins
-maven-stylus-skin
-1.1-SNAPSHOT
-  
   
+
+  
+  http://maven.apache.org/index.html"; />
+  http://maven.apache.org/skins/index.html"; />
+

svn commit: r729765 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css

2008-12-28 Thread dennisl

Author: dennisl
Date: Sun Dec 28 11:36:56 2008
New Revision: 729765

URL: http://svn.apache.org/viewvc?rev=729765&view=rev
Log:
o Make visited links stand out a little better.

Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css

Modified: 
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css
URL: 
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css?rev=729765&r1=729764&r2=729765&view=diff
==
--- maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css 
(original)
+++ maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css 
Sun Dec 28 11:36:56 2008
@@ -40,8 +40,8 @@
 a:link {
   color:#47a;
 }
-a:visited  {
-  color:#66;
+a:visited {
+  color:#68a;
 }
 a:active, a:hover {
   color:#99;
@@ -212,3 +212,6 @@
   background-image: url(../images/icon_info_sml.gif);
 }
 
+#navcolumn li.none {
+  background-image: url(../images/bullet.gif);
+}

svn commit: r729766 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css

2008-12-28 Thread dennisl

Author: dennisl
Date: Sun Dec 28 11:44:56 2008
New Revision: 729766

URL: http://svn.apache.org/viewvc?rev=729766&view=rev
Log:
o Remove code that slipped in by mistake in r729765.

Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css

Modified: 
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css
URL: 
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css?rev=729766&r1=729765&r2=729766&view=diff
==
--- maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css 
(original)
+++ maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css 
Sun Dec 28 11:44:56 2008
@@ -211,7 +211,3 @@
 .infomark {
   background-image: url(../images/icon_info_sml.gif);
 }
-
-#navcolumn li.none {
-  background-image: url(../images/bullet.gif);
-}

svn commit: r729773 - /maven/shared/trunk/maven-doxia-tools/pom.xml

2008-12-28 Thread dennisl

Author: dennisl
Date: Sun Dec 28 13:17:38 2008
New Revision: 729773

URL: http://svn.apache.org/viewvc?rev=729773&view=rev
Log:
o Sync the versions of Maven dependencies.

Modified:
maven/shared/trunk/maven-doxia-tools/pom.xml

Modified: maven/shared/trunk/maven-doxia-tools/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=729773&r1=729772&r2=729773&view=diff
==
--- maven/shared/trunk/maven-doxia-tools/pom.xml (original)
+++ maven/shared/trunk/maven-doxia-tools/pom.xml Sun Dec 28 13:17:38 2008
@@ -77,7 +77,7 @@
 
   org.apache.maven
   maven-project
-  2.0
+  2.0.2
 
 
   org.apache.maven

svn commit: r729785 - /maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 14:05:13 2008
New Revision: 729785

URL: http://svn.apache.org/viewvc?rev=729785&view=rev
Log:
[MNG-3933] Profiles.xml does not pickup OS family
Submitted by: Pawel Paprota

Modified:

maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

Modified: 
maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java?rev=729785&r1=729784&r2=729785&view=diff
==
--- 
maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 Sun Dec 28 14:05:13 2008
@@ -75,6 +75,8 @@
 os.setFamily( profileOs.getFamily() );
 os.setName( profileOs.getName() );
 os.setVersion( profileOs.getVersion() );
+
+activation.setOs( os );
 }
 
 org.apache.maven.profiles.ActivationFile profileFile = 
profileActivation.getFile();

svn commit: r729786 - in /maven/components/branches/maven-2.1.x: ./ maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 14:07:22 2008
New Revision: 729786

URL: http://svn.apache.org/viewvc?rev=729786&view=rev
Log:
[MNG-3933] Profiles.xml does not pickup OS family
Submitted by: Pawel Paprota

o Merged from r729785

Modified:
maven/components/branches/maven-2.1.x/   (props changed)

maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

Propchange: maven/components/branches/maven-2.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 28 14:07:22 2008
@@ -1,5 +1,5 @@
 
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-62,708790-728809,728834
-/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785
 /maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
 /maven/components/branches/maven-2.1.0-RC:63,689695,689976,689990
 /maven/components/trunk:720001,721902,726845,729292

Modified: 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java?rev=729786&r1=729785&r2=729786&view=diff
==
--- 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 Sun Dec 28 14:07:22 2008
@@ -75,6 +75,8 @@
 os.setFamily( profileOs.getFamily() );
 os.setName( profileOs.getName() );
 os.setVersion( profileOs.getVersion() );
+
+activation.setOs( os );
 }
 
 org.apache.maven.profiles.ActivationFile profileFile = 
profileActivation.getFile();

svn commit: r729787 - in /maven/components/trunk: ./ maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 14:09:20 2008
New Revision: 729787

URL: http://svn.apache.org/viewvc?rev=729787&view=rev
Log:
[MNG-3933] Profiles.xml does not pickup OS family
Submitted by: Pawel Paprota

o Merged from r729785

Modified:
maven/components/trunk/   (props changed)

maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

Propchange: maven/components/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 28 14:09:20 2008
@@ -1,3 +1,3 @@
 /maven/components/branches/maven-2.0.10-RC:680477
-/maven/components/branches/maven-2.0.x:679206,720042,726541,727548,727998,728264,728940,729060,729738
+/maven/components/branches/maven-2.0.x:679206,720042,726541,727548,727998,728264,728940,729060,729738,729785
 /maven/components/trunk:688587-696625,696644-699681

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java?rev=729787&r1=729786&r2=729787&view=diff
==
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 Sun Dec 28 14:09:20 2008
@@ -78,6 +78,8 @@
 os.setFamily( profileOs.getFamily() );
 os.setName( profileOs.getName() );
 os.setVersion( profileOs.getVersion() );
+
+activation.setOs( os );
 }
 
 org.apache.maven.profiles.ActivationFile profileFile = 
profileActivation.getFile();

svn commit: r729788 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3933/

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 14:10:51 2008
New Revision: 729788

URL: http://svn.apache.org/viewvc?rev=729788&view=rev
Log:
[MNG-3933] Profiles.xml does not pickup OS family

o Added IT

Added:

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933OsTriggeredExternalProfileTest.java
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/pom.xml
   (with props)

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/profiles.xml
   (with props)
Modified:

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=729788&r1=729787&r2=729788&view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
 Sun Dec 28 14:10:51 2008
@@ -95,6 +95,7 @@
 suite.addTestSuite( MavenITmng3940EnvVarInterpolationTest.class );
 suite.addTestSuite( MavenITmng3938MergePluginExecutionsTest.class );
 suite.addTestSuite( MavenITmng3937MergedPluginExecutionGoalsTest.class 
);
+suite.addTestSuite( MavenITmng3933OsTriggeredExternalProfileTest.class 
);
 suite.addTestSuite( 
MavenITmng3927PluginDefaultExecutionConfigTest.class );
 suite.addTestSuite( MavenITmng3925MergedPluginExecutionOrderTest.class 
);
 suite.addTestSuite( MavenITmng3924XmlMarkupInterpolationTest.class );

Added: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933OsTriggeredExternalProfileTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933OsTriggeredExternalProfileTest.java?rev=729788&view=auto
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933OsTriggeredExternalProfileTest.java
 (added)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933OsTriggeredExternalProfileTest.java
 Sun Dec 28 14:10:51 2008
@@ -0,0 +1,72 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.util.Os;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for http://jira.codehaus.org/browse/MNG-3933";>MNG-3933.
+ * 
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng3933OsTriggeredExternalProfileTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng3933OsTriggeredExternalProfileTest()
+{
+super( "(2.0.10,2.1.0-M1),(2.1.0-M1,)" );
+}
+
+/**
+ * Test that OS-triggered profiles from an external profiles.xml are 
activated.
+ */
+public void testitMNG3933()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-3933" );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.deleteDirectory( "target" );
+verifier.executeGoal( "validate" );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+Properties props = verifier.loadProperties( 
"target/profile.properties" );
+if ( Os.isFamily( Os.

svn commit: r729794 - /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/profiles.xml

2008-12-28 Thread bentmann

Author: bentmann
Date: Sun Dec 28 14:28:36 2008
New Revision: 729794

URL: http://svn.apache.org/viewvc?rev=729794&view=rev
Log:
o Fixed invalid XML (which was successfully parsed nevertheless?!)

Modified:

maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/profiles.xml

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/profiles.xml
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/profiles.xml?rev=729794&r1=729793&r2=729794&view=diff
==
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/profiles.xml
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/profiles.xml
 Sun Dec 28 14:28:36 2008
@@ -19,38 +19,40 @@
 under the License.
 -->
 
-
-  
-PROFILE-A
-
-  
-winDOWS
-  
-
-
-  PASSED
-
-  
-  
-PROFILE-B
-
-  
-unIX
-  
-
-
-  PASSED
-
-  
-  
-PROFILE-C
-
-  
-mAC
-  
-
-
-  PASSED
-
-  
-
+
+  
+
+  PROFILE-A
+  
+
+  winDOWS
+
+  
+  
+PASSED
+  
+
+
+  PROFILE-B
+  
+
+  unIX
+
+  
+  
+PASSED
+  
+
+
+  PROFILE-C
+  
+
+  mAC
+
+  
+  
+PASSED
+  
+
+  
+

svn commit: r729824 - in /maven/mercury/trunk: mercury-ant/mercury-ant-tasks/ mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-ant/mercury-ant-tasks/src/main/res

2008-12-28 Thread ogusakov

Author: ogusakov
Date: Sun Dec 28 18:22:44 2008
New Revision: 729824

URL: http://svn.apache.org/viewvc?rev=729824&view=rev
Log:
[MERCURY-65] pom attribute UT works, can read POMs now !! :)

Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml

maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java

maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java

maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/Messages.properties

maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/DefaultStorage.java

maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMap.java

maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/Storage.java

Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml?rev=729824&r1=729823&r2=729824&view=diff
==
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml Sun Dec 28 
18:22:44 2008
@@ -260,7 +260,7 @@
 >

 
-  
+  
 
   
 

Modified: 
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=729824&r1=729823&r2=729824&view=diff
==
--- 
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
 (original)
+++ 
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
 Sun Dec 28 18:22:44 2008
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.util.Util;
@@ -31,7 +32,7 @@
 
 Collection _auths;
 
-Collection _repositories;
+List _repositories;
 
 public Config()
 {
@@ -48,7 +49,7 @@
 central.setUrl( remoteUrl == null ? DEFAULT_CENTRAL_URL : remoteUrl );
 }
 
-public Collection getRepositories()
+public List getRepositories()
 throws BuildException
 {
 if ( Util.isEmpty( _repos ) )

Modified: 
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=729824&r1=729823&r2=729824&view=diff
==
--- 
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
 (original)
+++ 
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
 Sun Dec 28 18:22:44 2008
@@ -2,15 +2,16 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.maven.mercury.MavenDependencyProcessor;
 import org.apache.maven.mercury.artifact.Artifact;
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.logging.IMercuryLogger;
 import org.apache.maven.mercury.logging.MercuryLoggerManager;
 import org.apache.maven.mercury.metadata.DependencyBuilder;
@@ -18,6 +19,10 @@
 import org.apache.maven.mercury.repository.api.ArtifactResults;
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.repository.api.RepositoryException;
+import org.apache.maven.mercury.repository.local.map.DefaultStorage;
+import org.apache.maven.mercury.repository.local.map.LocalRepositoryMap;
+import org.apache.maven.mercury.repository.local.map.Storage;
+import org.apache.maven.mercury.repository.local.map.StorageException;
 import org.apache.maven.mercury.repository.virtual.VirtualRepositoryReader;
 import org.apache.maven.mercury.util.Util;
 import org.apache.tools.ant.BuildException;
@@ -47,6 +52,10 @@
 private ArtifactScopeEnum _scope = ArtifactScopeEnum.compile;
 
 private boolean _transitive = tru

svn commit: r729720 - in /maven/site/trunk: pom.xml src/site/apt/developers/conventions/code.apt src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt src/site/apt/guides/mini/guid

svn commit: r729731 - /maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo

svn commit: r729732 - /maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo

svn commit: r729733 - /maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo

svn commit: r729734 - /maven/components/trunk/maven-model/src/main/mdo/maven.mdo

svn commit: r729738 - in /maven/components/branches/maven-2.0.x/maven-model/src: main/mdo/maven.mdo site/apt/index.apt

svn commit: r729739 - in /maven/components/branches/maven-2.0.10-RC: ./ maven-model/src/main/mdo/maven.mdo maven-model/src/site/apt/index.apt

svn commit: r729740 - in /maven/components/branches/maven-2.1.x: ./ maven-model/src/main/mdo/maven.mdo maven-model/src/site/apt/index.apt

svn commit: r729741 - in /maven/components/trunk: ./ maven-model/src/main/mdo/maven.mdo maven-model/src/site/apt/index.apt

svn commit: r729763 - /maven/skins/trunk/src/site/site.xml

svn commit: r729765 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css

svn commit: r729766 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-theme.css

svn commit: r729773 - /maven/shared/trunk/maven-doxia-tools/pom.xml

svn commit: r729785 - /maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

svn commit: r729786 - in /maven/components/branches/maven-2.1.x: ./ maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

svn commit: r729787 - in /maven/components/trunk: ./ maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

svn commit: r729788 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3933/

svn commit: r729794 - /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3933/profiles.xml

svn commit: r729824 - in /maven/mercury/trunk: mercury-ant/mercury-ant-tasks/ mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-ant/mercury-ant-tasks/src/main/res

19 matches

Site Navigation

Mail list logo

Footer information