From fa3ce68cdfb8d0a3a494505077f7e14ac5a97a09 Mon Sep 17 00:00:00 2001 From: Frank Vennemeyer Date: Sun, 6 Jun 2021 12:21:05 +0200 Subject: [PATCH 1/2] :Revert "Use openjdk:8.0 for all the p2asmaven fatjar tasks." This reverts commit 56cce95d19e36914b3b439b2f777fe55c8618968. --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bfee17d9a9..67e9313838 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -223,8 +223,6 @@ jobs: command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true :eclipse-jdt:changelogPush -Prelease=true --stacktrace ext_do_release_cdt: << : *env_gradle - docker: - - image: cimg/openjdk:8.0 steps: - checkout - *restore_cache_wrapper @@ -235,8 +233,6 @@ jobs: command: ./gradlew -Pcom.diffplug.spotless.include.ext.cdt=true :eclipse-cdt:changelogPush -Prelease=true --stacktrace ext_do_release_groovy: << : *env_gradle - docker: - - image: cimg/openjdk:8.0 steps: - checkout - *restore_cache_wrapper @@ -247,8 +243,6 @@ jobs: command: ./gradlew -Pcom.diffplug.spotless.include.ext.groovy=true :eclipse-groovy:changelogPush -Prelease=true --stacktrace ext_do_release_wtp: << : *env_gradle - docker: - - image: cimg/openjdk:8.0 steps: - checkout - *restore_cache_wrapper From 97f097772cad3fd361212ae1687ad67ee9362934 Mon Sep 17 00:00:00 2001 From: Frank Vennemeyer Date: Sun, 6 Jun 2021 12:28:44 +0200 Subject: [PATCH 2/2] Use p2asmaven version compatible with openjdk:11 (fixes #873) --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 0bd944d8ef..a96d1ee216 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,7 @@ pluginManagement { // 5.6.0+ Tried to add format named 'freshmark' of type class @ spotless-freshmark.gradle:55 id 'com.diffplug.spotless' version '5.5.0' // https://github.com/diffplug/goomph/blob/main/CHANGES.md - id 'com.diffplug.eclipse.resourcefilters' version '3.29.1' + id 'com.diffplug.eclipse.resourcefilters' version '3.27.0' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish id 'com.gradle.plugin-publish' version '0.14.0' // https://github.com/gradle-nexus/publish-plugin/releases