You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/05/30 07:25:31 UTC
svn commit: r780178 - in /maven/components/trunk/maven-core/src/test:
java/org/apache/maven/ projects/project-builder/it0063/
projects/project-builder/it0063/jdk/ projects/project-builder/it0063/jdk/jre/
projects/project-builder/it0063/jdk/lib/ project...
Author: jvanzyl
Date: Sat May 30 05:25:30 2009
New Revision: 780178
URL: http://svn.apache.org/viewvc?rev=780178&view=rev
Log:
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
Added:
maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/
maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/
maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/jre/
maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt (with props)
maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/lib/
maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar (with props)
maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/pom.xml (with props)
maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/
maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/
maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/
maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt (with props)
maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/
maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar (with props)
maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml (with props)
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java?rev=780178&r1=780177&r2=780178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java Sat May 30 05:25:30 2009
@@ -67,7 +67,6 @@
assertEquals( 1, artifactDependencies.size() );
}
- /*
public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements()
throws Exception
{
@@ -83,8 +82,12 @@
// 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" ) );
}
- */
}
Added: maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt?rev=780178&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt (added)
+++ maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt Sat May 30 05:25:30 2009
@@ -0,0 +1 @@
+need it so that empty folder does not get deleted
\ No newline at end of file
Propchange: maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar?rev=780178&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/pom.xml?rev=780178&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/pom.xml (added)
+++ maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/pom.xml Sat May 30 05:25:30 2009
@@ -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>
Propchange: maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/test/projects/project-builder/it0063/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt?rev=780178&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt (added)
+++ maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt Sat May 30 05:25:30 2009
@@ -0,0 +1 @@
+need it so that empty folder does not get deleted
\ No newline at end of file
Propchange: maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar?rev=780178&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml?rev=780178&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml (added)
+++ maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml Sat May 30 05:25:30 2009
@@ -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>
Propchange: maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"