diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 784a3a4..069bec6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,10 +16,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: Set up Maven uses: stCarolas/setup-maven@v5 diff --git a/Jenkinsfile b/Jenkinsfile index 9c97c32..5558390 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { USER = "jenkins" } tools { - jdk 'openjdk-jdk17-latest' + jdk 'temurin-jdk21-latest' } stages { stage('Prepare') { diff --git a/org.eclipse.corrosion.tests/.classpath b/org.eclipse.corrosion.tests/.classpath index 7f87f1f..b331c52 100644 --- a/org.eclipse.corrosion.tests/.classpath +++ b/org.eclipse.corrosion.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.corrosion.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.corrosion.tests/.settings/org.eclipse.jdt.core.prefs index a0c93c2..6760d47 100644 --- a/org.eclipse.corrosion.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.corrosion.tests/.settings/org.eclipse.jdt.core.prefs @@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -107,4 +107,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF b/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF index c682a90..b62af5b 100644 --- a/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Require-Bundle: org.opentest4j, org.eclipse.debug.ui;bundle-version="3.13.0", org.eclipse.jface.text;bundle-version="3.13.0", org.eclipse.cdt.dsf.gdb;bundle-version="5.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.corrosion/.classpath b/org.eclipse.corrosion/.classpath index 5508535..2d6b678 100644 --- a/org.eclipse.corrosion/.classpath +++ b/org.eclipse.corrosion/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.corrosion/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.corrosion/.settings/org.eclipse.jdt.core.prefs index 1567dbe..4abdbc6 100644 --- a/org.eclipse.corrosion/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.corrosion/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -112,4 +112,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.corrosion/META-INF/MANIFEST.MF b/org.eclipse.corrosion/META-INF/MANIFEST.MF index 2d7e0dd..3837206 100644 --- a/org.eclipse.corrosion/META-INF/MANIFEST.MF +++ b/org.eclipse.corrosion/META-INF/MANIFEST.MF @@ -41,7 +41,7 @@ Require-Bundle: org.eclipse.core.contenttype, org.eclipse.ecf;bundle-version="3.9.0", org.eclipse.ecf.filetransfer;bundle-version="5.1.0", org.eclipse.ecf.provider.filetransfer;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.corrosion;x-friends:="org.eclipse.corrosion.tests", org.eclipse.corrosion.edit;x-friends:="org.eclipse.corrosion.tests", diff --git a/repository/corrosion.product b/repository/corrosion.product index 71a5bc9..83fa22e 100644 --- a/repository/corrosion.product +++ b/repository/corrosion.product @@ -18,7 +18,7 @@ -showsplash org.eclipse.epp.package.common --launcher.defaultAction openFile - -Dosgi.requiredJavaVersion=17 + -Dosgi.requiredJavaVersion=21 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dsun.java.command=Eclipse -Xms256m diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index 884a1c5..0c6f3d6 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -45,5 +45,5 @@ - + \ No newline at end of file