Skip to content

Commit

Permalink
Merge pull request #369 from gessnerfl/java_21
Browse files Browse the repository at this point in the history
closes #368: java updated to java 11. Virtual threads used for Spring Boot as well as for the SMTP server
  • Loading branch information
gessnerfl authored Jan 2, 2024
2 parents f1485e7 + a50eb5a commit 9fb9b61
Show file tree
Hide file tree
Showing 18 changed files with 478 additions and 377 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: 17
java-version: 21

- name: Build with Gradle
run: ./gradlew build jacocoTestReport sonarqube --info
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: 17
java-version: 21

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: 17
java-version: 21

- name: Run snapshot action
uses: mikepenz/gradle-dependency-submission@v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: 17
java-version: 21

- name: Get version number
id: get_version
Expand Down
10 changes: 7 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ project.archivesBaseName = "fake-smtp-server"
ext.scmUrl = "git@github.com:gessnerfl/fake-smtp-server.git"
ext.projectUrl = "https://github.com/gessnerfl/fake-smtp-server"

sourceCompatibility = 17
targetCompatibility = 17
sourceCompatibility = 21
targetCompatibility = 21

repositories {
mavenCentral()
Expand Down Expand Up @@ -70,6 +70,10 @@ gradle.projectsEvaluated {

node {
nodeProjectDir = file("${project.projectDir}/webapp")
npmInstallCommand = System.getenv("CI") ? 'ci' : 'install'
download = true
version = "20.10.0"
npmVersion = "10.2.5"
}

tasks.register('webappClean', Delete) {
Expand Down Expand Up @@ -151,7 +155,7 @@ jacocoTestReport {

jib {
from {
image = 'amazoncorretto:17.0.9-al2023-headless'
image = 'amazoncorretto:21.0.1-al2023-headless'
container {
ports = ["8080", "8081", "8025"]
creationTime = 'USE_CURRENT_TIMESTAMP'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 9fb9b61

Please sign in to comment.