diff --git a/Dockerfile_app b/Dockerfile_app index aa97830..7bda5bc 100644 --- a/Dockerfile_app +++ b/Dockerfile_app @@ -1,4 +1,4 @@ -FROM openjdk:8-jdk-alpine +FROM openjdk:13-jdk-alpine RUN apk add libpcap npm diff --git a/build.gradle b/build.gradle index 999d629..17babb3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,15 @@ plugins { - id 'org.springframework.boot' version '2.1.4.RELEASE' + id 'org.springframework.boot' version '2.2.5.RELEASE' id 'java' } apply plugin: 'io.spring.dependency-management' group = 'ru.serega6531' -version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +version = '1.0-SNAPSHOT' + +sourceCompatibility = JavaVersion.VERSION_13 +targetCompatibility = JavaVersion.VERSION_13 configurations { compileOnly { @@ -25,7 +27,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-websocket" implementation 'org.springframework.session:spring-session-core' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7' + compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' compile group: 'commons-io', name: 'commons-io', version: '2.6' compile 'org.pcap4j:pcap4j-core:1.8.2' compile 'org.pcap4j:pcap4j-packetfactory-static:1.8.2' @@ -34,5 +36,5 @@ dependencies { runtimeOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'org.postgresql:postgresql' annotationProcessor 'org.projectlombok:lombok' - testCompile 'org.junit.jupiter:junit-jupiter:5.4.2' + testCompile 'org.junit.jupiter:junit-jupiter:5.6.0' } diff --git a/docker-compose.yml b/docker-compose.yml index 5bb1a66..972cadc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: network_mode: "host" image: packmate-app:v1 command: [ - "/usr/bin/java", "-Djava.net.preferIPv4Stack=true", "-Djava.net.preferIPv4Addresses=true", + "java", "-Djava.net.preferIPv4Stack=true", "-Djava.net.preferIPv4Addresses=true", "-jar", "/app/app.jar", "--spring.datasource.url=jdbc:postgresql://127.0.0.1:65001/$${DB_NAME}", "--spring.datasource.username=$${DB_USER}", "--spring.datasource.password=$${DB_PASSWORD}", "--interface-name=$${INTERFACE}", "--local-ip=$${LOCAL_IP}", "--account-login=$${WEB_LOGIN}", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 44e7c4d..a2bf131 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java b/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java index e661476..0890081 100644 --- a/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java +++ b/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java @@ -12,13 +12,14 @@ import ru.serega6531.packmate.model.pojo.SubscriptionMessage; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; @Service @Slf4j public class StreamSubscriptionService { - private List subscribers = new ArrayList<>(); + private List subscribers = Collections.synchronizedList(new ArrayList<>()); private final ObjectMapper mapper; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ecac0e0..3b39146 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,6 +11,7 @@ spring: hibernate: temp: use_jdbc_metadata_defaults: false + database-platform: org.hibernate.dialect.PostgreSQLDialect enable-capture: true