Merge branch 'master' into develop

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.31.1] - 2022-02-21
+### Fixed
+- Fix ClassNotFoundException on startup ([#1958](https://github.com/scm-manager/scm-manager/issues/1958))
+
 ## [2.31.0] - 2022-02-18
 ### Added
 - Add secondary color gradations to styleguide ([#1944](https://github.com/scm-manager/scm-manager/pull/1944))
@@ -955,3 +959,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.30.0]: https://scm-manager.org/download/2.30.0
 [2.30.1]: https://scm-manager.org/download/2.30.1
 [2.31.0]: https://scm-manager.org/download/2.31.0
+[2.31.1]: https://scm-manager.org/download/2.31.1

scm-webapp/src/main/java/sonia/scm/lifecycle/RandomPasswordGenerator.java

@@ -24,7 +24,7 @@
 
 package sonia.scm.lifecycle;
 
-import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang.RandomStringUtils;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;