Merge pull request #2047 from informatici/develop

Align OP-1199 with develop
informatici · Sep 2, 2024 · 963c44d · 963c44d
2 parents db8149d + a14e21c
commit 963c44d
Show file tree

Hide file tree

Showing 6 changed files with 164 additions and 161 deletions.
diff --git a/bundle/language_en.properties b/bundle/language_en.properties
@@ -1793,6 +1793,7 @@ angal.userbrowser.step2.pleaserepeatthenewpassword.label
 angal.userbrowser.theadminusercannotbedeleted.msg                                                      = The "admin" user cannot be deleted.
 angal.userbrowser.thepasswordhasbeenchanged.msg                                                        = The password has been changed.
 angal.userbrowser.theuseralreadyexists.fmt.msg                                                         = The user "{0}" already exists.
+angal.userbrowser.theusernamecontainsinvalidcharacters.msg                                             = The user name must contain only a-z, 0-9, dash, period and underscore characters.
 angal.userbrowser.title                                                                                = User Browser
 angal.userbrowser.user.col                                                                             = User
 angal.vaccine.deletevaccine.fmt.msg                                                                    = Delete vaccine: {0}?

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.4.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -296,7 +296,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>2.0.13</version>
+			<version>2.0.16</version>
 		</dependency>
 		<dependency>
 			<groupId>org.imgscalr</groupId>

diff --git a/rsc/sms.properties.dist b/rsc/sms.properties.dist
@@ -28,6 +28,8 @@ skebby-gateway-service.ribbon.base-url=https://api.skebby.it:443
 # USER_KEY and ACCESS_TOKEN avoids the login call every time we need to send sms
 skebby-gateway-service.accessToken=
 skebby-gateway-service.userKey=
+# message_type: GP for Classic+, TI for Classic, SI for Basic (default)
+#skebby-gateway-service.messageType=
 
 
 ##################################################################