Submodule eclipse.jdt.debug contains modified content 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 ec9788a9f..d7914d1ac 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 @@ -25,10 +25,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.V12; + 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) { Submodule eclipse.pde.ui contains modified content 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 e6d64cf8dc..39b6182e8d 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; @@ -635,7 +635,7 @@ public class ReferenceExtractor extends ClassVisitor { class ClassFileFieldVisitor extends FieldVisitor { ClassFileFieldVisitor() { - super(Opcodes.ASM7); + super(Opcodes.ASM6); } @Override @@ -991,7 +991,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; @@ -1008,7 +1008,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 e6e38604eb..490598b7b9 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 4ff1492e86..7dc03b6aa4 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; } Submodule eclipse.platform.ui contains modified content diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF index eb08f62a5d..c11656359b 100644 --- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF +++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF @@ -10,8 +10,9 @@ Require-Bundle: org.junit, org.w3c.css.sac, org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1", org.eclipse.ui;bundle-version="3.106.0", + org.hamcrest.core;bundle-version="1.3.0", org.hamcrest.library;bundle-version="1.3.0", - org.mockito;bundle-version="2.13.0", + org.mockito.mockito-core, org.eclipse.equinox.preferences;bundle-version="3.5.200", org.eclipse.ui.forms, org.eclipse.ui.views.properties.tabbed diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF index 19458ab029..986226a097 100644 --- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF +++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF @@ -31,8 +31,9 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0", org.eclipse.core.expressions;bundle-version="3.4.200", org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0", org.eclipse.e4.ui.css.swt;bundle-version="0.11.0", + org.hamcrest.core;bundle-version="1.3.0", org.hamcrest.library;bundle-version="1.3.0", - org.mockito;bundle-version="2.13.0", + org.mockito.mockito-core, org.eclipse.e4.ui.css.core;bundle-version="0.10.100", org.eclipse.test.performance;bundle-version="3.13.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java index 6d98e184d3..7def31d02c 100644 --- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java +++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java @@ -16,7 +16,7 @@ package org.eclipse.e4.ui.workbench.renderers.swt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java index 99654e3845..07facbb824 100644 --- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java +++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.ui.tests.themes; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java index 5c6d765a76..fa59d14187 100644 --- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java +++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java @@ -15,10 +15,10 @@ package org.eclipse.ui.tests.themes; import static org.eclipse.ui.internal.themes.WorkbenchThemeManager.EMPTY_COLOR_VALUE; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -102,11 +102,11 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase { verify(colorRegistry, times(1)).put(eq("colorDefinition"), any(RGB.class)); verify(colorRegistry, times(1)).put(eq("colorDefinition"), eq(EMPTY_COLOR_VALUE)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition1), any(IPreferenceStore.class)); verify(handler, never()).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition2), any(IPreferenceStore.class)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition), any(IPreferenceStore.class)); verify(stylingEngine, times(1)).style(fontDefinition2); @@ -165,22 +165,22 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase { //then verify(stylingEngine, times(1)).style(fontDefinition1); verify(fontRegistry, times(1)).put("fontDefinition1", null); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition1), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition1), any(IPreferenceStore.class)); verify(stylingEngine, times(1)).style(fontDefinition2); verify(fontRegistry, never()).put(eq("fontDefinition2"), any(FontData[].class)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition2), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition2), any(IPreferenceStore.class)); verify(stylingEngine, times(1)).style(colorDefinition1); verify(colorRegistry, never()).put(eq("colorDefinition1"), any(RGB.class)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition1), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition1), any(IPreferenceStore.class)); verify(stylingEngine, times(1)).style(colorDefinition2); verify(colorRegistry, times(1)).put("colorDefinition2", null); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition2), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition2), any(IPreferenceStore.class)); } @@ -227,9 +227,9 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase { verify(colorRegistry, times(1)).put("colorDefinition", null); assertEquals(1, themeRegistry.getColors().length); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition), any(IPreferenceStore.class)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition), any(IPreferenceStore.class)); verify(handler, times(1)).resetThemeRegistries(themeRegistry, fontRegistry, colorRegistry); @@ -297,13 +297,13 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase { verify(colorRegistry, times(1)).put(eq("colorDefinition2"), any(RGB.class)); verify(colorRegistry, times(1)).put(eq("colorDefinition2"), eq(EMPTY_COLOR_VALUE)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition1), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition1), any(IPreferenceStore.class)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition2), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition2), any(IPreferenceStore.class)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition1), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition1), any(IPreferenceStore.class)); - verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition2), + verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition2), any(IPreferenceStore.class)); verify(handler, times(1)).resetThemeRegistries(themeRegistry, fontRegistry, colorRegistry); diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF index 45c025610f..484f3a0092 100644 --- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF +++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF @@ -44,7 +44,7 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.osgi.services;bundle-version="3.3.100", org.hamcrest.core;bundle-version="1.3.0", org.hamcrest.library;bundle-version="1.3.0", - org.mockito;bundle-version="2.13.0" + org.mockito.mockito-core Import-Package: javax.annotation Eclipse-AutoStart: true Export-Package: org.eclipse.ui.tests.api, 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 5514138f..ac5c0ee4 100644 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml @@ -23,7 +23,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 d4728693..297e1031 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 @@ - +