From 6c8b5329096ae3b95bd923a6d376b243acb33aa7 Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Thu, 19 Oct 2006 20:49:23 +0000
Subject: [PATCH] o adding IT it0085

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@465859 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/test/resources/it0085/dep/pom.xml     | 16 +++++++++++
 .../src/test/resources/it0085/pom.xml         | 28 +++++++++++++++++++
 .../src/test/resources/it0085/war/pom.xml     | 24 ++++++++++++++++
 .../war/src/main/webapp/WEB-INF/web.xml       |  2 ++
 4 files changed, 70 insertions(+)
 create mode 100644 maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
 create mode 100644 maven-core-integration-tests/src/test/resources/it0085/pom.xml
 create mode 100644 maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
 create mode 100644 maven-core-integration-tests/src/test/resources/it0085/war/src/main/webapp/WEB-INF/web.xml

diff --git a/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml b/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
new file mode 100644
index 0000000000..aa8b72fd79
--- /dev/null
+++ b/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
@@ -0,0 +1,16 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.it</groupId>
+    <artifactId>it0085-parent</artifactId>
+    <version>1.0</version>
+  </parent>
+  <artifactId>it0085-dep</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.it</groupId>
+      <artifactId>pom-dep</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/maven-core-integration-tests/src/test/resources/it0085/pom.xml b/maven-core-integration-tests/src/test/resources/it0085/pom.xml
new file mode 100644
index 0000000000..cfddc88d16
--- /dev/null
+++ b/maven-core-integration-tests/src/test/resources/it0085/pom.xml
@@ -0,0 +1,28 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.it</groupId>
+  <artifactId>it0085-parent</artifactId>
+  <description>Verify that system-scoped dependencies get resolved with system scope
+        when they are resolved transitively via another (non-system)
+        dependency. Inherited scope should not apply in the case of
+        system-scoped dependencies, no matter where they are.</description>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>dep</module>
+    <module>war</module>
+  </modules>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.it</groupId>
+        <artifactId>pom-dep</artifactId>
+        <version>1.4.2</version>
+        <scope>system</scope>
+        <systemPath>${basedir}/pom.xml</systemPath>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>
diff --git a/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml b/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
new file mode 100644
index 0000000000..885aed6f41
--- /dev/null
+++ b/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
@@ -0,0 +1,24 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.it</groupId>
+    <artifactId>it0085-parent</artifactId>
+    <version>1.0</version>
+  </parent>
+  <artifactId>it0085-war</artifactId>
+  <packaging>war</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.it</groupId>
+      <artifactId>it0085-dep</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/maven-core-integration-tests/src/test/resources/it0085/war/src/main/webapp/WEB-INF/web.xml b/maven-core-integration-tests/src/test/resources/it0085/war/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..692c8c3b9a
--- /dev/null
+++ b/maven-core-integration-tests/src/test/resources/it0085/war/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,2 @@
+<web-xml>
+</web-xml>