Skip to content

Commit 21008f7

Browse files
committed
Upgrade server to Java17 and upgrade libraries
1 parent ae49eb2 commit 21008f7

5 files changed

Lines changed: 25 additions & 15 deletions

File tree

.dockerignore

Whitespace-only changes.

Dockerfile

Whitespace-only changes.

build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ plugins {
77

88
group = 'pl.databucket'
99
version = '3.4.4'
10-
targetCompatibility = 8
11-
sourceCompatibility = 8
10+
targetCompatibility = 17
11+
sourceCompatibility = 17
1212

1313
//compileJava.options.fork = true
1414
//compileJava.options.forkOptions.executable = 'C:\\Program Files\\Java\\jdk1.8.0_191\\bin\\javac'
@@ -29,14 +29,14 @@ jar {
2929

3030

3131
dependencies {
32-
implementation 'org.springframework.boot:spring-boot-starter:2.5.7'
33-
implementation 'org.springframework.boot:spring-boot-starter-web:2.5.7'
34-
implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.5.7'
35-
implementation 'org.springframework.boot:spring-boot-starter-security:2.5.7'
36-
implementation 'org.springframework.boot:spring-boot-starter-actuator:2.5.7'
37-
implementation 'org.springframework.boot:spring-boot-starter-mail:2.5.7'
32+
implementation 'org.springframework.boot:spring-boot-starter:2.6.8'
33+
implementation 'org.springframework.boot:spring-boot-starter-web:2.6.8'
34+
implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.9'
35+
implementation 'org.springframework.boot:spring-boot-starter-security:2.6.8'
36+
implementation 'org.springframework.boot:spring-boot-starter-actuator:2.6.8'
37+
implementation 'org.springframework.boot:spring-boot-starter-mail:2.6.8'
3838
implementation 'org.springframework:spring-tx:5.3.9'
39-
implementation 'org.postgresql:postgresql:42.2.23.jre7'
39+
implementation 'org.postgresql:postgresql:42.2.27'
4040
implementation 'com.fasterxml.jackson.core:jackson-core:2.13.1'
4141
implementation 'org.projectlombok:lombok:1.18.20'
4242
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
@@ -46,7 +46,7 @@ dependencies {
4646
implementation group: 'com.vladmihalcea', name: 'hibernate-types-52', version: '2.12.0'
4747
implementation group: 'io.jsonwebtoken', name: 'jjwt', version: '0.9.1'
4848
implementation group: 'org.modelmapper', name: 'modelmapper', version: '2.4.4'
49-
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.29'
49+
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.33'
5050

5151
compileOnly 'org.projectlombok:lombok:1.18.20'
5252
annotationProcessor 'org.projectlombok:lombok'
@@ -79,11 +79,11 @@ test {
7979

8080
import org.apache.tools.ant.taskdefs.condition.Os
8181

82-
task deleteStatic(type: Delete) {
82+
tasks.register('deleteStatic', Delete) {
8383
delete "src/main/resources/static"
8484
}
8585

86-
task buildFrontend() {
86+
tasks.register('buildFrontend') {
8787
String npm = 'npm'
8888
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
8989
npm = 'npm.cmd'
@@ -100,7 +100,7 @@ task buildFrontend() {
100100
}
101101
}
102102

103-
task copyFrontend() {
103+
tasks.register('copyFrontend') {
104104
copy {
105105
from "frontend/build"
106106
into "src/main/resources/static"
@@ -109,4 +109,4 @@ task copyFrontend() {
109109

110110
copyFrontend.dependsOn buildFrontend
111111

112-
bootJar.dependsOn copyFrontend
112+
bootJar.dependsOn copyFrontend

docker-compose.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: '3.3'
2+
services:
3+
postgres:
4+
image: postgres:12.2-alpine
5+
ports:
6+
- "5432:5432"
7+
environment:
8+
POSTGRES_USER: databucket_user
9+
POSTGRES_PASSWORD: databucket_user
10+
POSTGRES_DB: databucket
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)