diff options
23 files changed, 46 insertions, 28 deletions
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties index e38ed090d..886f22e92 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties index 67aaf8681..ac97df461 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties index 133886f57..8217d8711 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties index 21288c0f6..d5ca4842e 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties index 699ac5e6e..915771b4f 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties index 1c7025e02..62a8867c6 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties @@ -13,4 +13,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties index 9b3763138..0be0e02c6 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties @@ -13,4 +13,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties index e53993f87..e8727f139 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties index bd6d85372..535d0464c 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties index b3af2d9a9..1f4b2124e 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties @@ -13,4 +13,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties index 7e0644e53..1d1719abb 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties index 02025cc52..f7756648d 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties index 6e91b4fa8..5a6de08b7 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties index 954ea31cf..3d403f28b 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties index 5b86455c4..35d2b91a1 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties index d4b31e39c..cc9606537 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties index 59a11583d..7d823c9ba 100644 --- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties @@ -13,4 +13,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties index 65771eca0..9aa04fa24 100644 --- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties @@ -13,4 +13,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties index ba5be155d..055258751 100644 --- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties @@ -13,4 +13,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20171108-0331 +binaryTag=v20210707-0624 diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java b/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java index f9a7eea6c..89f84d4ad 100644 --- a/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java +++ b/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java @@ -11,7 +11,9 @@ package thread.locktest; import org.eclipse.osgi.tests.bundles.AbstractBundleTests; -import org.osgi.framework.*; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; public class Activator implements BundleActivator, Runnable { @@ -20,7 +22,7 @@ public class Activator implements BundleActivator, Runnable { System.out.println("about to start thread"); thread.start(); System.out.println("about to join the thread"); - thread.join(10000); + thread.join(40000); System.out.println("after joining thread"); AbstractBundleTests.simpleResults.addEvent(new BundleEvent(BundleEvent.STARTED, context.getBundle())); } @@ -35,7 +37,7 @@ public class Activator implements BundleActivator, Runnable { new Class1(); long totalTime = System.currentTimeMillis() - startTime; System.out.println("loaded Class1 " + totalTime); - if (totalTime < 10000) + if (totalTime < 40000) AbstractBundleTests.simpleResults.addEvent(new Long(5000)); } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java index 5756be216..8cde21556 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java @@ -105,7 +105,7 @@ public final class ModuleContainer implements DebugOptionsListener { this.moduleDatabase = moduledataBase; this.frameworkWiring = new ContainerWiring(); this.frameworkStartLevel = new ContainerStartLevel(); - long tempModuleLockTimeout = 5; + long tempModuleLockTimeout = 30; String moduleLockTimeoutProp = adaptor.getProperty(EquinoxConfiguration.PROP_MODULE_LOCK_TIMEOUT); if (moduleLockTimeoutProp != null) { try { @@ -115,7 +115,7 @@ public final class ModuleContainer implements DebugOptionsListener { tempModuleLockTimeout = 1; } } catch (NumberFormatException e) { - // will default to 5 + // will default to 30 } } this.moduleLockTimeout = tempModuleLockTimeout; diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c index 6e6215d2d..0273c0817 100644 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -377,8 +377,12 @@ char * getJavaHome() { if (fp == NULL) { return NULL; } + path[0] = 0; while (fgets(path, sizeof(path)-1, fp) != NULL) { } + if(path[0]==0) { + return NULL; + } result = path; start = strchr(result, '\n'); if (start) { @@ -419,8 +423,12 @@ char * findVMLibrary( char* command ) { } } cmd = command; - if (strstr(cmd, "/JavaVM.framework/") != NULL && (strstr(cmd, "/Current/") != NULL || strstr(cmd, "/A/") != NULL)) { + if ((strstr(cmd, "/JavaVM.framework/") != NULL && (strstr(cmd, "/Current/") != NULL)) || strstr(cmd, "/A/") != NULL || strstr(cmd, "/usr/bin/java") != NULL ) { + //On Mac we have universal library at /usr/bin/java. But actual java is some where else. So if the path received is default path we need look for java home cmd = getJavaHome(); + if (cmd == NULL) { + return NULL; + } } // This is necessary to initialize isModularJVM checkJavaVersion(cmd); @@ -554,7 +562,15 @@ void restartLauncher(char* program, char* args[]) { JavaResults* launchJavaVM( _TCHAR* args[] ) { - /*for now always do JNI on Mac, should not come in here */ + /* + * On macOS, JNI is always used, so this point is only reached, if no usable JVM was found. + * Request a JDK install: The 'script' command makes stdin and stdout look like a tty, + * so it looks for /usr/libexec/java_home that this is for a command line tool and a dialog + * with a link to the JDK download page is shown. + */ + execl("/usr/bin/script", "/usr/bin/script", "/dev/null", "/usr/libexec/java_home", "--request", NULL); + + /* not reached. */ JavaResults * results = malloc(sizeof(JavaResults)); results->launchResult = -1; results->runResult = 0; diff --git a/features/org.eclipse.equinox.executable.feature/library/make_version.mak b/features/org.eclipse.equinox.executable.feature/library/make_version.mak index 2944bcb17..9a58aa9d6 100644 --- a/features/org.eclipse.equinox.executable.feature/library/make_version.mak +++ b/features/org.eclipse.equinox.executable.feature/library/make_version.mak @@ -10,5 +10,5 @@ #******************************************************************************* maj_ver=1 -min_ver=630 +min_ver=631 LIB_VERSION = $(maj_ver)$(min_ver) |