Skip to content

Commit

Permalink
Upgrade to Java 11
Browse files Browse the repository at this point in the history
Includes (optional) Servlet API 6.0 (Jakarta EE 10), only applicable if you use
ActiveRequestsFilter.
  • Loading branch information
runeflobakk committed Jun 3, 2024
1 parent ea4e3de commit 0835205
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '8', '17', '21' ]
java: [ '11', '17', '21' ]
name: build java ${{ matrix.java }}
env:
MAVEN_ARGS: --show-version --no-transfer-progress
Expand Down
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11
13 changes: 6 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@
</licenses>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<logback.version>1.3.14</logback.version>
<maven.compiler.release>11</maven.compiler.release>
<logback.version>1.4.14</logback.version>
</properties>

<dependencyManagement>
Expand All @@ -65,7 +64,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
<version>4.11.0</version>
<version>5.12.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -84,9 +83,9 @@

<!-- Optional dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
package no.digipost.monitoring.servlet;

import io.micrometer.core.instrument.MeterRegistry;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.time.Duration;
import java.time.Instant;
Expand Down

0 comments on commit 0835205

Please sign in to comment.