commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tcu...@apache.org
Subject svn commit: r1072616 - in /commons/proper/jci/trunk: ./ compilers/eclipse/ compilers/groovy/ compilers/janino/ compilers/janino/src/main/java/org/apache/commons/jci/compilers/ compilers/rhino/ compilers/rhino/src/test/java/org/apache/commons/jci/compil...
Date Sun, 20 Feb 2011 15:53:38 GMT
Author: tcurdt
Date: Sun Feb 20 15:53:38 2011
New Revision: 1072616

URL: http://svn.apache.org/viewvc?rev=1072616&view=rev
Log:
updated dependencies,
"fixed" rhino tests,


Modified:
    commons/proper/jci/trunk/compilers/eclipse/pom.xml
    commons/proper/jci/trunk/compilers/groovy/pom.xml
    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
    commons/proper/jci/trunk/compilers/rhino/pom.xml
    commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
    commons/proper/jci/trunk/core/pom.xml
    commons/proper/jci/trunk/fam/pom.xml
    commons/proper/jci/trunk/pom.xml

Modified: commons/proper/jci/trunk/compilers/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/eclipse/pom.xml?rev=1072616&r1=1072615&r2=1072616&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/eclipse/pom.xml (original)
+++ commons/proper/jci/trunk/compilers/eclipse/pom.xml Sun Feb 20 15:53:38 2011
@@ -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>

Modified: commons/proper/jci/trunk/compilers/groovy/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/groovy/pom.xml?rev=1072616&r1=1072615&r2=1072616&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/groovy/pom.xml (original)
+++ commons/proper/jci/trunk/compilers/groovy/pom.xml Sun Feb 20 15:53:38 2011
@@ -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>

Modified: commons/proper/jci/trunk/compilers/janino/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/pom.xml?rev=1072616&r1=1072615&r2=1072616&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/janino/pom.xml (original)
+++ commons/proper/jci/trunk/compilers/janino/pom.xml Sun Feb 20 15:53:38 2011
@@ -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>

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=1072616&r1=1072615&r2=1072616&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 Feb 20 15:53:38 2011
@@ -19,7 +19,7 @@ package org.apache.commons.jci.compilers
 
 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

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=1072616&r1=1072615&r2=1072616&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 Feb 20 15:53:38 2011
@@ -37,9 +37,8 @@ import org.codehaus.janino.DebuggingInfo
 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 @@ public final class JaninoJavaCompiler ex
         
         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()];

Modified: commons/proper/jci/trunk/compilers/rhino/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/rhino/pom.xml?rev=1072616&r1=1072615&r2=1072616&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/rhino/pom.xml (original)
+++ commons/proper/jci/trunk/compilers/rhino/pom.xml Sun Feb 20 15:53:38 2011
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>rhino</groupId>
             <artifactId>js</artifactId>
-            <version>1.6R5</version>
+            <version>1.7R2</version>
         </dependency>
     </dependencies>
     <properties>

Modified: commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java?rev=1072616&r1=1072615&r2=1072616&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
(original)
+++ commons/proper/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
Sun Feb 20 15:53:38 2011
@@ -117,6 +117,9 @@ public final class RhinoJavaCompilerTest
         assertTrue(clazzBytes.length > 0);
     }
 
+    public void testCrossReferenceCompilation() throws Exception {
+        
+    }
 
 
 }

Modified: commons/proper/jci/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/pom.xml?rev=1072616&r1=1072615&r2=1072616&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/pom.xml (original)
+++ commons/proper/jci/trunk/core/pom.xml Sun Feb 20 15:53:38 2011
@@ -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>

Modified: commons/proper/jci/trunk/fam/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/fam/pom.xml?rev=1072616&r1=1072615&r2=1072616&view=diff
==============================================================================
--- commons/proper/jci/trunk/fam/pom.xml (original)
+++ commons/proper/jci/trunk/fam/pom.xml Sun Feb 20 15:53:38 2011
@@ -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>

Modified: commons/proper/jci/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/pom.xml?rev=1072616&r1=1072615&r2=1072616&view=diff
==============================================================================
--- commons/proper/jci/trunk/pom.xml (original)
+++ commons/proper/jci/trunk/pom.xml Sun Feb 20 15:53:38 2011
@@ -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>



Mime
View raw message