maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ken...@apache.org
Subject svn commit: r463011 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/writers/ test/resources/projects/project-01/expected/ test/resources/projects/project-02/expected/ test/resources/projects/project-03/expe...
Date Wed, 11 Oct 2006 22:28:33 GMT
Author: kenney
Date: Wed Oct 11 15:28:32 2006
New Revision: 463011

URL: http://svn.apache.org/viewvc?view=rev&rev=463011
Log:
PR: MECLIPSE-170

Remove exported flag from classpath entries as this creates problems with
the classpath and transitive (conflicting) dependencies.

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
Wed Oct 11 15:28:32 2006
@@ -300,12 +300,6 @@
 
         writer.startElement( ELT_CLASSPATHENTRY );
         writer.addAttribute( ATTR_KIND, kind );
-
-        if ( !dep.isSystemScoped() && !dep.isTestDependency() )
-        {
-            writer.addAttribute( ATTR_EXPORTED, Boolean.TRUE.toString() );
-        }
-
         writer.addAttribute( ATTR_PATH, path );
 
         if ( sourcepath != null )

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -2,5 +2,5 @@
   <classpathentry kind="src" path="src/main/java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar"
sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar"
sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -5,5 +5,5 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -4,5 +4,5 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-output-dir"
excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -5,5 +5,5 @@
   <classpathentry kind="src" path="src-test-resources" output="target/test-classes-dir"
excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -4,5 +4,5 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache
Tomcat v5.5"/>
   <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container/wtptest"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar"
sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar"
sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -2,5 +2,5 @@
   <classpathentry kind="src" path="src/main/java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar"
sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar"
sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -5,5 +5,5 @@
   <classpathentry kind="src" path="src-test-resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/eclipse-classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -2,7 +2,7 @@
   <classpathentry kind="src" path="src/main/java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/junit/junit/3.0/junit-3.0.jar">
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.0/junit-3.0.jar">
     <attributes>
       <attribute value="jar:file:/${M2_REPO}/junit/junit/3.0/junit-3.0-javadoc.jar!/"
name="javadoc_location"/>
     </attributes>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -1,5 +1,5 @@
 <classpath>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" exported="true" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
 </classpath>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath?view=diff&rev=463011&r1=463010&r2=463011
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath
Wed Oct 11 15:28:32 2006
@@ -2,5 +2,5 @@
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-  <classpathentry kind="lib" exported="true" path="junit-3.8.1.jar"/>
+  <classpathentry kind="lib" path="junit-3.8.1.jar"/>
 </classpath>



Mime
View raw message