From efbebe8c0cb6b09d605987c1acaad0c543c1cd0a Mon Sep 17 00:00:00 2001
From: Jens Wilke <jw_github@headissue.com>
Date: Thu, 14 Oct 2021 15:28:10 +0200
Subject: [PATCH] strip unneeded dependencies from JMH shaded jar

---
 jmh-suite/pom.xml                             | 44 +++++++++++++++++--
 .../jmh/MiscResultRecorderProfiler.java       |  4 +-
 pom.xml                                       | 14 ++----
 testbed/pom.xml                               | 11 +++++
 thirdparty/pom.xml                            | 17 ++-----
 util/pom.xml                                  |  2 +-
 6 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/jmh-suite/pom.xml b/jmh-suite/pom.xml
index 0de1023..ce4fe57 100644
--- a/jmh-suite/pom.xml
+++ b/jmh-suite/pom.xml
@@ -30,10 +30,12 @@
           <groupId>${project.groupId}</groupId>
           <artifactId>testbed</artifactId>
           <version>${project.version}</version>
+            <!-- exclude any transitive dependency. we add the relevant targets
+                 explicitly to keep the shaded benchmarks.jar small -->
             <exclusions>
                 <exclusion>
-                    <groupId>org.cache2k.benchmark</groupId>
-                    <artifactId>traces</artifactId>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -41,10 +43,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>thirdparty</artifactId>
             <version>${project.version}</version>
+            <!-- exclude any transitive dependency. we add the relevant targets
+                 explicitly to keep the shaded benchmarks.jar small -->
             <exclusions>
                 <exclusion>
-                    <groupId>com.github.ben-manes.caffeine</groupId>
-                    <artifactId>simulator</artifactId>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -52,6 +56,14 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>
             <version>${project.version}</version>
+            <!-- exclude any transitive dependency. we add the relevant targets
+                 explicitly to keep the shaded benchmarks.jar small -->
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -64,16 +76,40 @@
             <version>${jmh.version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.cache2k</groupId>
             <artifactId>cache2k-core</artifactId>
             <version>${cache2k-version}</version>
         </dependency>
+        <!--
         <dependency>
             <groupId>org.cache2k</groupId>
             <artifactId>cache2k-jcache</artifactId>
             <version>${cache2k-version}</version>
         </dependency>
+        -->
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>${caffeine-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>${ehcache3-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.cache</groupId>
+            <artifactId>cache-api</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>dsiutils</artifactId>
+            <version>${dsiutils-version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/jmh-suite/src/main/java/org/cache2k/benchmark/jmh/MiscResultRecorderProfiler.java b/jmh-suite/src/main/java/org/cache2k/benchmark/jmh/MiscResultRecorderProfiler.java
index 7ef0e65..1d0159b 100644
--- a/jmh-suite/src/main/java/org/cache2k/benchmark/jmh/MiscResultRecorderProfiler.java
+++ b/jmh-suite/src/main/java/org/cache2k/benchmark/jmh/MiscResultRecorderProfiler.java
@@ -20,7 +20,6 @@
  * #L%
  */
 
-import org.infinispan.util.concurrent.ConcurrentHashSet;
 import org.openjdk.jmh.infra.BenchmarkParams;
 import org.openjdk.jmh.infra.IterationParams;
 import org.openjdk.jmh.profile.InternalProfiler;
@@ -36,6 +35,7 @@
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -51,7 +51,7 @@ public class MiscResultRecorderProfiler implements InternalProfiler {
    * Collection of multiple results per metric, possibly multiple for an iteration,
    * e.g. reported by threads
    */
-  static final ConcurrentHashSet<Result<?>>  resultSet = new ConcurrentHashSet<>();
+  static final Collection<Result<?>>  resultSet = new CopyOnWriteArraySet<>();
   /**
    * Collection of a single result per metric
    */
diff --git a/pom.xml b/pom.xml
index e652da2..2cb2307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,9 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <cache2k-version>2.2.1.Final</cache2k-version>
+    <ehcache3-version>3.9.6</ehcache3-version>
+    <caffeine-version>3.0.4</caffeine-version>
+    <dsiutils-version>2.6.0</dsiutils-version>
   </properties>
 
   <modules>
@@ -40,17 +43,6 @@
   </modules>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.2.1</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/testbed/pom.xml b/testbed/pom.xml
index 52cace5..f67487d 100644
--- a/testbed/pom.xml
+++ b/testbed/pom.xml
@@ -65,6 +65,17 @@
       <artifactId>jackson-databind</artifactId>
       <version>2.1.3</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>1.2.1</version>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
 
diff --git a/thirdparty/pom.xml b/thirdparty/pom.xml
index caf26c5..aae2520 100644
--- a/thirdparty/pom.xml
+++ b/thirdparty/pom.xml
@@ -13,10 +13,6 @@
 
   <name>Benchmarks: third party products.</name>
 
-  <properties>
-    <caffeine.version>3.0.4</caffeine.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -38,15 +34,10 @@
       <artifactId>guava</artifactId>
       <version>26.0-jre</version>
     </dependency>
-    <dependency>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-core</artifactId>
-      <version>7.1.0.CR2</version>
-    </dependency>
     <dependency>
       <groupId>org.ehcache</groupId>
       <artifactId>ehcache</artifactId>
-      <version>3.9.6</version>
+      <version>${ehcache3-version}</version>
     </dependency>
     <dependency>
       <groupId>javax.cache</groupId>
@@ -56,17 +47,17 @@
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>
-      <version>${caffeine.version}</version>
+      <version>${caffeine-version}</version>
     </dependency>
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>jcache</artifactId>
-      <version>${caffeine.version}</version>
+      <version>${caffeine-version}</version>
     </dependency>
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>simulator</artifactId>
-      <version>${caffeine.version}</version>
+      <version>${caffeine-version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.cache2k</groupId>
diff --git a/util/pom.xml b/util/pom.xml
index 1e99fa3..5f10f1c 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>it.unimi.dsi</groupId>
       <artifactId>dsiutils</artifactId>
-      <version>2.6.0</version>
+      <version>${dsiutils-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>