Merge pull request #89 from databucket/feature/Upgrade-libs

Upgrade server to Java17 and upgrade libraries

Author: kslysz

.dockerignore

@@ -7,8 +7,12 @@ plugins {
 
 group = 'pl.databucket'
 version = '3.4.4'
-targetCompatibility = 8
-sourceCompatibility = 8
+targetCompatibility = 17
+sourceCompatibility = 17
+
+ext['log4j2.version'] = '2.20.0'
+ext['tomcat.version'] = '9.0.71'
+ext['jackson.version'] = '2.14.2'
 
 //compileJava.options.fork = true
 //compileJava.options.forkOptions.executable = 'C:\\Program Files\\Java\\jdk1.8.0_191\\bin\\javac'
@@ -17,6 +21,7 @@ configurations {
     compileOnly {
         extendsFrom annotationProcessor
     }
+    all*.exclude module : 'spring-boot-starter-logging'
 }
 
 repositories {
@@ -29,15 +34,16 @@ jar {
 
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter:2.5.7'
-    implementation 'org.springframework.boot:spring-boot-starter-web:2.5.7'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.5.7'
-    implementation 'org.springframework.boot:spring-boot-starter-security:2.5.7'
-    implementation 'org.springframework.boot:spring-boot-starter-actuator:2.5.7'
-    implementation 'org.springframework.boot:spring-boot-starter-mail:2.5.7'
-    implementation 'org.springframework:spring-tx:5.3.9'
-    implementation 'org.postgresql:postgresql:42.2.23.jre7'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.13.1'
+    implementation 'org.springframework.boot:spring-boot-starter:2.7.8'
+    implementation 'org.springframework.boot:spring-boot-starter-log4j2:2.7.8'
+    implementation 'org.springframework.boot:spring-boot-starter-web:2.7.8'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.7.8'
+    implementation 'org.springframework.boot:spring-boot-starter-security:2.7.8'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator:2.7.8'
+    implementation 'org.springframework.boot:spring-boot-starter-mail:2.7.8'
+    implementation 'org.springframework:spring-tx:5.3.25'
+    implementation 'org.postgresql:postgresql:42.3.8'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.14.2'
     implementation 'org.projectlombok:lombok:1.18.20'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation group: 'io.springfox', name: 'springfox-boot-starter', version: '3.0.0'
@@ -46,7 +52,7 @@ dependencies {
     implementation group: 'com.vladmihalcea', name: 'hibernate-types-52', version: '2.12.0'
     implementation group: 'io.jsonwebtoken', name: 'jjwt', version: '0.9.1'
     implementation group: 'org.modelmapper', name: 'modelmapper', version: '2.4.4'
-    implementation group: 'org.yaml', name: 'snakeyaml', version: '1.29'
+    implementation group: 'org.yaml', name: 'snakeyaml', version: '1.33'
 
     compileOnly 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok'
@@ -66,7 +72,7 @@ dependencies {
 
 test {
 //    useJUnitPlatform()
-    afterSuite {desc, result ->
+    afterSuite { desc, result ->
         if (!desc.parent) {
             println("${result.resultType} " +
                     "(${result.testCount} tests, " +
@@ -79,11 +85,11 @@ test {
 
 import org.apache.tools.ant.taskdefs.condition.Os
 
-task deleteStatic(type: Delete) {
+tasks.register('deleteStatic', Delete) {
     delete "src/main/resources/static"
 }
 
-task buildFrontend() {
+tasks.register('buildFrontend') {
     String npm = 'npm'
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         npm = 'npm.cmd'
@@ -100,7 +106,7 @@ task buildFrontend() {
     }
 }
 
-task copyFrontend() {
+tasks.register('copyFrontend') {
     copy {
         from "frontend/build"
         into "src/main/resources/static"
@@ -109,4 +115,4 @@ task copyFrontend() {
 
 copyFrontend.dependsOn buildFrontend
 
-bootJar.dependsOn copyFrontend
+bootJar.dependsOn copyFrontend

Dockerfile

@@ -0,0 +1,10 @@
+version: '3.3'
+services:
+  postgres:
+    image: postgres:12.2-alpine
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: databucket_user
+      POSTGRES_PASSWORD: databucket_user
+      POSTGRES_DB: databucket

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

docker-compose.yaml

@@ -11,7 +11,12 @@ spring:
     url: jdbc:postgresql://localhost:5432/databucket
     username: databucket_user
     password: databucket_user
-
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: username
+    password: password
+    from: admin@email.io
 logging:
   level:
     pl.databucket.service.data.DataService: debug

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" monitorInterval="30">
+    <Properties>
+        <Property name="LOG_PATTERN">
+<!--            %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(:){faint} %m%n%wEx-->
+            %style{%d{ISO8601}}{bright,black} %highlight{%-5level }[%style{%t}{bright,blue}] %style{%c{1.}}{bright,yellow}: %msg%n%throwable
+        </Property>
+    </Properties>
+    <Appenders>
+        <Console name="ConsoleLog" target="SYSTEM_OUT" follow="true">
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="ConsoleLog"/>
+        </Root>
+        <Logger name="pl.databucket.server.service" level="debug"/>
+        <Logger name="pl.databucket.server.controller" level="debug"/>
+    </Loggers>
+</Configuration>