Skip to content

Commit 5ff3030

Browse files
committed
Update to Java 17
1 parent ad8705d commit 5ff3030

23 files changed

+159
-280
lines changed

.github/workflows/codecov.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
pull-requests: write
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v3
25-
- name: Set up JDK 11
26-
uses: actions/setup-java@v3
24+
- uses: actions/checkout@v4
25+
- name: Set up JDK 17
26+
uses: actions/setup-java@v4
2727
with:
28-
java-version: '11'
28+
java-version: '17'
2929
distribution: 'temurin'
3030
cache: maven
3131
- uses: ankane/setup-elasticsearch@v1

.github/workflows/docker-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v4
20-
- name: Set up JDK 11
21-
uses: actions/setup-java@v3
20+
- name: Set up JDK 17
21+
uses: actions/setup-java@v4
2222
with:
23-
java-version: '11'
23+
java-version: '17'
2424
distribution: 'temurin'
2525
cache: maven
2626
- name: Build with Maven

.github/workflows/maven.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
build:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3
22-
- name: Set up JDK 11
23-
uses: actions/setup-java@v3
21+
- uses: actions/checkout@v4
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@v4
2424
with:
25-
java-version: '11'
25+
java-version: '17'
2626
distribution: 'temurin'
2727
cache: maven
2828
- name: Build with Maven
@@ -38,11 +38,11 @@ jobs:
3838
contents: read
3939
runs-on: ubuntu-latest
4040
steps:
41-
- uses: actions/checkout@v3
42-
- name: Set up JDK 11
43-
uses: actions/setup-java@v3
41+
- uses: actions/checkout@v4
42+
- name: Set up JDK 17
43+
uses: actions/setup-java@v4
4444
with:
45-
java-version: '11'
45+
java-version: '17'
4646
distribution: 'temurin'
4747
cache: maven
4848
- name: Test with Maven
@@ -58,11 +58,11 @@ jobs:
5858
contents: read
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@v3
62-
- name: Set up JDK 11
63-
uses: actions/setup-java@v3
61+
- uses: actions/checkout@v4
62+
- name: Set up JDK 17
63+
uses: actions/setup-java@v4
6464
with:
65-
java-version: '11'
65+
java-version: '17'
6666
distribution: 'temurin'
6767
cache: maven
6868
- uses: ankane/setup-elasticsearch@v1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:11-jre
1+
FROM openjdk:17-jre
22

33
# deployment unit
44
COPY target/ChannelFinder-*.jar /channelfinder/ChannelFinder-*.jar

Dockerfile.integrationtest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1717
# ------------------------------------------------------------------------------
1818

19-
FROM openjdk:11
19+
FROM openjdk:17
2020

2121
# deployment unit
2222
COPY target/ChannelFinder-*.jar /channelfinder/ChannelFinder-*.jar

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Collected installation recipes and notes may be found on [wiki pages](https://gi
3232

3333
* Prerequisites
3434

35-
* JDK 11
35+
* JDK 17
3636
* Elastic version 8.2.x
3737
* <For authN/authZ using LDAP:> LDAP server, e.g. OpenLDAP
3838

@@ -45,7 +45,7 @@ Collected installation recipes and notes may be found on [wiki pages](https://gi
4545
* Build
4646
```
4747
# Debian 10
48-
sudo apt-get install openjdk-11-jdk maven git curl wget
48+
sudo apt-get install openjdk-17-jdk maven git curl wget
4949
wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.2.0-amd64.deb
5050
sudo dpkg -i elasticsearch-8.2.0-amd64.deb
5151
sudo systemctl start elasticsearch

pom.xml

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,6 @@
5555
</dependencies>
5656
</dependencyManagement>
5757
<dependencies>
58-
<!-- The following 3 dependencies are temporarily added for java 11 compatibility
59-
TODO They should be removed as soon as possible. -->
60-
<dependency>
61-
<groupId>javax.xml.bind</groupId>
62-
<artifactId>jaxb-api</artifactId>
63-
<version>2.3.0</version>
64-
</dependency>
65-
<dependency>
66-
<groupId>com.sun.xml.bind</groupId>
67-
<artifactId>jaxb-core</artifactId>
68-
<version>2.3.0</version>
69-
</dependency>
70-
<dependency>
71-
<groupId>com.sun.xml.bind</groupId>
72-
<artifactId>jaxb-impl</artifactId>
73-
<version>2.3.0</version>
74-
</dependency>
75-
<!-- The above 3 dependencies are temporarily added for java 11 compatibility -->
7658
<dependency>
7759
<groupId>org.springframework.boot</groupId>
7860
<artifactId>spring-boot-starter</artifactId>
@@ -85,11 +67,6 @@
8567
<groupId>org.springframework.data</groupId>
8668
<artifactId>spring-data-commons</artifactId>
8769
</dependency>
88-
<dependency>
89-
<groupId>javax.servlet</groupId>
90-
<artifactId>javax.servlet-api</artifactId>
91-
<scope>provided</scope>
92-
</dependency>
9370
<!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
9471
<dependency>
9572
<groupId>org.junit.jupiter</groupId>
@@ -346,8 +323,8 @@
346323
<artifactId>maven-compiler-plugin</artifactId>
347324
<version>3.11.0</version>
348325
<configuration>
349-
<source>11</source>
350-
<target>11</target>
326+
<source>17</source>
327+
<target>17</target>
351328
<encoding>${project.build.sourceEncoding}</encoding>
352329
</configuration>
353330
</plugin>
@@ -423,7 +400,7 @@
423400
<additionalOptions>
424401
<additionalOption>-Xdoclint:none</additionalOption>
425402
</additionalOptions>
426-
<source>11</source>
403+
<source>17</source>
427404
</configuration>
428405
</execution>
429406
</executions>

0 commit comments

Comments
 (0)