Fixed JENKINS-19383.

"ldc <class>" is only valid after JavaSE 5, so the class file needs to have that version number
jenkinsci · Oct 25, 2013 · c854abb · c854abb
1 parent 9deadd5
commit c854abb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,14 +27,23 @@
                 <mkdir dir="target/test-classes/v2" />
                 <mkdir dir="target/test-classes/client" />
 
+                <path id="lib">
+                  <fileset dir="target/lib" includes="*.jar" />
+                </path>
+
                 <!-- basic sanity. unmodified client and v1 should work as expected -->
-                <javac source="1.6" target="1.6" debug="true" srcdir="src/test/v1" destdir="target/test-classes/v1" />
+                <javac source="1.6" target="1.6" debug="true" srcdir="src/test/v1" destdir="target/test-classes/v1">
+                  <classpath>
+                    <path refid="lib" />
+                  </classpath>
+                </javac>
                 <javac source="1.6" target="1.6" debug="true" srcdir="src/test/client" destdir="target/test-classes/client">
                   <classpath>
                     <pathelement path="target/classes" />
                     <pathelement path="target/test-classes/v1" />
                     <path refid="maven.compile.classpath" />
                     <path refid="maven.test.classpath" />
+                    <path refid="lib" />
                   </classpath>
                 </javac>
 
@@ -43,6 +52,7 @@
                   <classpath>
                     <path refid="maven.compile.classpath" />
                     <pathelement path="target/classes" />
+                    <path refid="lib" />
                   </classpath>
                 </javac>
               </tasks>
@@ -76,7 +86,7 @@
                   <groupId>org.apache.ivy</groupId>
                   <artifactId>ivy</artifactId>
                   <version>2.3.0</version>
-                  <outputDirectory>target</outputDirectory>
+                  <outputDirectory>target/lib</outputDirectory>
                   <destFileName>ivy.jar</destFileName>
                 </artifactItem>
               </artifactItems>

diff --git a/src/main/java/org/jenkinsci/bytecode/Transformer.java b/src/main/java/org/jenkinsci/bytecode/Transformer.java
@@ -67,6 +67,11 @@ public byte[] transform(final String className, byte[] image) {
         final boolean[] modified = new boolean[1];
 
         cr.accept(new ClassAdapter(cw) {
+            @Override
+            public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+                super.visit(Math.max(version,49), access, name, signature, superName, interfaces);
+            }
+
             @Override
             public MethodVisitor visitMethod(int access, final String methodName, final String methodDescriptor, String methodSignature, String[] exceptions) {
                 final MethodVisitor base = super.visitMethod(access, methodName, methodDescriptor, methodSignature, exceptions);

diff --git a/src/test/java/CompatibilityTest.java b/src/test/java/CompatibilityTest.java
@@ -39,11 +39,14 @@ private void assertFieldType(Class<?> i, Class<?> type, String name) throws NoSu
     private AntClassLoader createClassLoader(String v) throws IOException {
         final Transformer t = new Transformer();
         AntClassLoader cl = new AntClassLoader() {
+            final File outputDir = new File("target/modified-classes");
             @Override
             protected Class<?> defineClassFromData(File container, byte[] classData, String classname) throws IOException {
                 byte[] rewritten = t.transform(classname, classData);
                 if (rewritten!=classData) {
-                    FileUtils.writeByteArrayToFile(new File(classname+".class"),rewritten);
+                    File dst = new File(outputDir,classname.replace('.','/')+".class");
+                    dst.getParentFile().mkdirs();
+                    FileUtils.writeByteArrayToFile(dst,rewritten);
                     System.out.println("Modified "+classname);
                 }
                 return super.defineClassFromData(container, rewritten, classname);
@@ -52,7 +55,7 @@ protected Class<?> defineClassFromData(File container, byte[] classData, String
 
         cl.addPathComponent(new File("target/test-classes/"+ v));
         cl.addPathComponent(new File("target/test-classes/client"));
-        cl.addPathComponent(new File("target/ivy.jar"));
+        cl.addPathComponent(new File("target/lib/ivy.jar"));
 
         t.loadRules(cl);