maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r709778 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0083/ resources/it0083/repo/ resources/it0083/repo/org/ resources/it0083/repo/org/apache/ resources/it0083/repo/org/apache/mave...
Date Sat, 01 Nov 2008 21:09:10 GMT
Author: bentmann
Date: Sat Nov  1 14:09:09 2008
New Revision: 709778

URL: http://svn.apache.org/viewvc?rev=709778&view=rev
Log:
o Decoupled it0083 from production plugins

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.jar
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.pom
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/maven-metadata.xml
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.jar
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.pom
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/maven-metadata.xml
  (with props)
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/test-component-a/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/test-component-b/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/test-component-c/
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0083Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0083Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0083Test.java?rev=709778&r1=709777&r2=709778&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0083Test.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0083Test.java
Sat Nov  1 14:09:09 2008
@@ -23,32 +23,39 @@
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
+import java.util.Collection;
 
 public class MavenIT0083Test
     extends AbstractMavenIntegrationTestCase
 {
 
     /**
-     * Verify that overriding a compile time dependency as provided in a WAR ensures it is
not included.
+     * Verify that overriding a transitive compile time dependency as provided in a WAR ensures
it is not included.
      */
     public void testit0083()
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0083" );
+
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "package" );
-        verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
-        verifier.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" );
-        verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" );
-        verifier.assertFilePresent(
-            "test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar"
);
-        verifier.assertFileNotPresent(
-            "test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-a-0.1.jar"
);
-        verifier.assertFilePresent(
-            "test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-b-0.1.jar"
);
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.deleteArtifacts( "org.apache.maven.its.it0083" );
+        verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
+        Collection compileArtifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        assertTrue( compileArtifacts.toString(), 
+            compileArtifacts.contains( "org.apache.maven.its.it0083:direct-dep:jar:0.1" )
);
+        assertTrue( compileArtifacts.toString(), 
+            compileArtifacts.contains( "org.apache.maven.its.it0083:trans-dep:jar:0.1" )
);
+
+        Collection runtimeArtifacts = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+        assertTrue( runtimeArtifacts.toString(), 
+            runtimeArtifacts.contains( "org.apache.maven.its.it0083:direct-dep:jar:0.1" )
);
+        assertFalse( runtimeArtifacts.toString(), 
+            runtimeArtifacts.contains( "org.apache.maven.its.it0083:trans-dep:jar:0.1" )
);
     }
-}
 
+}

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/pom.xml?rev=709778&r1=709777&r2=709778&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/pom.xml Sat
Nov  1 14:09:09 2008
@@ -1,15 +1,86 @@
+<?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>
-  <name>Maven Integration Test :: it0083</name>
+
   <groupId>org.apache.maven.its.it0083</groupId>
-  <artifactId>maven-it-it0083</artifactId>
-  <description>Verify that overriding a compile time dependency as provided in a WAR
ensures it is not included.
-  </description>
+  <artifactId>test</artifactId>
   <version>0.1</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>test-component-c</module>
-    <module>test-component-b</module>
-    <module>test-component-a</module>
-  </modules>
+  <packaging>war</packaging>
+
+  <name>Maven Integration Test :: it0083</name>
+  <description>
+    Verify that overriding a transitive compile time dependency as provided in a WAR ensures
it is not included.
+  </description>
+
+  <repositories>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+      <releases>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+      <snapshots>
+        <checksumPolicy>ignore</checksumPolicy>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.it0083</groupId>
+      <artifactId>direct-dep</artifactId>
+      <version>0.1</version>
+    </dependency>
+    <dependency>
+      <!-- transitive dependency of direct-dep whose scope is to be updated from compile
to provided -->
+      <groupId>org.apache.maven.its.it0083</groupId>
+      <artifactId>trans-dep</artifactId>
+      <version>0.1</version>
+      <scope>provided</scope>
+    </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>
+          <compileArtifacts>target/compile.txt</compileArtifacts>
+          <runtimeArtifacts>target/runtime.txt</runtimeArtifacts>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>compile</goal>
+              <goal>runtime</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.jar?rev=709778&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.pom?rev=709778&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.pom
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/0.1/direct-dep-0.1.pom
Sat Nov  1 14:09:09 2008
@@ -0,0 +1,64 @@
+<?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.it0083</groupId>
+  <artifactId>direct-dep</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+
+  <properties>
+    <maven.test.skip>true</maven.test.skip>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.it0083</groupId>
+      <artifactId>trans-dep</artifactId>
+      <version>0.1</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>pom.xml</include>
+          <include>src/**</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+  </build>
+</project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/maven-metadata.xml?rev=709778&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/maven-metadata.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/maven-metadata.xml
Sat Nov  1 14:09:09 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>org.apache.maven.its.it0083</groupId>
+  <artifactId>direct-dep</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20081101205116</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/maven-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/direct-dep/maven-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.jar?rev=709778&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.pom?rev=709778&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.pom
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/0.1/trans-dep-0.1.pom
Sat Nov  1 14:09:09 2008
@@ -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.it0083</groupId>
+  <artifactId>trans-dep</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+
+  <properties>
+    <maven.test.skip>true</maven.test.skip>
+  </properties>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>pom.xml</include>
+          <include>src/**</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+  </build>
+</project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/maven-metadata.xml?rev=709778&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/maven-metadata.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/maven-metadata.xml
Sat Nov  1 14:09:09 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>org.apache.maven.its.it0083</groupId>
+  <artifactId>trans-dep</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20081101205008</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/maven-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/repo/org/apache/maven/its/it0083/trans-dep/maven-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message