Upgraded the dependency on Janino to 2.6.1 (JCI-69)
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jci/trunk@1515065 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compilers/janino/pom.xml b/compilers/janino/pom.xml
index e4a8da6..40ff00f 100644
--- a/compilers/janino/pom.xml
+++ b/compilers/janino/pom.xml
@@ -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>
diff --git a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
index a7b07b4..9bdee14 100755
--- a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
+++ b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
@@ -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
diff --git a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
index ed6da80..c418c2f 100644
--- a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
+++ b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
@@ -30,15 +30,14 @@
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 @@
},
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);
