svn commit: r1515065 - in /commons/proper/jci/trunk/compilers/janino: pom.xml src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java

[eb...@apache.org]

Author: ebourg
Date: Sun Aug 18 03:53:22 2013
New Revision: 1515065

URL: http://svn.apache.org/r1515065
Log:
Upgraded the dependency on Janino to 2.6.1 (JCI-69)

Modified:
    commons/proper/jci/trunk/compilers/janino/pom.xml
    commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
    commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java

Modified: commons/proper/jci/trunk/compilers/janino/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/pom.xml?rev=1515065&r1=1515064&r2=1515065&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/janino/pom.xml (original)
+++ commons/proper/jci/trunk/compilers/janino/pom.xml Sun Aug 18 03:53:22 2013
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>
-            <version>2.5.16</version>
+            <version>2.6.1</version>
         </dependency>
     </dependencies>
     <properties>

Modified: commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java?rev=1515065&r1=1515064&r2=1515065&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java (original)
+++ commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java Sun Aug 18 03:53:22 2013
@@ -18,8 +18,8 @@
 package org.apache.commons.jci.compilers;
 
 import org.apache.commons.jci.problems.CompilationProblem;
-import org.codehaus.janino.Location;
-import org.codehaus.janino.util.LocatedException;
+import org.codehaus.commons.compiler.LocatedException;
+import org.codehaus.commons.compiler.Location;
 
 /**
  * Janino version of a CompilationProblem

Modified: commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java?rev=1515065&r1=1515064&r2=1515065&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java (original)
+++ commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java Sun Aug 18 03:53:22 2013
@@ -30,15 +30,14 @@ import org.apache.commons.jci.readers.Re
 import org.apache.commons.jci.stores.ResourceStore;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.codehaus.commons.compiler.CompileException;
+import org.codehaus.commons.compiler.LocatedException;
+import org.codehaus.commons.compiler.Location;
 import org.codehaus.janino.ClassLoaderIClassLoader;
-import org.codehaus.janino.CompileException;
 import org.codehaus.janino.Compiler;
-import org.codehaus.janino.DebuggingInformation;
 import org.codehaus.janino.FilterWarningHandler;
-import org.codehaus.janino.Location;
-import org.codehaus.janino.WarningHandler;
 import org.codehaus.janino.UnitCompiler.ErrorHandler;
-import org.codehaus.janino.util.LocatedException;
+import org.codehaus.janino.WarningHandler;
 import org.codehaus.janino.util.StringPattern;
 import org.codehaus.janino.util.resource.Resource;
 import org.codehaus.janino.util.resource.ResourceCreator;
@@ -153,7 +152,9 @@ public final class JaninoJavaCompiler ex
     			},
     			pSettings.getSourceEncoding(),
     			false,
-    			pSettings.isDebug()?DebuggingInformation.ALL:DebuggingInformation.NONE,
+    			pSettings.isDebug(),
+                pSettings.isDebug(),
+                pSettings.isDebug(),
     			new FilterWarningHandler(pattern, new WarningHandler() {
 						public void handleWarning( final String pHandle, final String pMessage, final Location pLocation ) {
 							final CompilationProblem problem = new JaninoCompilationProblem(pLocation.getFileName(), pLocation, pMessage, false);