From d123dac946bbcabc18ad00971201bc9554bd7b39 Mon Sep 17 00:00:00 2001 From: Sebastian Ratz Date: Fri, 21 Jun 2024 16:30:39 +0100 Subject: [PATCH] Releng updates * Bump minimum Java version to Java 17 * Build against and require ADT 3.38 / Eclipse 2023-06 (oldest version requiring Java 17). * Use latest Maven version. * Build using latest Tycho 4.0.8. * Build using Java 21. * Run surefire tests with Java 17 based on maven toolchain. * Add explicit '-Dosgi.requiredJavaVersion=17' VM argument to stand- alone product. --- .github/workflows/ci.yml | 9 ++++++--- .github/workflows/create-release.yml | 6 +++--- README.md | 2 +- com.sap.adt.abapcleaner.app/abapcleaner.product | 4 +++- com.sap.adt.abapcleaner.gui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.sap.adt.abapcleaner.gui/META-INF/MANIFEST.MF | 12 ++++++------ com.sap.adt.abapcleaner/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.sap.adt.abapcleaner/META-INF/MANIFEST.MF | 6 +++--- pom.xml | 10 ++++++---- test/com.sap.adt.abapcleaner.test/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- 14 files changed, 41 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9fa1f13..57c579b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,18 +21,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v4 with: java-version: | - 11 17 + 21 + mvn-toolchain-id: | + JavaSE-17 + JavaSE-21 distribution: 'temurin' cache: maven - name: Set up Maven uses: stCarolas/setup-maven@v5 with: - maven-version: 3.9.6 + maven-version: 3.9.8 - name: Build with Maven run: mvn --batch-mode --fail-at-end clean verify - name: Upload Test Results diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 18299508..a939ba60 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -16,10 +16,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Build with Maven run: mvn --batch-mode clean package -DskipTests @@ -36,7 +36,7 @@ jobs: body: | We recommend using the ABAP cleaner **plug-in for ADT** (see [installation instructions](../../blob/main/README.md)), which cleans up your code directly from within ADT, and checks for updates automatically. If you nevertheless prefer to use the **stand-alone version** of ABAP cleaner (e.g. in order to use it with SAP GUI or from the command line), please - * make sure Java 17 or 11 (e.g. [SapMachine](https://sap.github.io/SapMachine/) or [Adoptium Temurin](https://adoptium.net/)) is installed on your system, and in the app 'Edit the system environment variables' (Windows), System variable 'Path' contains the path to the java.exe (e.g. C:\Program Files\SapMachine\JDK\17\bin) + * make sure Java 21 or 17 (e.g. [SapMachine](https://sap.github.io/SapMachine/) or [Adoptium Temurin](https://adoptium.net/)) is installed on your system, and in the app 'Edit the system environment variables' (Windows), System variable 'Path' contains the path to the java.exe (e.g. C:\Program Files\SapMachine\JDK\17\bin) * expand "Assets" below and download the archive for your operating system * extract the archive * on macOS: diff --git a/README.md b/README.md index 93313335..82dbdb24 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ To install and use the **ABAP cleaner plug-in for ABAP Development Tools** (ADT) (shortcuts *Ctrl + 4* or *Ctrl + Shift + 4*), see [usage](docs/usage.md). The **stand-alone version of ABAP cleaner** (for Windows, macOS or Linux) -requires Java 17 or 11 (e.g. [SapMachine](https://sap.github.io/SapMachine/) or [Adoptium Temurin](https://adoptium.net/)). +requires Java 21 or 17 (e.g. [SapMachine](https://sap.github.io/SapMachine/) or [Adoptium Temurin](https://adoptium.net/)). To install the stand-alone version, please download and extract the latest [Release](../../releases) and follow the installation instructions given there. diff --git a/com.sap.adt.abapcleaner.app/abapcleaner.product b/com.sap.adt.abapcleaner.app/abapcleaner.product index 9c8a5455..2033ae78 100644 --- a/com.sap.adt.abapcleaner.app/abapcleaner.product +++ b/com.sap.adt.abapcleaner.app/abapcleaner.product @@ -1,12 +1,14 @@ - + + -Dosgi.requiredJavaVersion=17 + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts diff --git a/com.sap.adt.abapcleaner.gui/.classpath b/com.sap.adt.abapcleaner.gui/.classpath index 1fde318a..efeb803f 100644 --- a/com.sap.adt.abapcleaner.gui/.classpath +++ b/com.sap.adt.abapcleaner.gui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.sap.adt.abapcleaner.gui/.settings/org.eclipse.jdt.core.prefs b/com.sap.adt.abapcleaner.gui/.settings/org.eclipse.jdt.core.prefs index 230c1b47..eaaa32b1 100644 --- a/com.sap.adt.abapcleaner.gui/.settings/org.eclipse.jdt.core.prefs +++ b/com.sap.adt.abapcleaner.gui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 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=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/com.sap.adt.abapcleaner.gui/META-INF/MANIFEST.MF b/com.sap.adt.abapcleaner.gui/META-INF/MANIFEST.MF index dfda0b86..daa242cd 100644 --- a/com.sap.adt.abapcleaner.gui/META-INF/MANIFEST.MF +++ b/com.sap.adt.abapcleaner.gui/META-INF/MANIFEST.MF @@ -5,10 +5,10 @@ Bundle-SymbolicName: com.sap.adt.abapcleaner.gui;singleton:=true Bundle-Version: 1.16.3.qualifier Bundle-Vendor: %Provider-Name Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Eclipse-ExtensibleAPI: true -Require-Bundle: com.sap.adt.abapcleaner;bundle-version="0.0.0", +Require-Bundle: com.sap.adt.abapcleaner;bundle-version="1.16.3", org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.core.expressions, @@ -19,10 +19,10 @@ Require-Bundle: com.sap.adt.abapcleaner;bundle-version="0.0.0", org.eclipse.ui.ide, org.eclipse.ui.workbench, org.eclipse.ui.workbench.texteditor, - com.sap.adt.util.ui, - com.sap.adt.tools.core.ui, - com.sap.adt.tools.abapsource, - com.sap.adt.tools.abapsource.ui + com.sap.adt.util.ui;bundle-version="3.38.2", + com.sap.adt.tools.core.ui;bundle-version="3.38.2", + com.sap.adt.tools.abapsource;bundle-version="3.38.2", + com.sap.adt.tools.abapsource.ui;bundle-version="3.38.2" Automatic-Module-Name: com.sap.adt.abapcleaner.gui Import-Package: com.sap.adt.tools.abapsource.parser.padfileresolver.internal, com.sap.rnd.rndrt diff --git a/com.sap.adt.abapcleaner/.classpath b/com.sap.adt.abapcleaner/.classpath index 1fde318a..efeb803f 100644 --- a/com.sap.adt.abapcleaner/.classpath +++ b/com.sap.adt.abapcleaner/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.sap.adt.abapcleaner/.settings/org.eclipse.jdt.core.prefs b/com.sap.adt.abapcleaner/.settings/org.eclipse.jdt.core.prefs index 230c1b47..eaaa32b1 100644 --- a/com.sap.adt.abapcleaner/.settings/org.eclipse.jdt.core.prefs +++ b/com.sap.adt.abapcleaner/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 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=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/com.sap.adt.abapcleaner/META-INF/MANIFEST.MF b/com.sap.adt.abapcleaner/META-INF/MANIFEST.MF index 0c848e1e..cdcc9b16 100644 --- a/com.sap.adt.abapcleaner/META-INF/MANIFEST.MF +++ b/com.sap.adt.abapcleaner/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: com.sap.adt.abapcleaner;singleton:=true Bundle-Version: 1.16.3.qualifier Bundle-Vendor: %Provider-Name Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Eclipse-ExtensibleAPI: true -Require-Bundle: com.sap.rnd.rndrt;bundle-version="1.92.0", - com.sap.adt.tools.abapsource.parser;bundle-version="3.16.1", +Require-Bundle: com.sap.rnd.rndrt;bundle-version="1.108.0", + com.sap.adt.tools.abapsource.parser;bundle-version="3.38.2", org.eclipse.jface.text, org.eclipse.core.runtime Export-Package: com.sap.adt.abapcleaner.base, diff --git a/pom.xml b/pom.xml index bfa11c10..5ccc7a03 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,10 @@ test - 3.0.1 + 4.0.8 UTF-8 - JavaSE-11 + JavaSE-17 + 17 @@ -72,6 +73,7 @@ ${tycho-version} false + BREE @@ -86,12 +88,12 @@ eclipse - https://download.eclipse.org/releases/2022-12 + https://download.eclipse.org/releases/2023-06 p2 adt - https://tools.hana.ondemand.com/2022-12 + https://tools.hana.ondemand.com/2023-06 p2 diff --git a/test/com.sap.adt.abapcleaner.test/.classpath b/test/com.sap.adt.abapcleaner.test/.classpath index 4a00becd..3628e336 100644 --- a/test/com.sap.adt.abapcleaner.test/.classpath +++ b/test/com.sap.adt.abapcleaner.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/test/com.sap.adt.abapcleaner.test/.settings/org.eclipse.jdt.core.prefs b/test/com.sap.adt.abapcleaner.test/.settings/org.eclipse.jdt.core.prefs index a58ebdca..9478cb16 100644 --- a/test/com.sap.adt.abapcleaner.test/.settings/org.eclipse.jdt.core.prefs +++ b/test/com.sap.adt.abapcleaner.test/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 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=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/test/com.sap.adt.abapcleaner.test/META-INF/MANIFEST.MF b/test/com.sap.adt.abapcleaner.test/META-INF/MANIFEST.MF index 46069fcd..95d9550c 100644 --- a/test/com.sap.adt.abapcleaner.test/META-INF/MANIFEST.MF +++ b/test/com.sap.adt.abapcleaner.test/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: com.sap.adt.abapcleaner.test;singleton:=true Bundle-Version: 1.16.3.qualifier Bundle-Vendor: abap-dev Fragment-Host: com.sap.adt.abapcleaner -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.junit.jupiter.api;version="5.7.1" Automatic-Module-Name: com.sap.adt.abapcleaner.test