maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r749010 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-2921/ resources/mng-2921/consumer/ resources/mng-2921/ejbs/ resources/mng-2921/producer/ resources/mng-2921/tests/
Date Sun, 01 Mar 2009 12:19:05 GMT
Author: bentmann
Date: Sun Mar  1 12:19:04 2009
New Revision: 749010

URL: http://svn.apache.org/viewvc?rev=749010&view=rev
Log:
[MNG-2921] ejb-client dependency no longer resolved in reactor build

o Strengthened IT to capture regression introduced by misplaced else block in r742799

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/client.jar
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/pom.xml
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/tests.jar
  (with props)
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/main.jar
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/main.jar
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java?rev=749010&r1=749009&r2=749010&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
Sun Mar  1 12:19:04 2009
@@ -64,14 +64,28 @@
         Collection compileArtifacts = verifier.loadLines( "consumer/target/compile.txt",
"UTF-8" );
         assertTrue( compileArtifacts.toString(),
             compileArtifacts.contains( "org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT"
) );
+        assertTrue( compileArtifacts.toString(),
+            compileArtifacts.contains( "org.apache.maven.its.mng2921:producer:ejb-client:client:1.0-SNAPSHOT"
) );
         assertFalse( compileArtifacts.toString(),
             compileArtifacts.contains( "org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT"
) );
+        assertFalse( compileArtifacts.toString(),
+            compileArtifacts.contains( "org.apache.maven.its.mng2921:producer:test-jar:tests:1.0-SNAPSHOT"
) );
 
         Collection testArtifacts = verifier.loadLines( "consumer/target/test.txt", "UTF-8"
);
         assertTrue( testArtifacts.toString(),
             testArtifacts.contains( "org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT"
) );
         assertTrue( testArtifacts.toString(),
+            testArtifacts.contains( "org.apache.maven.its.mng2921:producer:ejb-client:client:1.0-SNAPSHOT"
) );
+        assertTrue( testArtifacts.toString(),
             testArtifacts.contains( "org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT"
) );
+        assertTrue( testArtifacts.toString(),
+            testArtifacts.contains( "org.apache.maven.its.mng2921:producer:test-jar:tests:1.0-SNAPSHOT"
) );
+
+        Collection testClassPath = verifier.loadLines( "consumer/target/test-classpath.txt",
"UTF-8" );
+        assertTrue( testClassPath.toString(), testClassPath.contains( "ejbs/attached.jar"
) );
+        assertTrue( testClassPath.toString(), testClassPath.contains( "tests/attached.jar"
) );
+        assertTrue( testClassPath.toString(), testClassPath.contains( "producer/client.jar"
) );
+        assertTrue( testClassPath.toString(), testClassPath.contains( "producer/tests.jar"
) );
     }
 
 }

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml?rev=749010&r1=749009&r2=749010&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
Sun Mar  1 12:19:04 2009
@@ -52,6 +52,21 @@
       <version>1.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <!-- NOTE: It is essential part of the test to also depend on multiple attached artifacts
from the same module! -->
+    <dependency>
+      <groupId>org.apache.maven.its.mng2921</groupId>
+      <artifactId>producer</artifactId>
+      <type>ejb-client</type>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.its.mng2921</groupId>
+      <artifactId>producer</artifactId>
+      <type>test-jar</type>
+      <version>1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -67,6 +82,8 @@
             <configuration>
               <compileArtifacts>target/compile.txt</compileArtifacts>
               <testArtifacts>target/test.txt</testArtifacts>
+              <testClassPath>target/test-classpath.txt</testClassPath>
+              <significantPathLevels>2</significantPathLevels>
             </configuration>
             <goals>
               <goal>compile</goal>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml?rev=749010&r1=749009&r2=749010&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml
Sun Mar  1 12:19:04 2009
@@ -44,7 +44,7 @@
             <id>install</id>
             <phase>validate</phase>
             <configuration>
-              <mainFile>main.jar</mainFile>
+              <mainFile>pom.xml</mainFile>
               <attachedFile>attached.jar</attachedFile>
               <artifactType>ejb-client</artifactType>
               <artifactClassifier>client</artifactClassifier>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml?rev=749010&r1=749009&r2=749010&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml
Sun Mar  1 12:19:04 2009
@@ -39,6 +39,7 @@
   <modules>
     <module>tests</module>
     <module>ejbs</module>
+    <module>producer</module>
     <module>consumer</module>
   </modules>
 

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/client.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/client.jar?rev=749010&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/client.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/pom.xml?rev=749010&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/pom.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/pom.xml
Sun Mar  1 12:19:04 2009
@@ -0,0 +1,82 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng2921</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>producer</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-2921 :: Dependency Provider</name> 
+
+  <build>
+    <plugins>
+      <plugin>
+        <!-- NOTE: It is essential part of this test that this module provides multiple
attached artifacts! -->
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-artifact</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>package-main</id>
+            <phase>validate</phase>
+            <configuration>
+              <mainFile>pom.xml</mainFile>
+            </configuration>
+            <goals>
+              <goal>set</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>package-tests</id>
+            <phase>validate</phase>
+            <configuration>
+              <attachedFile>tests.jar</attachedFile>
+              <artifactType>test-jar</artifactType>
+              <artifactClassifier>tests</artifactClassifier>
+            </configuration>
+            <goals>
+              <goal>attach</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>package-client</id>
+            <phase>validate</phase>
+            <configuration>
+              <attachedFile>client.jar</attachedFile>
+              <artifactType>ejb-client</artifactType>
+              <artifactClassifier>client</artifactClassifier>
+            </configuration>
+            <goals>
+              <goal>attach</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/tests.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/tests.jar?rev=749010&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/tests.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml?rev=749010&r1=749009&r2=749010&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml
Sun Mar  1 12:19:04 2009
@@ -44,7 +44,7 @@
             <id>install</id>
             <phase>validate</phase>
             <configuration>
-              <mainFile>main.jar</mainFile>
+              <mainFile>pom.xml</mainFile>
               <attachedFile>attached.jar</attachedFile>
               <artifactType>test-jar</artifactType>
               <artifactClassifier>tests</artifactClassifier>



Mime
View raw message