From 706498e3293da774e371b22d5a57ec57ff4de845 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Mon, 21 Oct 2024 23:09:24 +0200
Subject: [PATCH] feat: bump baseline to Java 17

BREAKING CHANGE: Dropwizard Metrics now requires consumers to use at least Java 17.
---
 .github/workflows/maven.yml  |  2 +-
 metrics-caffeine3/pom.xml    |  3 --
 metrics-jetty10/pom.xml      |  3 --
 metrics-jetty11/pom.xml      |  3 --
 metrics-jetty12-ee10/pom.xml |  2 --
 metrics-jetty12/pom.xml      |  2 --
 metrics-logback14/pom.xml    |  3 --
 metrics-logback15/pom.xml    |  3 --
 pom.xml                      | 64 +-----------------------------------
 9 files changed, 2 insertions(+), 83 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index abbe3c361a..0a0d8f38c2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java_version: [11, 17, 21]
+        java_version: [17, 21]
         os:
         - ubuntu-latest
     env:
diff --git a/metrics-caffeine3/pom.xml b/metrics-caffeine3/pom.xml
index 6ed13e4626..a6434e4b40 100644
--- a/metrics-caffeine3/pom.xml
+++ b/metrics-caffeine3/pom.xml
@@ -17,9 +17,6 @@
 
     <properties>
         <javaModuleName>io.dropwizard.metrics5.caffeine3</javaModuleName>
-
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencyManagement>
diff --git a/metrics-jetty10/pom.xml b/metrics-jetty10/pom.xml
index db39331a96..e8f55bf273 100644
--- a/metrics-jetty10/pom.xml
+++ b/metrics-jetty10/pom.xml
@@ -19,9 +19,6 @@
     <properties>
         <javaModuleName>io.dropwizard.metrics5.jetty10</javaModuleName>
 
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-
         <slf4j.version>2.0.16</slf4j.version>
     </properties>
 
diff --git a/metrics-jetty11/pom.xml b/metrics-jetty11/pom.xml
index cc130fe516..4555b93dbd 100644
--- a/metrics-jetty11/pom.xml
+++ b/metrics-jetty11/pom.xml
@@ -19,9 +19,6 @@
     <properties>
         <javaModuleName>io.dropwizard.metrics5.jetty11</javaModuleName>
 
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-
         <slf4j.version>2.0.16</slf4j.version>
     </properties>
 
diff --git a/metrics-jetty12-ee10/pom.xml b/metrics-jetty12-ee10/pom.xml
index 07ee1b8377..902e6b0075 100644
--- a/metrics-jetty12-ee10/pom.xml
+++ b/metrics-jetty12-ee10/pom.xml
@@ -19,8 +19,6 @@
     <properties>
         <javaModuleName>io.dropwizard.metrics.jetty12.ee10</javaModuleName>
 
-        <maven.compiler.release>17</maven.compiler.release>
-
         <slf4j.version>2.0.16</slf4j.version>
     </properties>
 
diff --git a/metrics-jetty12/pom.xml b/metrics-jetty12/pom.xml
index 6f2bc261e9..0774813a09 100644
--- a/metrics-jetty12/pom.xml
+++ b/metrics-jetty12/pom.xml
@@ -19,8 +19,6 @@
     <properties>
         <javaModuleName>io.dropwizard.metrics.jetty12</javaModuleName>
 
-        <maven.compiler.release>17</maven.compiler.release>
-
         <slf4j.version>2.0.16</slf4j.version>
     </properties>
 
diff --git a/metrics-logback14/pom.xml b/metrics-logback14/pom.xml
index e5c885f735..5687e74192 100644
--- a/metrics-logback14/pom.xml
+++ b/metrics-logback14/pom.xml
@@ -18,9 +18,6 @@
     <properties>
         <javaModuleName>io.dropwizard.metrics5.logback14</javaModuleName>
         <logback14.version>1.4.14</logback14.version>
-
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencyManagement>
diff --git a/metrics-logback15/pom.xml b/metrics-logback15/pom.xml
index 73c3750c55..b09cc997d6 100644
--- a/metrics-logback15/pom.xml
+++ b/metrics-logback15/pom.xml
@@ -18,9 +18,6 @@
     <properties>
         <javaModuleName>io.dropwizard.metrics5.logback15</javaModuleName>
         <logback15.version>1.5.11</logback15.version>
-
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 2a450c12a8..341b85c1b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,68 +137,6 @@
     </distributionManagement>
 
     <profiles>
-        <profile>
-            <id>jdk8</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <compilerId>javac-with-errorprone</compilerId>
-                            <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                            <showWarnings>true</showWarnings>
-                            <compilerArgument>-Xlint:all</compilerArgument>
-                            <source>1.8</source>
-                            <target>1.8</target>
-                            <fork>true</fork>
-                            <compilerArgs combine.children="append">
-                                <arg>-XepExcludedPaths:.*/target/generated-sources/.*</arg>
-                                <arg>-J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${errorprone.javac.version}/javac-${errorprone.javac.version}.jar</arg>
-                            </compilerArgs>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.codehaus.plexus</groupId>
-                                <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                                <version>2.15.0</version>
-                            </dependency>
-                            <!-- override plexus-compiler-javac-errorprone's dependency on
-                                 Error Prone with the latest version -->
-                            <dependency>
-                                <groupId>com.google.errorprone</groupId>
-                                <artifactId>error_prone_core</artifactId>
-                                <version>${errorprone.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>jdk11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>${maven-compiler-plugin.version}</version>
-                        <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
-                            <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                            <showWarnings>true</showWarnings>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>jdk17</id>
             <activation>
@@ -364,7 +302,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <release>8</release>
+                    <release>17</release>
                     <fork>true</fork>
                     <parameters>true</parameters>
                     <showWarnings>true</showWarnings>