Author: joakime
Date: Wed Jun 6 10:40:04 2007
New Revision: 544895
URL: http://svn.apache.org/viewvc?view=rev&rev=544895
Log:
[MNG-3038] Transitive DepMan not working
Adding unit test IT0121 per discussion on IRC with BrianFox and Carlos.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/pom.xml
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,65 @@
+package org.apache.maven.integrationtests;
+
+/*
+ * 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 java.io.File;
+import java.io.IOException;
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+public class MavenIT0121TransitiveDepManVersion
+ extends AbstractMavenIntegrationTestCase
+{
+ public void testit0121()
+ throws Exception
+ {
+ File testDirBase = ResourceExtractor.simpleExtractResources(
getClass(), "/it0121-transitiveDepManVersion" );
+
+ compileDDep( testDirBase, "D1", "1.0" );
+ compileDDep( testDirBase, "D2", "2.0" );
+
+ File testProjectDir = new File( testDirBase, "test-project" );
+
+ Verifier verifier = new Verifier( testProjectDir.getAbsolutePath() );
+ verifier.deleteArtifact( "org.apache.maven.its.it0121", "A", "1.0",
"pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0121", "A", "1.0",
"jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0121", "B", "1.0",
"pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0121", "B", "1.0",
"jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0121", "C", "1.0",
"pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0121", "D", "1.0",
"jar" );
+ verifier.executeGoal( "install" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+
+ private void compileDDep( File testDirBase, String projectDDepDir, String
version )
+ throws VerificationException, IOException
+ {
+ File testOtherDepDir = new File( testDirBase, "test-other-deps/" +
projectDDepDir );
+ Verifier verifierOtherDep = new Verifier(
testOtherDepDir.getAbsolutePath() );
+ verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D",
version, "jar" );
+ verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D",
version, "pom" );
+ verifierOtherDep.executeGoal( "install" );
+ verifierOtherDep.verifyErrorFreeLog();
+ verifierOtherDep.resetStreams();
+ }
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 6 10:40:04 2007
@@ -0,0 +1,15 @@
+target
+*~
+.*.swp
+*.log
+*.patch
+*.diff
+*.ipr
+*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
+cobertura.ser
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>D</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ </dependencies>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,11 @@
+package org.apache.maven.its.it0121.D;
+
+import java.util.Date;
+
+public class Foo
+{
+ public String getTimestamp()
+ {
+ return (new Date()).toString();
+ }
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 6 10:40:04 2007
@@ -0,0 +1,15 @@
+target
+*~
+.*.swp
+*.log
+*.patch
+*.diff
+*.ipr
+*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
+cobertura.ser
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>D</artifactId>
+ <version>2.0</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ </dependencies>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,16 @@
+package org.apache.maven.its.it0121.D;
+
+import java.util.Date;
+import java.util.Locale;
+import java.text.DateFormat;
+
+public class Foo
+{
+ public String getTimestamp( Locale aLocale )
+ {
+ DateFormat format = DateFormat.getDateInstance(
+ DateFormat.LONG, aLocale );
+
+ return format.format( new Date() );
+ }
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 6 10:40:04 2007
@@ -0,0 +1,15 @@
+target
+*~
+.*.swp
+*.log
+*.patch
+*.diff
+*.ipr
+*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
+cobertura.ser
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 6 10:40:04 2007
@@ -0,0 +1,15 @@
+target
+*~
+.*.swp
+*.log
+*.patch
+*.diff
+*.ipr
+*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
+cobertura.ser
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>A</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>B</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,21 @@
+package org.apache.maven.its.it0121.A;
+
+import java.io.PrintWriter;
+
+import org.apache.maven.its.it0121.B.Out;
+
+public class App
+{
+ public static void main(String args[])
+ {
+ (new App()).output( new PrintWriter( System.out ) );
+ }
+
+ public void output( PrintWriter writer )
+ {
+ Out out = new Out( writer );
+
+ out.println( "Welcome to the org.apache.maven.its.it0121.A App." );
+ out.println( "The time is now: " + out.getTimestamp() );
+ }
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,18 @@
+package org.apache.maven.its.it0121.A;
+
+import java.io.*;
+import junit.framework.*;
+
+public class AppTest
+ extends TestCase
+{
+ public void testOutput()
+ {
+ App app = new App();
+ StringWriter actual = new StringWriter();
+ PrintWriter writer = new PrintWriter( actual );
+ app.output( writer );
+
+ assertTrue( actual.getBuffer().length() > 10 );
+ }
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 6 10:40:04 2007
@@ -0,0 +1,15 @@
+target
+*~
+.*.swp
+*.log
+*.patch
+*.diff
+*.ipr
+*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
+cobertura.ser
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>B</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>D</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>C</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,27 @@
+package org.apache.maven.its.it0121.B;
+
+import java.io.PrintWriter;
+import java.util.Locale;
+
+import org.apache.maven.its.it0121.D.Foo;
+
+public class Out
+{
+ private PrintWriter writer;
+
+ public Out( PrintWriter writer )
+ {
+ this.writer = writer;
+ }
+
+ public void println( String msg )
+ {
+ writer.println( "[Out] " + msg );
+ }
+
+ public String getTimestamp()
+ {
+ Foo foo = new Foo();
+ return foo.getTimestamp( Locale.getDefault() );
+ }
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 6 10:40:04 2007
@@ -0,0 +1,15 @@
+target
+*~
+.*.swp
+*.log
+*.patch
+*.diff
+*.ipr
+*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
+cobertura.ser
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>C</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>D</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml?view=auto&rev=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml
Wed Jun 6 10:40:04 2007
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0121</groupId>
+ <artifactId>example-parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>A</module>
+ <module>B</module>
+ <module>C</module>
+ </modules>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/pom.xml?view=diff&rev=544895&r1=544894&r2=544895
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/pom.xml
Wed Jun 6 10:40:04 2007
@@ -1,9 +1,9 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
+<project>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its</groupId>
- <artifactId>maven-its</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>maven-its</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
<modules>
<module>it0000</module>
<module>it0001</module>
@@ -120,5 +120,6 @@
<!-- <module>it0106</module> -->
<!-- <module>it0107</module> -->
<!-- <module>it0120-ejbClientDependency</module> not fixed yet -->
+ <module>it0121-transitiveDepManVersion</module>
</modules>
</project>
