From 258e48706fe9131cd56758404e095e445c5fbcd7 Mon Sep 17 00:00:00 2001 From: dbernstein Date: Fri, 1 Mar 2024 14:23:13 -0800 Subject: [PATCH] Follow on updates for java 17 (#37) * Fix password encoding issue. * Update sql script for compatibility wiht mysql 8. --- .../snapshot/bridge/rest/config/WebSecurityConfig.java | 2 +- .../org/duracloud/snapshot/sql/snapshot-create-mysql.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/snapshot-bridge-webapp/src/main/java/org/duracloud/snapshot/bridge/rest/config/WebSecurityConfig.java b/snapshot-bridge-webapp/src/main/java/org/duracloud/snapshot/bridge/rest/config/WebSecurityConfig.java index 33e553e6..87f022a5 100644 --- a/snapshot-bridge-webapp/src/main/java/org/duracloud/snapshot/bridge/rest/config/WebSecurityConfig.java +++ b/snapshot-bridge-webapp/src/main/java/org/duracloud/snapshot/bridge/rest/config/WebSecurityConfig.java @@ -31,7 +31,7 @@ public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception RootUserCredential root = new RootUserCredential(); auth.inMemoryAuthentication() .withUser(root.getUsername()) - .password(root.getPassword()) + .password("{noop}" + root.getPassword()) //noop required for spring 5 .roles("USER"); } } \ No newline at end of file diff --git a/snapshot-common-db/src/main/resources/org/duracloud/snapshot/sql/snapshot-create-mysql.sql b/snapshot-common-db/src/main/resources/org/duracloud/snapshot/sql/snapshot-create-mysql.sql index d605581c..c5b9db8b 100644 --- a/snapshot-common-db/src/main/resources/org/duracloud/snapshot/sql/snapshot-create-mysql.sql +++ b/snapshot-common-db/src/main/resources/org/duracloud/snapshot/sql/snapshot-create-mysql.sql @@ -3,7 +3,7 @@ -- Host: localhost Database: snapshot -- ------------------------------------------------------ -- Server version 5.5.38 - +/*!40101 SET @saved_cs_client = 'utf8' */; /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;