96 lines
3.3 KiB
Diff
96 lines
3.3 KiB
Diff
diff --git a/build-bootstrap.xml b/build-bootstrap.xml
|
|
index 5fb7b20..e7d88d8 100644
|
|
--- a/build-bootstrap.xml
|
|
+++ b/build-bootstrap.xml
|
|
@@ -190,7 +190,8 @@
|
|
<mkdir dir="${maven.bootstrap.install.dir}/lib/endorsed" />
|
|
<move todir="${maven.bootstrap.install.dir}/lib/endorsed">
|
|
<fileset dir="${maven.bootstrap.install.dir}/lib">
|
|
- <include name="xml-apis-*.jar" />
|
|
+ <include name="jaxen-*.jar" />
|
|
+ <include name="saxpath-*.jar" />
|
|
<include name="xerces-*.jar" />
|
|
</fileset>
|
|
</move>
|
|
@@ -198,7 +199,8 @@
|
|
<!-- Don't duplicate endorsed files -->
|
|
<delete>
|
|
<fileset dir="${maven.bootstrap.install.dir}/lib">
|
|
- <include name="xml-apis-*.jar" />
|
|
+ <include name="jaxen-*.jar" />
|
|
+ <include name="saxpath-*.jar" />
|
|
<include name="xerces-*.jar" />
|
|
</fileset>
|
|
</delete>
|
|
diff --git a/project.xml b/project.xml
|
|
index 4b8b6ec..87bcd7c 100644
|
|
--- a/project.xml
|
|
+++ b/project.xml
|
|
@@ -453,7 +453,7 @@
|
|
|
|
<dependency>
|
|
<id>dom4j</id>
|
|
- <version>1.4-dev-8</version>
|
|
+ <version>1.6.1</version>
|
|
<url>http://www.dom4j.org/</url>
|
|
<properties>
|
|
<description>ouch</description>
|
|
@@ -660,11 +660,6 @@
|
|
<version>20040613.030723</version>
|
|
<url>http://jakarta.apache.org/commons/jelly/tags/xml/</url>
|
|
</dependency>
|
|
- <dependency>
|
|
- <id>commons-graph</id>
|
|
- <version>0.8.1</version>
|
|
- <url>http://jakarta.apache.org/commons/sandbox/graph/</url>
|
|
- </dependency>
|
|
<dependency>
|
|
<id>commons-jexl</id>
|
|
<version>1.0-beta-1</version>
|
|
@@ -737,9 +732,15 @@
|
|
-->
|
|
|
|
<dependency>
|
|
- <id>xml-apis</id>
|
|
- <version>1.0.b2</version>
|
|
- <url>http://xml.apache.org/xerces2-j/</url>
|
|
+ <id>jaxen</id>
|
|
+ <version>1.0-FCS</version>
|
|
+ <properties>
|
|
+ <endorsed>true</endorsed>
|
|
+ </properties>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <id>saxpath</id>
|
|
+ <version>1.0-FCS</version>
|
|
<properties>
|
|
<endorsed>true</endorsed>
|
|
</properties>
|
|
diff --git a/src/bin/forehead.conf b/src/bin/forehead.conf
|
|
index 83b3ec9..b7ad4b8 100644
|
|
--- a/src/bin/forehead.conf
|
|
+++ b/src/bin/forehead.conf
|
|
@@ -24,7 +24,8 @@
|
|
${tools.jar}
|
|
${maven.home}/lib/commons-grant-1.0-beta-4.jar
|
|
${maven.home}/lib/ant-1.5.3-1.jar
|
|
- ${maven.home}/lib/endorsed/xml-apis-1.0.b2.jar
|
|
+ ${maven.home}/lib/endorsed/jaxen-1.0-FCS.jar
|
|
+ ${maven.home}/lib/endorsed/saxpath-1.0-FCS.jar
|
|
${maven.home}/lib/ant-optional-1.5.3-1.jar
|
|
${maven.home}/lib/endorsed/xerces-2.4.0.jar
|
|
${maven.home}/lib/commons-logging-1.0.3.jar
|
|
diff --git a/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java b/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
|
|
index f7debe9..0b05b4e 100644
|
|
--- a/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
|
|
+++ b/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
|
|
@@ -85,7 +85,7 @@ public class ProjectInheritanceTest
|
|
assertEquals( "dom4j:dom4j",
|
|
( (Dependency) p.getDependencies().get( 1 ) ).getId() );
|
|
|
|
- assertEquals( "1.4-dev-8",
|
|
+ assertEquals( "1.6.1",
|
|
( (Dependency) p.getDependencies().get( 1 ) ).getVersion() );
|
|
|
|
baseDir = new File(p.getContext().findVariable("basedir").toString()).getCanonicalPath();
|