updated dependencies,
"fixed" rhino tests,
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jci/trunk@1072616 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compilers/eclipse/pom.xml b/compilers/eclipse/pom.xml
index 9522f78..fed41ee 100644
--- a/compilers/eclipse/pom.xml
+++ b/compilers/eclipse/pom.xml
@@ -50,9 +50,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- <version>3.2.0.658</version>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.5.1</version>
</dependency>
</dependencies>
<properties>
diff --git a/compilers/groovy/pom.xml b/compilers/groovy/pom.xml
index 9836e2a..6e80130 100644
--- a/compilers/groovy/pom.xml
+++ b/compilers/groovy/pom.xml
@@ -50,9 +50,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>groovy</groupId>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.0-jsr-03</version>
+ <version>1.7.7</version>
</dependency>
</dependencies>
<properties>
diff --git a/compilers/janino/pom.xml b/compilers/janino/pom.xml
index 6da599e..e4a8da6 100644
--- a/compilers/janino/pom.xml
+++ b/compilers/janino/pom.xml
@@ -50,9 +50,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>janino</groupId>
+ <groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
- <version>2.5.10</version>
+ <version>2.5.16</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 c2356e7..a7b07b4 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
@@ -19,7 +19,7 @@
import org.apache.commons.jci.problems.CompilationProblem;
import org.codehaus.janino.Location;
-import org.codehaus.janino.Scanner.LocatedException;
+import org.codehaus.janino.util.LocatedException;
/**
* 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 2cf589b..ed6da80 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
@@ -37,9 +37,8 @@
import org.codehaus.janino.FilterWarningHandler;
import org.codehaus.janino.Location;
import org.codehaus.janino.WarningHandler;
-import org.codehaus.janino.Parser.ParseException;
-import org.codehaus.janino.Scanner.ScanException;
import org.codehaus.janino.UnitCompiler.ErrorHandler;
+import org.codehaus.janino.util.LocatedException;
import org.codehaus.janino.util.StringPattern;
import org.codehaus.janino.util.resource.Resource;
import org.codehaus.janino.util.resource.ResourceCreator;
@@ -187,15 +186,10 @@
try {
compiler.compile(resources);
- } catch ( ScanException e ) {
+ } catch ( LocatedException e ) {
problems.add(new JaninoCompilationProblem(e));
- } catch ( ParseException e ) {
- problems.add(new JaninoCompilationProblem(e));
} catch ( IOException e ) {
- // I'm hoping the existing compiler problems handler catches these
- log.error("this error should have been cought before", e);
- } catch ( CompileException e ) {
- // I'm hoping the existing compiler problems handler catches these
+ // low level problems reading or writing bytes
log.error("this error should have been cought before", e);
}
final CompilationProblem[] result = new CompilationProblem[problems.size()];
diff --git a/compilers/rhino/pom.xml b/compilers/rhino/pom.xml
index a2818a9..c514be9 100644
--- a/compilers/rhino/pom.xml
+++ b/compilers/rhino/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
- <version>1.6R5</version>
+ <version>1.7R2</version>
</dependency>
</dependencies>
<properties>
diff --git a/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java b/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
index ce23589..fd64b05 100644
--- a/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
+++ b/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
@@ -117,6 +117,9 @@
assertTrue(clazzBytes.length > 0);
}
+ public void testCrossReferenceCompilation() throws Exception {
+
+ }
}
diff --git a/core/pom.xml b/core/pom.xml
index fe84ddf..ea96588 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -44,23 +44,23 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/fam/pom.xml b/fam/pom.xml
index 6e30708..5cabf11 100644
--- a/fam/pom.xml
+++ b/fam/pom.xml
@@ -33,19 +33,19 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 8163c94..a7113ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>15</version>
+ <version>17</version>
</parent>
<packaging>pom</packaging>
<groupId>org.apache.commons</groupId>
@@ -40,13 +40,11 @@
</issueManagement>
<modules>
<module>core</module>
- <module>fam</module>
<module>compilers/eclipse</module>
<module>compilers/janino</module>
<module>compilers/groovy</module>
- <module>compilers/javac</module>
<module>compilers/rhino</module>
- <module>examples</module>
+ <!-- <module>compilers/jsr199</module> -->
</modules>
<distributionManagement>
<site>
