From 218c2f7b790b7f693e3b4a9807a33bbe5c91ac25 Mon Sep 17 00:00:00 2001 From: Vlad Voinov Date: Thu, 9 Jul 2020 10:04:31 -0400 Subject: [PATCH] Branch pr 36 (#39) * Bump jackson-databind in /java-websocket-chat/api Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.4 to 2.10.0.pr1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] * client migrated to java 11 * java-web-socket-api upgraded to java 11 and latest Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java-websocket-chat/api/.gitignore | 26 ++++++++++++++++++++++++++ java-websocket-chat/api/pom.xml | 12 ++++++------ java-websocket-chat/client/pom.xml | 4 ++-- 3 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 java-websocket-chat/api/.gitignore diff --git a/java-websocket-chat/api/.gitignore b/java-websocket-chat/api/.gitignore new file mode 100644 index 0000000..2c72c43 --- /dev/null +++ b/java-websocket-chat/api/.gitignore @@ -0,0 +1,26 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +.project +.vscode +.settings/ diff --git a/java-websocket-chat/api/pom.xml b/java-websocket-chat/api/pom.xml index 6c4d23b..d49bb91 100644 --- a/java-websocket-chat/api/pom.xml +++ b/java-websocket-chat/api/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 1.8 - 1.8 + 11 + 11 @@ -28,25 +28,25 @@ com.fasterxml.jackson.core jackson-databind - 2.9.10.4 + 2.11.1 org.projectlombok lombok - 1.18.10 + 1.18.12 provided org.glassfish.tyrus tyrus-server - 1.15 + 1.17 org.glassfish.tyrus tyrus-container-grizzly-server - 1.15 + 1.17 ch.qos.logback diff --git a/java-websocket-chat/client/pom.xml b/java-websocket-chat/client/pom.xml index b5a836f..b6cac41 100644 --- a/java-websocket-chat/client/pom.xml +++ b/java-websocket-chat/client/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.9.RELEASE + 2.1.15.RELEASE com.example @@ -15,7 +15,7 @@ Demo project for Spring Boot - 1.8 + 11