Author: sebb
Date: Mon Aug 19 18:48:26 2013
New Revision: 1515555
URL: http://svn.apache.org/r1515555
Log:
javac can now use asm/asm/3.3.1
Modified:
commons/proper/jci/trunk/compilers/javac/pom.xml
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
commons/proper/jci/trunk/core/pom.xml
commons/proper/jci/trunk/pom.xml
Modified: commons/proper/jci/trunk/compilers/javac/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/pom.xml?rev=1515555&r1=1515554&r2=1515555&view=diff
==============================================================================
--- commons/proper/jci/trunk/compilers/javac/pom.xml (original)
+++ commons/proper/jci/trunk/compilers/javac/pom.xml Mon Aug 19 18:48:26 2013
@@ -41,10 +41,8 @@
<artifactId>dependency</artifactId>
</dependency>
<dependency>
- <!-- javac needs 2.2.3; core(test) is OK with 3.3.1 -->
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>2.2.3</version>
</dependency>
<!-- test dependencies -->
<dependency>
Modified:
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java?rev=1515555&r1=1515554&r2=1515555&view=diff
==============================================================================
---
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
(original)
+++
commons/proper/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
Mon Aug 19 18:48:26 2013
@@ -106,7 +106,7 @@ public final class JavacClassLoader exte
if (name.startsWith("com.sun.tools.javac.")) {
final InputStream classStream =
getResourceAsStream(name.replace('.', '/') + ".class");
- final ClassWriter renamedCw = new ClassWriter(true, false);
+ final ClassWriter renamedCw = new
ClassWriter(ClassWriter.COMPUTE_MAXS);
new ClassReader(classStream).accept(new RenamingVisitor(new
CheckClassAdapter(renamedCw), new ResourceRenamer() {
public String getNewNameFor(final String pOldName) {
if
(pOldName.startsWith(FileOutputStream.class.getName())) {
@@ -117,7 +117,7 @@ public final class JavacClassLoader exte
}
return pOldName;
}
- }), false);
+ }), 0); // We don't set ClassReader.SKIP_DEBUG
classBytes = renamedCw.toByteArray();
Modified: commons/proper/jci/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/pom.xml?rev=1515555&r1=1515554&r2=1515555&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/pom.xml (original)
+++ commons/proper/jci/trunk/core/pom.xml Mon Aug 19 18:48:26 2013
@@ -47,8 +47,6 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <!-- Needs different version from javac currently -->
- <version>3.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: commons/proper/jci/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/pom.xml?rev=1515555&r1=1515554&r2=1515555&view=diff
==============================================================================
--- commons/proper/jci/trunk/pom.xml (original)
+++ commons/proper/jci/trunk/pom.xml Mon Aug 19 18:48:26 2013
@@ -286,6 +286,12 @@
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
+ <dependency>
+ <!-- javac (compile); core(test) -->
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.3.1</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
