maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1416399 - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/MCOMPILER-190/ src/it/MCOMPILER-190/src/ src/it/MCOMPILER-190/src/main/ src/it/MCOMPILER-190/src/main/java/ src/it/MCOMPILER-190/src/main/java/org/ src/it/MCOMPILER-190/src...
Date Mon, 03 Dec 2012 09:49:57 GMT
Author: olamy
Date: Mon Dec  3 09:49:56 2012
New Revision: 1416399

URL: http://svn.apache.org/viewvc?rev=1416399&view=rev
Log:
[MCOMPILER-190] No compile errors with plexus-compiler-eclipse.

Added:
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pce.tar
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pom.xml   (with props)
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/
    maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
  (with props)
Modified:
    maven/plugins/trunk/maven-compiler-plugin/pom.xml
    maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1416399&r1=1416398&r2=1416399&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Mon Dec  3 09:49:56 2012
@@ -54,7 +54,7 @@ under the License.
   <properties>
     <mavenVersion>2.0.9</mavenVersion>
     <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
-    <plexusCompilerVersion>2.0</plexusCompilerVersion>
+    <plexusCompilerVersion>2.1-SNAPSHOT</plexusCompilerVersion>
     <groovyVersion>1.8.0</groovyVersion>
     <groovyEclipseCompilerVersion>2.6.0-01</groovyEclipseCompilerVersion>
   </properties>

Added: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pce.tar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pce.tar?rev=1416399&view=auto
==============================================================================
Files maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pce.tar (added) and maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pce.tar
Mon Dec  3 09:49:56 2012 differ

Added: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pom.xml?rev=1416399&view=auto
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pom.xml (added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pom.xml Mon Dec  3 09:49:56
2012
@@ -0,0 +1,31 @@
+<?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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.example.pce</groupId>
+	<artifactId>sample</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<properties>
+		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1-SNAPSHOT</version>
+				<configuration>
+					<compilerId>eclipse</compilerId>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.plexus</groupId>
+						<artifactId>plexus-compiler-eclipse</artifactId>
+						<version>2.1-SNAPSHOT</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Propchange: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java?rev=1416399&view=auto
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
(added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
Mon Dec  3 09:49:56 2012
@@ -0,0 +1,7 @@
+package org.example.pce.sample;
+
+public class Dummy {
+	public static void main(final String[] args) {
+		String dummy = new Integer(1);
+	}
+}

Propchange: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-190/src/main/java/org/example/pce/sample/Dummy.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java?rev=1416399&r1=1416398&r2=1416399&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
(original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
Mon Dec  3 09:49:56 2012
@@ -716,9 +716,16 @@ public abstract class AbstractCompilerMo
             throw new MojoExecutionException( "Fatal error compiling", e );
         }
 
-        getLog().debug( "incrementalBuildHelper#afterRebuildExecution" );
-        // now scan the same directory again and create a diff
-        incrementalBuildHelper.afterRebuildExecution( incrementalBuildHelperRequest );
+        if ( incrementalBuildHelperRequest.getOutputDirectory().exists() )
+        {
+            getLog().debug( "incrementalBuildHelper#afterRebuildExecution" );
+            // now scan the same directory again and create a diff
+            incrementalBuildHelper.afterRebuildExecution( incrementalBuildHelperRequest );
+        }
+        else
+        {
+            getLog().debug( "skip incrementalBuildHelper#afterRebuildExecution as the output
directory doesn't exist" );
+        }
 
         List<CompilerMessage> warnings = new ArrayList<CompilerMessage>();
         List<CompilerMessage> errors = new ArrayList<CompilerMessage>();



Mime
View raw message