diff options
| author | Noopur Gupta | 2018-09-25 10:27:26 +0000 |
|---|---|---|
| committer | Noopur Gupta | 2018-09-25 12:33:58 +0000 |
| commit | 28563f7d4fa0e45e041d01f7321fbafdba772df3 (patch) | |
| tree | 9e1f2838d318b54ce5321c0c277ba8ec4feec4a4 | |
| parent | 05927ec282ef823f129e069acb5e5c3d609a8ebd (diff) | |
| download | eclipse.jdt.ui-28563f7d4fa0e45e041d01f7321fbafdba772df3.tar.gz eclipse.jdt.ui-28563f7d4fa0e45e041d01f7321fbafdba772df3.tar.xz eclipse.jdt.ui-28563f7d4fa0e45e041d01f7321fbafdba772df3.zip | |
Bug 539240: [JUnit] Classes from modules java.xml.ws and java.xml.bindI20180925-1800
are not found
Change-Id: I6ca7069adc39a22719f4555d513cea6b23cfa700
3 files changed, 8 insertions, 8 deletions
diff --git a/org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF index ab748c9629..dc466f3f92 100644 --- a/org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.junit.core Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.junit.core;singleton:=true -Bundle-Version: 3.10.100.qualifier +Bundle-Version: 3.10.200.qualifier Bundle-Activator: org.eclipse.jdt.internal.junit.JUnitCorePlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.jdt.junit.core/pom.xml b/org.eclipse.jdt.junit.core/pom.xml index b8314db447..d7bd76f8f5 100644 --- a/org.eclipse.jdt.junit.core/pom.xml +++ b/org.eclipse.jdt.junit.core/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012, 2016 Eclipse Foundation and others. + Copyright (c) 2012, 2018 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.junit.core</artifactId> - <version>3.10.100-SNAPSHOT</version> + <version>3.10.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationDelegate.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationDelegate.java index be3bd28559..189afe4e7a 100644 --- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationDelegate.java +++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationDelegate.java @@ -220,17 +220,17 @@ public class JUnitLaunchConfigurationDelegate extends AbstractJavaLaunchConfigur runConfig.setWorkingDirectory(workingDirName); runConfig.setVMSpecificAttributesMap(vmAttributesMap); - if (JavaRuntime.isModularProject(javaProject)) { - // modulepath + if (!JavaRuntime.isModularConfiguration(configuration)) { + // Bootpath + runConfig.setBootClassPath(getBootpath(configuration)); + } else { + // module path runConfig.setModulepath(modulepath); if (!configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_MODULE_CLI_OPTIONS, true)) { runConfig.setOverrideDependencies(configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MODULE_CLI_OPTIONS, "")); //$NON-NLS-1$ } else { runConfig.setOverrideDependencies(getModuleCLIOptions(configuration)); } - } else { - // Bootpath - runConfig.setBootClassPath(getBootpath(configuration)); } // check for cancellation |