Merge branch 'develop' into dependabot/maven/develop/com.aerospike-ae…

…rospike-client-8.0.0
PlaytikaOSS · Jan 30, 2024 · 22c64db · 22c64db
2 parents fe2f2ce + 353c1b4
commit 22c64db
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/.github/renovate/renovate.json b/.github/renovate/renovate.json
@@ -25,8 +25,9 @@
       "description": "Process update docker images",
       "fileMatch": [
         "^.*Properties\\.java$",
+        "^.*\\.properties",
         "^.*\\.adoc",
-        "^.*additional-spring-configuration-metadata.json"
+        "^.*additional-spring-configuration-metadata\\.json"
       ],
       "matchStrings": [
         "\\/\\/.*?renovate:.*?datasource=(?<datasource>.*?)\\s+?return\\s+?\\\"(?<depName>.*?):?(?<currentValue>[\\w+\\.\\-]*)\"",
@@ -61,7 +62,7 @@
     {
       "description": "Process update images in spring configuration metadata",
       "fileMatch": [
-        "^.*additional-spring-configuration-metadata.json"
+        "^.*additional-spring-configuration-metadata\\.json"
       ],
       "matchStrings": [
         "\\\"embedded\\.\\w+?\\.(dockerImage|docker\\-image)\\\",\\s+.*\\s+.*\\s+\\\"value\\\"\\s*?:\\s*?\"(?<depName>.*?):?(?<currentValue>[\\w+\\.\\-]*)\""

diff --git a/embedded-keycloak/pom.xml b/embedded-keycloak/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>embedded-keycloak</artifactId>
 
     <properties>
-        <keycloak.version>23.0.4</keycloak.version>
+        <keycloak.version>23.0.5</keycloak.version>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -105,8 +105,9 @@
         <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
         <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
         <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
-        <spotless-maven-plugin.version>2.42.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
         <gitflow-incremental-builder.version>4.5.1</gitflow-incremental-builder.version>
+        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
 
         <!-- GPG -->
         <gpg.keyname>3EEF24C7</gpg.keyname>
@@ -202,6 +203,26 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>

diff --git a/testcontainers-spring-boot-parent/pom.xml b/testcontainers-spring-boot-parent/pom.xml
@@ -15,7 +15,7 @@
 
 
     <properties>
-        <testcontainers.version>1.19.3</testcontainers.version>
+        <testcontainers.version>1.19.4</testcontainers.version>
         <spring.boot.version>3.2.2</spring.boot.version>
         <spring.cloud.version>2023.0.0</spring.cloud.version>
         <spring.cloud.gcp.version>5.0.0</spring.cloud.gcp.version>