diff --git a/app/pom.xml b/app/pom.xml
index 41aeb97fd..a70c49ef9 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -41,22 +41,23 @@ limitations under the License.
1.7.8
1.10.12
9.2
+ 1.70
1.7
1.9.4
1.15
2.7.10
- 5.0.1
- 2.17.1
- 9.0.0
+ 5.1.0
+ 2.17.2
+ 9.1.0
20100527
3.2.3
2.22.2
1.0b3
- 1.17.0
- 1.7.32
- 5.3.14
- 5.6.1
- 2.5.28.2
+ 1.18.0
+ 1.7.36
+ 5.3.18
+ 5.6.2
+ 2.5.29
2.3
1.6
1.0.2
@@ -535,6 +536,12 @@ limitations under the License.
${oauth-core.version}
+
+ org.bouncycastle
+ bcpkix-jdk15on
+ ${bouncycastle.version}
+
+
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java b/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
index 7c801918b..1917c24f0 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
@@ -204,8 +204,8 @@ public void upgradeDatabase(boolean runScripts) throws StartupException {
int myVersion = parseVersionString(version);
int dbversion = getDatabaseVersion();
- log.debug("Database version = "+dbversion);
- log.debug("Desired version = "+myVersion);
+ log.info("Database version = "+dbversion);
+ log.info("Desired version = "+myVersion);
Connection con = null;
try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
index 1f811ed58..e0b965fa7 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
@@ -50,7 +50,9 @@
import org.apache.velocity.runtime.RuntimeSingleton;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext;
+import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
@@ -300,9 +302,9 @@ private DelegatingPasswordEncoder createPasswordEncoder() {
// supported encoders
encoders.put("bcrypt", new BCryptPasswordEncoder());
encoders.put("pbkdf2", new Pbkdf2PasswordEncoder());
- // requires bouncy castle impl
-// encoders.put("scrypt", new SCryptPasswordEncoder());
-// encoders.put("argon2", new Argon2PasswordEncoder());
+ // provided by bouncy castle dependency
+ encoders.put("scrypt", new SCryptPasswordEncoder());
+ encoders.put("argon2", new Argon2PasswordEncoder());
// just for testing
encoders.put("noop", org.springframework.security.crypto.password.NoOpPasswordEncoder.getInstance());