From 0f0452c78fa20da311d9d0a4a64b8fabea7a1e18 Mon Sep 17 00:00:00 2001
From: Hakky54 <hakangoudberg@hotmail.com>
Date: Wed, 22 May 2024 12:54:44 +0200
Subject: [PATCH] Bumped spring boot

---
 .github/workflows/maven.yml                        |  4 ++--
 .gitpod.Dockerfile                                 |  2 +-
 EXERCISES.MD                                       |  2 +-
 README.MD                                          |  2 +-
 .../main/java/nl/altindag/client/ClientConfig.java |  1 +
 pom.xml                                            | 14 +++++++-------
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a1c57352..65341b1d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        java: [ '11', '17', '21' ]
+        java: [ '17', '21' ]
 
     steps:
       - uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest ]
-        java: [ '11', '17', '21' ]
+        java: [ '17', '21' ]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 141f54e0..95fc6d1d 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/maven-openjdk11:latest
+FROM adoptopenjdk/maven-openjdk17:latest
 
 RUN apt-get update
 run apt-get install git -y
\ No newline at end of file
diff --git a/EXERCISES.MD b/EXERCISES.MD
index be3baad3..0781cc7f 100644
--- a/EXERCISES.MD
+++ b/EXERCISES.MD
@@ -12,7 +12,7 @@ These are the following steps:
 
 ## Starting the server
 **Minimum requirements:**
-1. Java 11
+1. Java 17
 2. Maven 3.5.0
 3. Eclipse, Intellij IDEA (or any other text editor like VIM)
 4. A terminal
diff --git a/README.MD b/README.MD
index b1511842..127e61ce 100644
--- a/README.MD
+++ b/README.MD
@@ -59,7 +59,7 @@ Also [GitHub - SSLContext Kickstart](https://github.com/Hakky54/sslcontext-kicks
 # Tutorial
 ## Starting the server
 **Minimum requirements:**
-1. Java 11
+1. Java 17
 2. Maven 3.5.0
 3. Eclipse, Intellij IDEA (or any other text editor like VIM)
 4. A terminal
diff --git a/client/src/main/java/nl/altindag/client/ClientConfig.java b/client/src/main/java/nl/altindag/client/ClientConfig.java
index 9d5e8599..65a84acb 100644
--- a/client/src/main/java/nl/altindag/client/ClientConfig.java
+++ b/client/src/main/java/nl/altindag/client/ClientConfig.java
@@ -136,6 +136,7 @@ public RestTemplate restTemplate(org.apache.http.impl.client.CloseableHttpClient
 
     @Bean
     @Scope("prototype")
+    @SuppressWarnings("KotlinInternalInJava")
     public OkHttpClient okHttpClient(SSLFactory sslFactory) {
         return new OkHttpClient.Builder()
                 .sslSocketFactory(sslFactory.getSslSocketFactory(), sslFactory.getTrustManager().orElseThrow())
diff --git a/pom.xml b/pom.xml
index b380c21d..39f0bc2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,18 +15,18 @@
     </modules>
 
     <properties>
-        <version.java>11</version.java>
+        <version.java>17</version.java>
         <version.scala>2.13</version.scala>
         <version.scala-compiler>2.13.14</version.scala-compiler>
         <version.kotlin>2.0.0</version.kotlin>
         <version.kotlinx-coroutines-core>1.8.1</version.kotlinx-coroutines-core>
         <version.sslcontext-kickstart>8.3.5</version.sslcontext-kickstart>
-        <version.spring>2.7.18</version.spring>
-        <version.slf4j>1.7.33</version.slf4j>
+        <version.spring>3.2.5</version.spring>
+        <version.slf4j>2.0.13</version.slf4j>
         <version.apache.httpclient>4.5.13</version.apache.httpclient>
         <version.cucumber>7.2.3</version.cucumber>
         <version.maven-fail-safe>3.0.0-M5</version.maven-fail-safe>
-        <version.maven-surefire-plugin>3.0.0-M5</version.maven-surefire-plugin>
+        <version.maven-surefire-plugin>3.2.5</version.maven-surefire-plugin>
         <version.aspectjweaver>1.9.7</version.aspectjweaver>
         <version.maven-cucumber-reporting>5.4.0</version.maven-cucumber-reporting>
         <version.commons-lang3>3.12.0</version.commons-lang3>
@@ -67,10 +67,10 @@
         <version.awaitility>4.1.1</version.awaitility>
         <version.jackson-module-scala>2.13.1</version.jackson-module-scala>
         <version.jacoco-maven-plugin>0.8.7</version.jacoco-maven-plugin>
-        <version.junit-jupiter>5.8.2</version.junit-jupiter>
+        <version.junit-jupiter>5.11.0-M2</version.junit-jupiter>
         <version.mockito>4.8.1</version.mockito>
         <version.assertj-core>3.22.0</version.assertj-core>
-        <version.logcaptor>2.7.8</version.logcaptor>
+        <version.logcaptor>2.9.2</version.logcaptor>
         <version.byte-buddy>1.14.12</version.byte-buddy>
         <version.mockito-kotlin>5.2.1</version.mockito-kotlin>
         <version.scalatest>3.2.10</version.scalatest>
@@ -79,7 +79,7 @@
         <version.mockserver>5.11.2</version.mockserver>
         <version.maven-compiler-plugin>3.8.1</version.maven-compiler-plugin>
         <version.maven-shade-plugin>3.2.4</version.maven-shade-plugin>
-        <version.scala-maven-plugin>4.8.1</version.scala-maven-plugin>
+        <version.scala-maven-plugin>4.9.1</version.scala-maven-plugin>
         <version.license-maven-plugin>4.2.rc3</version.license-maven-plugin>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <license.git.copyrightYears>2018</license.git.copyrightYears>