To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit 60e423b0 authored by Rui Chen's avatar Rui Chen
Browse files

[eclipse] remove the using for old jre

parent 0e9be76a
Pipeline #1736 failed with stage
......@@ -72,7 +72,7 @@
<include name="**/${workspace-full}.zip"/>
</fileset>
</unzip>
<!--Create two complimentary zips for default and large workspaces-->
<!-- Create two complimentary zips for default and large workspaces -->
<zip destfile="${bm-build-dir}/${workspace-default}.zip" basedir="${bm-build-dir}/eclipse-testing/workspace">
<patternset includesfile="${bm-files}/bundles-default.lst"/>
</zip>
......@@ -93,17 +93,14 @@
<!-- build the eclipse plugin, which is necessary to fire up eclipse from within our harness -->
<target name="plugin" depends="unpack">
<exec executable="${ant.home}/bin/ant" dir="${bm-files}/plugin" failonerror="yes">
<arg line="clean"/>
<arg line="-Dplugin.destination=${bm-build-dir}/eclipse/plugins/"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<exec executable="${ant.home}/bin/ant" dir="${bm-files}/plugin" failonerror="yes">
<arg line="build.update.jar"/>
<arg line="-Dplugin.destination=${bm-build-dir}/eclipse/plugins/"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<patch patchfile="${bm-files}/eclipse.patch" dir="${bm-build-dir}" strip="1"/>
<ant antfile="build.xml" dir="${bm-files}/plugin" inheritall="false">
<property name="plugin.destination" location="${bm-build-dir}/eclipse/plugins/"/>
<target name="clean"/>
<target name="build.update.jar"/>
</ant>
<!-- add our bundle to the configurator metadata -->
<patch patchfile="${bm-files}/eclipse.patch" dir="${bm-build-dir}" strip="0"/>
</target>
<!-- Create the eclipse data file -->
......@@ -118,7 +115,6 @@
<fileset dir="${bm-build-dir}" includesfile="${bm-files}/bundles-stub-required.lst"/>
</touch>
-->
<unzip dest="${bm-build-dir}/" src="${bm-data}/dummyjre.zip"/>
<!-- Install the test data -->
<zip destfile="${bm-dat}/${bm-name}.zip" basedir="${bm-build-dir}" excludes="eclipse/plugins/**">
......
--- eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info 2017-12-05 17:31:22.000000000 +1100
+++ ../bundles.info 2017-12-05 17:31:39.000000000 +1100
--- eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info 2018-01-31 13:19:02.458517071 +1100
+++ ../bundles.info 2018-01-31 13:13:35.066637554 +1100
@@ -27,6 +27,7 @@
org.apache.lucene.core,6.1.0.v20170814-1820,plugins/org.apache.lucene.core_6.1.0.v20170814-1820.jar,4,false
org.apache.lucene.misc,6.1.0.v20161115-1612,plugins/org.apache.lucene.misc_6.1.0.v20161115-1612.jar,4,false
......
......@@ -95,8 +95,6 @@ public class Eclipse extends Benchmark {
System.setProperty("osgi.install.area", "file:" + fileInScratch("eclipse/"));
System.setProperty("osgi.noShutdown", "true");
System.setProperty("osgi.framework", "file:" + fileInScratch(OSGI_BOOTSTRAP_JAR));
String current_working_dir = System.getProperty("user.dir");
System.setProperty("dacapo.local.jre", current_working_dir + "/" + fileInScratch("jre/lib/rt.jar"));
setJavaHomeIfRequired();
String[] args = new String[4];
......
......@@ -347,29 +347,23 @@ public abstract class FullSourceWorkspaceTests {
}
}
// Create lib entries for the JDKs
String jreLibPath = JavaCore.getClasspathVariable("JRE_LIB").toOSString();
String tempPath = System.getProperty("dacapo.local.jre");
String[] jdkLibs = Util.getJavaClassLibs();
int jdkLibsLength = jdkLibs.length;
IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength + 1];
IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength];
int jdkEntriesCount = 0;
for (int i = 0; i < jdkLibsLength; i++) {
if (!jdkLibs[i].equals(jreLibPath)) { // do not include JRE_LIB in
// additional JDK entries
jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(jdkLibs[i]), null, null);
}
}
jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(tempPath), null, null);
// Set classpaths (workaround bug 73253 Project references not set on
// project open)
ALL_PROJECTS = JavaCore.create(workspaceRoot).getJavaProjects();
int projectsLength = ALL_PROJECTS.length;
for (int i = 0; i < projectsLength; i++) {
String projectName = ALL_PROJECTS[i].getElementName();
if (BIG_PROJECT_NAME.equals(projectName))
......@@ -390,7 +384,6 @@ public abstract class FullSourceWorkspaceTests {
} catch (CoreException jme) {
// skip name collision as it means that JRE lib were already set on the
// classpath
System.out.println("errors in here");
if (jme.getStatus().getCode() != IJavaModelStatusConstants.NAME_COLLISION) {
throw jme;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment