From 3f7f280b28daaca1652f365c6f47b93bd7eeddb1 Mon Sep 17 00:00:00 2001
From: Ben Manes <ben.manes@gmail.com>
Date: Tue, 24 May 2022 15:30:03 -0700
Subject: [PATCH] Remove shadow plugin to avoid resolution problems (#716)

---
 .github/workflows/build.yml | 4 ++--
 caffeine/build.gradle       | 1 -
 gradle/coverage.gradle      | 8 +++++---
 gradle/dependencies.gradle  | 2 --
 gradle/jmh.gradle           | 5 -----
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 01f2f5bb94..5cf36f3c6e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ env:
   ALLOWED_ENDPOINTS: >
     1k4dacprodeus2file4.blob.core.windows.net:443
     artifactcache.actions.githubusercontent.com:443
-    artifacts.codacy.com:433
+    artifacts.codacy.com:443
     api.azul.com:443
     api.github.com:443
     caffeine.gradle-enterprise.cloud:443
@@ -252,7 +252,7 @@ jobs:
       - name: Harden Runner
         uses: step-security/harden-runner@248ae51c2e8cc9622ecf50685c8bf7150c6e8813
         with:
-          egress-policy: audit
+          egress-policy: block
           allowed-endpoints: ${{ env.ALLOWED_ENDPOINTS }}
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/caffeine/build.gradle b/caffeine/build.gradle
index 5d4aee0956..9ad20bf6ea 100644
--- a/caffeine/build.gradle
+++ b/caffeine/build.gradle
@@ -127,7 +127,6 @@ tasks.named('sourcesJar').configure {
   dependsOn generateLocalCaches, generateNodes
 }
 tasks.javadoc.mustRunAfter(compileCodeGenJava)
-tasks.shadowJar.mustRunAfter(compileCodeGenJava)
 
 tasks.withType(Test).configureEach {
   classpath += sourceSets.codeGen.runtimeClasspath
diff --git a/gradle/coverage.gradle b/gradle/coverage.gradle
index 2152b84e9e..413eafae59 100644
--- a/gradle/coverage.gradle
+++ b/gradle/coverage.gradle
@@ -37,9 +37,11 @@ tasks.register('jacocoFullReport', JacocoReport) {
   group = 'Coverage reports'
   description = 'Generates an aggregate report'
 
-  coveredProjects.each {
-    sourceSets it.sourceSets.main
-    mustRunAfter it.tasks.withType(Test)
+  allprojects { proj ->
+    mustRunAfter proj.tasks.withType(Test)
+  }
+  coveredProjects.each { proj ->
+    sourceSets proj.sourceSets.main
     executionData fileTree(rootDir.absolutePath).include("**/*${it.name}*/**/jacoco/*.exec")
   }
 
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 6479f9fc16..ccf0aaca5d 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -98,7 +98,6 @@ ext {
     nullaway: '1.3.0',
     pmd: '6.45.0',
     semanticVersioning: '1.1.0',
-    shadow: '7.1.2',
     snyke: '0.4',
     sonarqube: '3.3',
     spotbugs: '4.7.0',
@@ -222,7 +221,6 @@ ext {
     nullaway: "net.ltgt.gradle:gradle-nullaway-plugin:${pluginVersions.nullaway}",
     pmd: "net.sourceforge.pmd:pmd:${pluginVersions.pmd}",
     semanticVersioning: "io.ehdev:gradle-semantic-versioning:${pluginVersions.semanticVersioning}",
-    shadow: "gradle.plugin.com.github.johnrengelman:shadow:${pluginVersions.shadow}",
     snyke: "gradle.plugin.io.snyk.gradle.plugin:snyk:${pluginVersions.snyke}",
     sonarqube: "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:${pluginVersions.sonarqube}",
     spotbugs: "com.github.spotbugs:spotbugs:${pluginVersions.spotbugs}",
diff --git a/gradle/jmh.gradle b/gradle/jmh.gradle
index 1820c55b1b..9df6c67546 100644
--- a/gradle/jmh.gradle
+++ b/gradle/jmh.gradle
@@ -3,7 +3,6 @@
  */
 import org.gradle.plugins.ide.eclipse.model.Library
 
-apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'io.morethan.jmhreport'
 apply plugin: 'me.champeau.jmh'
 
@@ -33,10 +32,6 @@ tasks.named('jmh').configure {
   description = 'Executes a Java microbenchmark'
 }
 
-jmhJar {
-  mergeServiceFiles()
-}
-
 jmh {
   jmhVersion = versions.jmh