Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
}
tools {
maven 'apache-maven-latest'
jdk 'openjdk-jdk27-latest'
jdk 'openjdk-jdk28-latest'
}
environment {
NON_MODULAR_JAVA_HOME = tool(type:'jdk', name:'temurin-jdk8-latest')
Expand All @@ -21,7 +21,7 @@ pipeline {
xvnc(useXauthority: true) {
sh """
mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-Ptest-on-javase-27 -Pbree-libs -Papi-check -Pjavadoc\
-Ptest-on-javase-28 -Pbree-libs -Papi-check -Pjavadoc\
-Dmaven.test.failure.ignore=true\
-Dcompare-version-with-baselines.skip=false \
-Dproject.build.sourceEncoding=UTF-8 \
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
Bundle-Version: 3.12.1050.qualifier
Bundle-Version: 3.12.1100.qualifier
Bundle-ClassPath: javadebugtests.jar
Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
Bundle-Vendor: %providerName
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.jdt.debug.tests/build.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2003, 2024 IBM Corporation and others.
# Copyright (c) 2003, 2026 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -28,7 +28,7 @@ bin.includes = plugin.xml,\
java16_/,\
java23/,\
java24/,\
java27/,\
java28/,\
multirelease/
source.javadebugtests.jar = test plugin/,\
tests/,\
Expand Down
7 changes: 0 additions & 7 deletions org.eclipse.jdt.debug.tests/java27/Main2.java

This file was deleted.

3 changes: 3 additions & 0 deletions org.eclipse.jdt.debug.tests/java28/Main2.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
void main() {
IO.print("test");
}
28 changes: 27 additions & 1 deletion org.eclipse.jdt.debug.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.tests</artifactId>
<version>3.12.1050-SNAPSHOT</version>
<version>3.12.1100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<testSuite>${project.artifactId}</testSuite>
Expand Down Expand Up @@ -169,5 +169,31 @@
</plugins>
</build>
</profile>
<profile>
<id>test-on-javase-28</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>toolchain</goal>
</goals>
</execution>
</executions>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-28</id>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2025 IBM Corporation and others.
* Copyright (c) 2000, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -8,6 +8,10 @@
*
* SPDX-License-Identifier: EPL-2.0
*
* This is an implementation of an early-draft specification developed under the Java
* Community Process (JCP) and is made available for testing and evaluation purposes
* only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* IBM Corporation - initial API and implementation
* Jesper S. Møller - bug 422029: [1.8] Enable debug evaluation support for default methods
Expand Down Expand Up @@ -71,7 +75,7 @@ public class JavaProjectHelper {
public static final String JAVA_SE_25_EE_NAME = "JavaSE-25";
public static final String JAVA_SE_26_EE_NAME = "JavaSE-26";
public static final String JAVA_SE_27_EE_NAME = "JavaSE-27";

public static final String JAVA_SE_28_EE_NAME = "JavaSE-28";
/**
* path to the test src for 'testprograms'
*/
Expand Down Expand Up @@ -124,6 +128,11 @@ public class JavaProjectHelper {
*/
public static final IPath TEST_27_SRC_DIR = new Path("java27");

/**
* path to the 28 test source
*/
public static final IPath TEST_28_SRC_DIR = new Path("java28");

/**
* path to the multirelease test source
*/
Expand Down Expand Up @@ -253,6 +262,15 @@ public static boolean isJava27_Compatible() {
return isCompatible(27);
}

/**
* Returns if the currently running VM is version compatible with Java 28
*
* @return <code>true</code> if a Java 28 (or greater) VM is running <code>false</code> otherwise
*/
public static boolean isJava28_Compatible() {
return isCompatible(28);
}

/**
* Returns if the current running system is compatible with the given Java minor version
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
*
* SPDX-License-Identifier: EPL-2.0
*
* This is an implementation of an early-draft specification developed under the Java
* Community Process (JCP) and is made available for testing and evaluation purposes
* only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* IBM Corporation - initial API and implementation
* Jesper Steen Møller - bug 422029: [1.8] Enable debug evaluation support for default methods
Expand Down Expand Up @@ -196,6 +200,7 @@ public abstract class AbstractDebugTest extends TestCase implements IEvaluation
public static final String TWENTYFIVE_PROJECT_NAME = "Two_Five";
public static final String TWENTYSIX_PROJECT_NAME = "Two_Six";
public static final String TWENTYSEVEN_PROJECT_NAME = "Two_Seven";
public static final String TWENTYEIGHT_PROJECT_NAME = "Two_Eight";
public static final String BOUND_JRE_PROJECT_NAME = "BoundJRE";
public static final String MR_PROJECT_NAME = "MR";
public static final String CLONE_SUFFIX = "Clone";
Expand Down Expand Up @@ -262,6 +267,7 @@ public abstract class AbstractDebugTest extends TestCase implements IEvaluation
private static boolean loaded25 = false;
private static boolean loaded26 = false;
private static boolean loaded27 = false;
private static boolean loaded28 = false;
private static boolean loadedEE = false;
private static boolean loadedJRE = false;
private static boolean loadedMulti = false;
Expand Down Expand Up @@ -858,6 +864,37 @@ synchronized void assert27Project() {
handleProjectCreationException(e, TWENTYSEVEN_PROJECT_NAME, jp);
}
}

synchronized void assert28Project() {
IJavaProject jp = null;
ArrayList<ILaunchConfiguration> cfgs = new ArrayList<>(1);
try {
if (!loaded28) {
jp = createProject(TWENTYEIGHT_PROJECT_NAME, JavaProjectHelper.TEST_28_SRC_DIR.toString(), JavaProjectHelper.JAVA_SE_28_EE_NAME, false);
jp.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.DISABLED);
jp.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_28);
jp.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_28);
jp.setOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_28);
cfgs.add(createLaunchConfiguration(jp, "Main1"));
cfgs.add(createLaunchConfiguration(jp, "Main2"));
loaded28 = true;
waitForBuild();
assertNoErrorMarkersExist(jp.getProject());
}
} catch (Exception e) {
try {
if (jp != null) {
jp.getProject().delete(true, true, null);
for (int i = 0; i < cfgs.size(); i++) {
cfgs.get(i).delete();
}
}
} catch (CoreException ce) {
// ignore
}
handleProjectCreationException(e, TWENTYEIGHT_PROJECT_NAME, jp);
}
}
/**
* Creates the 'BoundJRE' project used for the JRE testing
*/
Expand Down Expand Up @@ -1214,6 +1251,16 @@ protected IJavaProject get27Project() {
return getJavaProject(TWENTYSEVEN_PROJECT_NAME);
}

/**
* Returns the 'Two_Eight' project, used for Java 27 tests.
*
* @return the test project
*/
protected IJavaProject get28Project() {
assert28Project();
return getJavaProject(TWENTYEIGHT_PROJECT_NAME);
}

/**
* Returns the 'BoundJRE' project
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
*
* SPDX-License-Identifier: EPL-2.0
*
* This is an implementation of an early-draft specification developed under the Java
* Community Process (JCP) and is made available for testing and evaluation purposes
* only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* IBM Corporation - initial API and implementation
* SAP SE - Support hyperlinks for stack entries with method signature
Expand Down Expand Up @@ -210,7 +214,7 @@ public AutomatedSuite() {
addTest(new TestSuite(ConfigurationEncodingTests.class));
addTest(new TestSuite(LaunchConfigurationManagerTests.class));
addTest(new TestSuite(LaunchConfigurationTests.class));
if (JavaProjectHelper.isJava27_Compatible()) {
if (JavaProjectHelper.isJava28_Compatible()) {
addTest(new TestSuite(InstanceMainMethodsTests.class));
}
addTest(new TestSuite(ProjectClasspathVariableTests.class));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
*
* SPDX-License-Identifier: EPL-2.0
*
* This is an implementation of an early-draft specification developed under the Java
* Community Process (JCP) and is made available for testing and evaluation purposes
* only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* Red Hat Inc. - initial implementation
*******************************************************************************/
Expand All @@ -28,7 +32,7 @@ public InstanceMainMethodsTests(String name) {

@Override
protected IJavaProject getProjectContext() {
return super.get27Project();
return super.get28Project();
}

public void testStaticMainWithoutArgs() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
*
* SPDX-License-Identifier: EPL-2.0
*
* This is an implementation of an early-draft specification developed under the Java
* Community Process (JCP) and is made available for testing and evaluation purposes
* only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* IBM Corporation - initial API and implementation
*
Expand Down Expand Up @@ -102,7 +106,7 @@ public class ExecutionEnvironmentAnalyzer implements IExecutionEnvironmentAnalyz
mappings.put(JavaSE_1_8, new String[] { JavaSE_1_7 });
mappings.put(JavaSE_9, new String[] { JavaSE_1_8 });
mappings.put(JavaSE_10, new String[] { JavaSE_9 });
mappings.put(JavaSE_10_Plus, new String[] { JavaSE_27 });
mappings.put(JavaSE_10_Plus, new String[] { JavaSE_28 });
mappings.put(JavaSE_11, new String[] { JavaSE_10 });
mappings.put(JavaSE_12, new String[] { JavaSE_11 });
mappings.put(JavaSE_13, new String[] { JavaSE_12 });
Expand Down
Loading