From 4d1d58144878e40c5bb4cf1060abafb6a251e079 Mon Sep 17 00:00:00 2001 From: serega6531 Date: Tue, 29 Dec 2020 22:01:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../configuration/ApplicationConfiguration.java | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 3a167dd..edab338 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.2.6.RELEASE' + id 'org.springframework.boot' version '2.4.1' id 'java' } @@ -8,8 +8,8 @@ apply plugin: 'io.spring.dependency-management' group = 'ru.serega6531' version = '1.0-SNAPSHOT' -sourceCompatibility = JavaVersion.VERSION_14 // сменить на 15 после фикса https://github.com/rzwitserloot/lombok/issues/2579 -targetCompatibility = JavaVersion.VERSION_14 +sourceCompatibility = JavaVersion.VERSION_15 +targetCompatibility = JavaVersion.VERSION_15 configurations { compileOnly { @@ -31,10 +31,10 @@ dependencies { compile group: 'commons-io', name: 'commons-io', version: '2.7' compile 'org.pcap4j:pcap4j-core:1.8.2' compile 'org.pcap4j:pcap4j-packetfactory-static:1.8.2' - compile group: 'com.google.guava', name: 'guava', version: '28.2-jre' + compile group: 'com.google.guava', name: 'guava', version: '30.1-jre' compile group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.1' - compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.65' - compile group: 'org.bouncycastle', name: 'bctls-jdk15on', version: '1.65' + compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68' + compile group: 'org.bouncycastle', name: 'bctls-jdk15on', version: '1.68' compile group: 'org.modelmapper', name: 'modelmapper', version: '2.3.0' compileOnly 'org.projectlombok:lombok' runtimeOnly 'org.springframework.boot:spring-boot-devtools' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be52383..4d9ca16 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-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/ru/serega6531/packmate/configuration/ApplicationConfiguration.java b/src/main/java/ru/serega6531/packmate/configuration/ApplicationConfiguration.java index be73a7d..e47ea85 100644 --- a/src/main/java/ru/serega6531/packmate/configuration/ApplicationConfiguration.java +++ b/src/main/java/ru/serega6531/packmate/configuration/ApplicationConfiguration.java @@ -104,7 +104,6 @@ public class ApplicationConfiguration extends WebSecurityConfigurerAdapter imple @Override public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { registry.addHandler(webSocketHandler, "/api/ws") - .setAllowedOrigins("*") .withSockJS(); } }