From 86dd602c9dbbd991e0769d8d66a1a2eff1523fd3 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 (fixes
 #716)

---
 .github/workflows/build.yml |  6 ++++--
 caffeine/build.gradle       |  1 -
 gradle/coverage.gradle      | 24 +++++++++++++-----------
 gradle/dependencies.gradle  |  2 --
 gradle/jmh.gradle           |  5 -----
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 01f2f5bb94..e2f5b4c3d3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,8 +8,9 @@ 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.codacy.com:443
     api.github.com:443
     caffeine.gradle-enterprise.cloud:443
     cdn.azul.com:443
@@ -25,6 +26,7 @@ env:
     guava.dev:443
     lightbend.github.io:443
     nodejs.org:443
+    objects.githubusercontent.com:443
     oss.sonatype.org:443
     pipelines.actions.githubusercontent.com:443
     plugins.gradle.org:443
@@ -252,7 +254,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..82bd6b87a7 100644
--- a/gradle/coverage.gradle
+++ b/gradle/coverage.gradle
@@ -3,10 +3,7 @@
  */
 apply plugin: 'com.github.kt3k.coveralls'
 apply plugin: 'jacoco'
-
-allprojects {
-  apply plugin: 'org.sonarqube'
-}
+apply plugin: 'java'
 
 def testReport = tasks.register('testReport', TestReport) {
   group = 'Build'
@@ -33,14 +30,14 @@ subprojects {
 // Only report code coverage for projects that are distributed
 def coveredProjects = [ 'caffeine', 'guava', 'jcache' ].collect { project(it) }
 
-tasks.register('jacocoFullReport', JacocoReport) {
+def jacocoFullReport = tasks.register('jacocoFullReport', JacocoReport) {
   group = 'Coverage reports'
   description = 'Generates an aggregate report'
 
-  coveredProjects.each {
-    sourceSets it.sourceSets.main
-    mustRunAfter it.tasks.withType(Test)
-    executionData fileTree(rootDir.absolutePath).include("**/*${it.name}*/**/jacoco/*.exec")
+  coveredProjects.each { proj ->
+    sourceSets proj.sourceSets.main
+    mustRunAfter proj.tasks.withType(Test)
+    executionData fileTree(rootDir.absolutePath).include("**/*${proj.name}*/**/jacoco/*.exec")
   }
 
   reports {
@@ -62,6 +59,13 @@ tasks.named('coveralls').configure {
   onlyIf { System.env.'CI' }
 }
 
+allprojects {
+  apply plugin: 'org.sonarqube'
+
+  rootProject.tasks.sonarqube.dependsOn(jacocoFullReport)
+  rootProject.tasks.sonarqube.dependsOn(tasks.processResources)
+}
+
 sonarqube {
   properties {
     property 'sonar.organization', 'caffeine'
@@ -72,5 +76,3 @@ sonarqube {
       "${buildDir}/reports/jacoco/jacocoFullReport/jacocoFullReport.xml"
   }
 }
-
-tasks.sonarqube.dependsOn(jacocoFullReport)
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