Skip to content

Commit

Permalink
feat: bump baseline to Java 17
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Dropwizard Metrics now requires consumers to use at least Java 17.
  • Loading branch information
joschi committed Oct 21, 2024
1 parent 0e29c4e commit 706498e
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 83 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java_version: [11, 17, 21]
java_version: [17, 21]
os:
- ubuntu-latest
env:
Expand Down
3 changes: 0 additions & 3 deletions metrics-caffeine3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions metrics-jetty10/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 0 additions & 3 deletions metrics-jetty11/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 0 additions & 2 deletions metrics-jetty12-ee10/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 0 additions & 2 deletions metrics-jetty12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 0 additions & 3 deletions metrics-logback14/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions metrics-logback15/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
64 changes: 1 addition & 63 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 706498e

Please sign in to comment.