Merge develop to master

.github/workflows/maven-update-version.yml

@@ -25,9 +25,9 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'temurin'

audit-base/src/main/java/com/wultra/core/audit/base/configuration/AuditConfiguration.java

@@ -98,7 +98,7 @@ public String getVersion() {
      */
     public Instant getBuildTime() {
         if (buildProperties == null) {
-            return null;
+            return Instant.now();
         }
         return buildProperties.getTime();
     }

audit-base/src/test/java/com/wultra/core/audit/base/AuditTest.java

@@ -145,8 +145,8 @@ void testAuditException() {
         final SqlRowSet rs = jdbcTemplate.queryForRowSet("SELECT * FROM audit_log");
         assertTrue(rs.next());
         assertEquals("test exception", rs.getObject("exception_message"));
-        assertTrue(rs.getObject("stack_trace").toString().contains("java.lang.Exception: test exception\n"
-                + "\tat com.wultra.core.audit.base.AuditTest.testAuditException"));
+        assertTrue(rs.getObject("stack_trace").toString().contains("java.lang.Exception: test exception"));
+        assertTrue(rs.getObject("stack_trace").toString().contains("at com.wultra.core.audit.base.AuditTest.testAuditException"));
     }
 
     @Test
@@ -188,8 +188,8 @@ void testAuditFormattedMessageException() {
         assertTrue(rs.next());
         assertEquals("test message with more formatting and exception", rs.getObject("message"));
         assertEquals("test exception", rs.getObject("exception_message"));
-        assertTrue(rs.getObject("stack_trace").toString().contains("java.lang.Exception: test exception\n"
-                + "\tat com.wultra.core.audit.base.AuditTest.testAuditFormattedMessageException"));
+        assertTrue(rs.getObject("stack_trace").toString().contains("java.lang.Exception: test exception"));
+        assertTrue(rs.getObject("stack_trace").toString().contains("at com.wultra.core.audit.base.AuditTest.testAuditFormattedMessage"));
     }
 
     @Test

pom.xml

@@ -55,14 +55,15 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
 		<maven.compiler.release>${java.version}</maven.compiler.release>
+        <central.publishing.plugin.version>0.9.0</central.publishing.plugin.version>
 
-		<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-		<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
-		<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
+		<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+		<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+		<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
 
 		<!-- Dependencies -->
-		<spring-boot.version>3.4.5</spring-boot.version>
-		<shedlock.version>6.6.1</shedlock.version>
+		<spring-boot.version>3.5.8</spring-boot.version>
+		<shedlock.version>6.10.0</shedlock.version>
 	</properties>
 
 	<dependencyManagement>
@@ -99,14 +100,20 @@
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>${maven-surefire-plugin.version}</version>
 				</plugin>
+
+                <plugin>
+                    <groupId>org.sonatype.central</groupId>
+                    <artifactId>central-publishing-maven-plugin</artifactId>
+                    <version>${central.publishing.plugin.version}</version>
+                </plugin>
 			</plugins>
 		</pluginManagement>
 
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.4.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -120,7 +127,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.11.2</version>
+				<version>3.12.0</version>
 				<configuration>
 					<failOnError>false</failOnError>
 				</configuration>
@@ -240,8 +247,8 @@
 					<url>https://wultra.jfrog.io/artifactory/internal-maven-repository</url>
 				</repository>
 				<repository>
-					<id>ossrh-snapshots</id>
-					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+					<id>central-portal-snapshots</id>
+					<url>https://central.sonatype.com/repository/maven-snapshots/</url>
 					<releases>
 						<enabled>false</enabled>
 					</releases>
@@ -260,14 +267,29 @@
 			</activation>
 			<properties>
 			</properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>${env.server_id}</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                            <waitUntil>published</waitUntil>
+                            <waitMaxTime>${env.wait_max_time}</waitMaxTime>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
 			<distributionManagement>
 				<snapshotRepository>
-					<id>ossrh-snapshots-distribution</id>
-					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+					<id>central-portal-snapshots-distribution</id>
+					<url>https://central.sonatype.com/repository/maven-snapshots/</url>
 				</snapshotRepository>
 				<repository>
-					<id>ossrh-staging-distribution</id>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+					<id>central-portal-staging-distribution</id>
+					<url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
 				</repository>
 			</distributionManagement>
 		</profile>

rest-client-base/src/main/java/com/wultra/core/rest/client/base/util/SslUtils.java

@@ -145,27 +145,31 @@ public static SslContext prepareSslContext(RestClientConfiguration config) throw
                                     return trustStore.isCertificateEntry(t);
                                 } catch (KeyStoreException ex) {
                                     keyStoreExceptions.add(ex);
+                                    logger.error("Failed to check if certificate is in truststore: {}", t, ex);
                                     return false;
                                 }
                             })
                             .map(t -> {
                                 try {
                                     return (X509Certificate) trustStore.getCertificate(t);
                                 } catch (KeyStoreException ex) {
+                                    logger.error("Failed to load certificate from truststore: {}", t, ex);
                                     keyStoreExceptions.add(ex);
                                     return null;
                                 }
                             }).toArray(X509Certificate[]::new);
                     if (!keyStoreExceptions.isEmpty()) {
-                        throw new RestClientException("Invalid truststore data provided: " + keyStoreExceptions);
+                        // add at least the first exception as the root cause
+                        throw new RestClientException("Invalid truststore data provided: " + keyStoreExceptions, keyStoreExceptions.get(0));
                     }
                     sslContextBuilder.trustManager(certificates);
                 }
 
                 return sslContextBuilder.build();
             }
-        } catch (IOException | GeneralSecurityException ex) {
-            throw new RestClientException("SSL configuration failed, error: " + ex.getMessage());
+        } catch (IOException | GeneralSecurityException ex) { // NOSONAR -  Both logging and rethrowing are intended as library users might not properly log this security exception
+            logger.error("SSL configuration failed: {}", ex.getMessage(), ex);
+            throw new RestClientException("SSL configuration failed, error: " + ex.getMessage(), ex);
         }
         return null;
     }