From 0efaa8f30c107beb904d37e2ad13913ae51f9e27 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 6 Dec 2018 11:43:10 +0000 Subject: [PATCH 2/2] Patch to use ASM 6 and Mockito 1 --- .../weaving/ClassfileTransformer.java | 4 +-- .../internal/builder/ReferenceExtractor.java | 10 +++--- .../internal/comparator/SignatureDecoder.java | 2 +- .../internal/model/TypeStructureBuilder.java | 10 +++--- .../org.eclipse.sdk.tests/feature.xml | 2 +- .../org.eclipse.test-feature/feature.xml | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../ThemeDefinitionChangedHandlerTest.java | 2 +- .../themes/StylingPreferencesHandlerTest.java | 4 +-- .../WorkbenchThemeChangedHandlerTest.java | 32 +++++++++---------- .../org.eclipse.ui.tests/META-INF/MANIFEST.MF | 2 +- 12 files changed, 39 insertions(+), 37 deletions(-) diff --git a/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java b/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java index 58657d1ec..6476bba63 100644 --- a/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java +++ b/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java @@ -24,10 +24,10 @@ public class ClassfileTransformer { private static final String STRATA_ID = "jdt"; //$NON-NLS-1$ /** max supported java class format major version, must match {@link #ASM_API} below **/ - public static final int MAX_CLASS_MAJOR = Opcodes.V11; + public static final int MAX_CLASS_MAJOR = Opcodes.V10; /** supported ASM API version, must match {@link #MAX_CLASS_MAJOR} above */ - private static final int ASM_API = Opcodes.ASM7; + private static final int ASM_API = Opcodes.ASM6; public byte[] transform(byte[] classfileBuffer, final String location) { diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java index e4d50336a..2fe807ba9 100644 --- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java +++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java @@ -82,7 +82,7 @@ public class ReferenceExtractor extends ClassVisitor { protected List references; public ClassFileSignatureVisitor() { - super(Opcodes.ASM7); + super(Opcodes.ASM6); this.references = new ArrayList<>(); } @@ -250,7 +250,7 @@ public class ReferenceExtractor extends ClassVisitor { * @param mv */ public ClassFileMethodVisitor(MethodVisitor mv, String name, int argumentcount) { - super(Opcodes.ASM7, mv); + super(Opcodes.ASM6, mv); this.argumentcount = argumentcount; this.linePositionTracker = new LinePositionTracker(); this.lastLineNumber = -1; @@ -634,7 +634,7 @@ public class ReferenceExtractor extends ClassVisitor { class ClassFileFieldVisitor extends FieldVisitor { ClassFileFieldVisitor() { - super(Opcodes.ASM7); + super(Opcodes.ASM6); } @Override @@ -990,7 +990,7 @@ public class ReferenceExtractor extends ClassVisitor { * {@link ReferenceModifiers} */ public ReferenceExtractor(IApiType type, Set collector, int referenceKinds) { - super(Opcodes.ASM7, new ClassNode()); + super(Opcodes.ASM6, new ClassNode()); fType = type; this.collector = collector; fReferenceKinds = referenceKinds; @@ -1007,7 +1007,7 @@ public class ReferenceExtractor extends ClassVisitor { * @param tracker */ protected ReferenceExtractor(IApiType type, Set collector, int referenceKinds, FieldTracker tracker) { - super(Opcodes.ASM7, new ClassNode()); + super(Opcodes.ASM6, new ClassNode()); fType = type; this.collector = collector; fReferenceKinds = referenceKinds; diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java index e6e38604e..490598b7b 100644 --- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java +++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java @@ -32,7 +32,7 @@ final class SignatureDecoder extends SignatureVisitor { SignatureDescriptor signatureDescriptor; public SignatureDecoder(SignatureDescriptor signatureDescriptor) { - super(Opcodes.ASM7); + super(Opcodes.ASM6); this.signatureDescriptor = signatureDescriptor; } diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java index 4ff1492e8..7dc03b6aa 100644 --- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java +++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java @@ -57,7 +57,7 @@ public class TypeStructureBuilder extends ClassVisitor { * unknown */ TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) { - super(Opcodes.ASM7, cv); + super(Opcodes.ASM6, cv); fComponent = component; fFile = file; } @@ -154,7 +154,7 @@ public class TypeStructureBuilder extends ClassVisitor { } } final ApiMethod method = fType.addMethod(name, desc, signature, laccess, names); - return new MethodVisitor(Opcodes.ASM7, + return new MethodVisitor(Opcodes.ASM6, super.visitMethod(laccess, name, desc, signature, exceptions)) { @Override public AnnotationVisitor visitAnnotation(String sig, boolean visible) { @@ -190,7 +190,7 @@ public class TypeStructureBuilder extends ClassVisitor { int traceCount = 0; public AnnotationDefaultVisitor(ApiMethod method) { - super(Opcodes.ASM7); + super(Opcodes.ASM6); this.method = method; } @@ -308,7 +308,7 @@ public class TypeStructureBuilder extends ClassVisitor { String typeName; public EnclosingMethodSetter(ClassVisitor cv, String typeName) { - super(Opcodes.ASM7, cv); + super(Opcodes.ASM6, cv); this.typeName = typeName.replace('.', '/'); } @@ -341,7 +341,7 @@ public class TypeStructureBuilder extends ClassVisitor { protected EnclosingMethodSetter setter; public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) { - super(Opcodes.ASM7, mv); + super(Opcodes.ASM6, mv); this.setter = enclosingMethodSetter; } diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml index f0dab84a3..ecef382ab 100644 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml @@ -24,7 +24,7 @@ - + diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml index 2a4871027..620359803 100644 --- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml @@ -24,7 +24,7 @@ - +