Skip to content

Commit

Permalink
Bumped spring boot
Browse files Browse the repository at this point in the history
  • Loading branch information
Hakky54 committed May 22, 2024
1 parent b9a4bbe commit 0f0452c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
fail-fast: false
matrix:
os: [ windows-latest ]
java: [ '11', '17', '21' ]
java: [ '17', '21' ]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM adoptopenjdk/maven-openjdk11:latest
FROM adoptopenjdk/maven-openjdk17:latest

RUN apt-get update
run apt-get install git -y
2 changes: 1 addition & 1 deletion EXERCISES.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions client/src/main/java/nl/altindag/client/ClientConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 0f0452c

Please sign in to comment.