From ac9e46799925356e0e682eb2de3282c6ec6610e9 Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Sat, 30 May 2009 05:25:30 +0000
Subject: [PATCH] o adding equivalents for it0063, they work fine here but i'm
 not sure yet why the IT is failing. need to take a look at the it resolution
 plugin to see where the difference is

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780178 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ProjectDependenciesResolverTest.java      |   9 ++-
 .../it0063/jdk/jre/placeholder.txt            |   1 +
 .../project-builder/it0063/jdk/lib/tools.jar  | Bin 0 -> 345 bytes
 .../projects/project-builder/it0063/pom.xml   |  55 ++++++++++++++++++
 .../it0063/jdk/jre/placeholder.txt            |   1 +
 .../it0063/jdk/lib/tools.jar                  | Bin 0 -> 345 bytes
 .../it0063/pom.xml                            |  55 ++++++++++++++++++
 7 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt
 create mode 100644 maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar
 create mode 100644 maven-core/src/test/projects/project-builder/it0063/pom.xml
 create mode 100644 maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt
 create mode 100644 maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar
 create mode 100644 maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml

diff --git a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
index 426d58b634..acffbc031d 100644
--- a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
@@ -67,7 +67,6 @@ public class ProjectDependenciesResolverTest
         assertEquals( 1, artifactDependencies.size() );        
     }  
     
-    /*
     public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements()
         throws Exception
     {
@@ -83,8 +82,12 @@ public class ProjectDependenciesResolverTest
                 
         // Here we will actually not have any artifacts because the ProjectDependenciesResolver is not involved here. So
         // right now it's not valid to ask for artifacts unless plugins require the artifacts.
-
+      
         List<String> elements = project.getCompileClasspathElements();
+        assertEquals( 2, elements.size() );
+        
+        List<Artifact> artifacts = project.getCompileArtifacts();
+        assertEquals( 1, artifacts.size() );
+        assertTrue( artifacts.get( 0 ).getFile().getName().endsWith( "tools.jar" ) );
     }
-    */
 }
diff --git a/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt b/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt
new file mode 100644
index 0000000000..e26e86087c
--- /dev/null
+++ b/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt
@@ -0,0 +1 @@
+need it so that empty folder does not get deleted
\ No newline at end of file
diff --git a/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar b/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d64355199008ab56ee327308add772c6030d55d6
GIT binary patch
literal 345
zcmWIWW@Zs#-~ht>3M)$nB*4kQ!r<!~;;8HC=cfPf6axb@Lx49s2S^1IR9OH{%_2Y*
zaLvAsex7cw!6ACSZl8V6oc8h7)w{^+t*dqJ%=yhh23L$9JT21m^40P5y;!=6g>%MB
z$s^J;v@=+yKhyk?rY8PWJX~!0l4oMt70*;(XMQUBSi}f+i13u?8}2}BKsdmgkx7IB
v)gLfNg8YFB;0^=%3SBF*u^?X{fGv;-*NWt)0B=?{kSZo1tOe4?KpX}D1TsW)

literal 0
HcmV?d00001

diff --git a/maven-core/src/test/projects/project-builder/it0063/pom.xml b/maven-core/src/test/projects/project-builder/it0063/pom.xml
new file mode 100644
index 0000000000..b12cc70a7c
--- /dev/null
+++ b/maven-core/src/test/projects/project-builder/it0063/pom.xml
@@ -0,0 +1,55 @@
+<?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
+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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.it0063</groupId>
+  <artifactId>maven-it-it0063</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: it0063</name> 
+  <description>Test the use of a system scoped dependency to a (fake) tools.jar.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.sun</groupId>
+      <artifactId>tools</artifactId>
+      <version>1.4.2</version>
+      <scope>system</scope>
+      <systemPath>${jre.home}/../lib/tools.jar</systemPath>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <compileClassPath>target/compile.txt</compileClassPath>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt b/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt
new file mode 100644
index 0000000000..e26e86087c
--- /dev/null
+++ b/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt
@@ -0,0 +1 @@
+need it so that empty folder does not get deleted
\ No newline at end of file
diff --git a/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar b/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d64355199008ab56ee327308add772c6030d55d6
GIT binary patch
literal 345
zcmWIWW@Zs#-~ht>3M)$nB*4kQ!r<!~;;8HC=cfPf6axb@Lx49s2S^1IR9OH{%_2Y*
zaLvAsex7cw!6ACSZl8V6oc8h7)w{^+t*dqJ%=yhh23L$9JT21m^40P5y;!=6g>%MB
z$s^J;v@=+yKhyk?rY8PWJX~!0l4oMt70*;(XMQUBSi}f+i13u?8}2}BKsdmgkx7IB
v)gLfNg8YFB;0^=%3SBF*u^?X{fGv;-*NWt)0B=?{kSZo1tOe4?KpX}D1TsW)

literal 0
HcmV?d00001

diff --git a/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml b/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
new file mode 100644
index 0000000000..b12cc70a7c
--- /dev/null
+++ b/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
@@ -0,0 +1,55 @@
+<?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
+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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.it0063</groupId>
+  <artifactId>maven-it-it0063</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: it0063</name> 
+  <description>Test the use of a system scoped dependency to a (fake) tools.jar.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.sun</groupId>
+      <artifactId>tools</artifactId>
+      <version>1.4.2</version>
+      <scope>system</scope>
+      <systemPath>${jre.home}/../lib/tools.jar</systemPath>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <compileClassPath>target/compile.txt</compileClassPath>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>