You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2009/09/27 02:19:02 UTC

svn commit: r819238 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test: java/org/apache/maven/plugin/eclipse/it/ resources/projects/project-57-MECLIPSE-368/ resources/projects/project-57-MECLIPSE-368/expected/

Author: aheritier
Date: Sun Sep 27 00:19:02 2009
New Revision: 819238

URL: http://svn.apache.org/viewvc?rev=819238&view=rev
Log:
Add IT for MECLIPSE-368 which is fixed by MECLIPSE-603

Added:
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.project   (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/pom.xml   (with props)
Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?rev=819238&r1=819237&r2=819238&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java Sun Sep 27 00:19:02 2009
@@ -671,6 +671,17 @@
         testProject( "project-56-MECLIPSE-603" );
     }
 
+    /**
+     * [MECLIPSE-368] Dependency configuration in DependencyManagement with exclusions is ignored
+     * 
+     * @throws Exception
+     */
+    public void testProject57()
+        throws Exception
+    {
+        testProject( "project-57-MECLIPSE-368" );
+    }
+
     public void testJeeSimple()
         throws Exception
     {

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath?rev=819238&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath Sun Sep 27 00:19:02 2009
@@ -0,0 +1,6 @@
+<classpath>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.project?rev=819238&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.project Sun Sep 27 00:19:02 2009
@@ -0,0 +1,13 @@
+<projectDescription>
+  <name>maven-eclipse-plugin-test-MECLIPSE-368</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/expected/.project
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/pom.xml?rev=819238&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/pom.xml Sun Sep 27 00:19:02 2009
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <groupId>eclipse</groupId>
+  <artifactId>maven-eclipse-plugin-test-project-56</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>Project-56 - Test MECLIPSE-368</name>
+  <description>Project-56 - Test MECLIPSE-368</description>
+  <packaging>jar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.15</version>
+        <scope>runtime</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>com.sun.jmx</groupId>
+            <artifactId>jmxri</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jdmk</groupId>
+            <artifactId>jmxtools</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.jms</groupId>
+            <artifactId>jms</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>test</version>
+        <configuration>
+          <workspace>${basedir}/../../eclipse/workspaceDoesNotExist</workspace>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-57-MECLIPSE-368/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision