Skip to content

Commit 22c64db

Browse files
authored
Merge branch 'develop' into dependabot/maven/develop/com.aerospike-aerospike-client-8.0.0
2 parents fe2f2ce + 353c1b4 commit 22c64db

File tree

4 files changed

+27
-5
lines changed

4 files changed

+27
-5
lines changed

.github/renovate/renovate.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
"description": "Process update docker images",
2626
"fileMatch": [
2727
"^.*Properties\\.java$",
28+
"^.*\\.properties",
2829
"^.*\\.adoc",
29-
"^.*additional-spring-configuration-metadata.json"
30+
"^.*additional-spring-configuration-metadata\\.json"
3031
],
3132
"matchStrings": [
3233
"\\/\\/.*?renovate:.*?datasource=(?<datasource>.*?)\\s+?return\\s+?\\\"(?<depName>.*?):?(?<currentValue>[\\w+\\.\\-]*)\"",
@@ -61,7 +62,7 @@
6162
{
6263
"description": "Process update images in spring configuration metadata",
6364
"fileMatch": [
64-
"^.*additional-spring-configuration-metadata.json"
65+
"^.*additional-spring-configuration-metadata\\.json"
6566
],
6667
"matchStrings": [
6768
"\\\"embedded\\.\\w+?\\.(dockerImage|docker\\-image)\\\",\\s+.*\\s+.*\\s+\\\"value\\\"\\s*?:\\s*?\"(?<depName>.*?):?(?<currentValue>[\\w+\\.\\-]*)\""

embedded-keycloak/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>embedded-keycloak</artifactId>
1414

1515
<properties>
16-
<keycloak.version>23.0.4</keycloak.version>
16+
<keycloak.version>23.0.5</keycloak.version>
1717
</properties>
1818

1919
<dependencies>

pom.xml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@
105105
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
106106
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
107107
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
108-
<spotless-maven-plugin.version>2.42.0</spotless-maven-plugin.version>
108+
<spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
109109
<gitflow-incremental-builder.version>4.5.1</gitflow-incremental-builder.version>
110+
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
110111

111112
<!-- GPG -->
112113
<gpg.keyname>3EEF24C7</gpg.keyname>
@@ -202,6 +203,26 @@
202203
<artifactId>maven-surefire-plugin</artifactId>
203204
<version>${maven-surefire-plugin.version}</version>
204205
</plugin>
206+
<plugin>
207+
<groupId>org.jacoco</groupId>
208+
<artifactId>jacoco-maven-plugin</artifactId>
209+
<version>${jacoco-maven-plugin.version}</version>
210+
<executions>
211+
<execution>
212+
<id>prepare-agent</id>
213+
<goals>
214+
<goal>prepare-agent</goal>
215+
</goals>
216+
</execution>
217+
<execution>
218+
<id>report</id>
219+
<phase>test</phase>
220+
<goals>
221+
<goal>report</goal>
222+
</goals>
223+
</execution>
224+
</executions>
225+
</plugin>
205226
<plugin>
206227
<groupId>org.codehaus.mojo</groupId>
207228
<artifactId>exec-maven-plugin</artifactId>

testcontainers-spring-boot-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
<properties>
18-
<testcontainers.version>1.19.3</testcontainers.version>
18+
<testcontainers.version>1.19.4</testcontainers.version>
1919
<spring.boot.version>3.2.2</spring.boot.version>
2020
<spring.cloud.version>2023.0.0</spring.cloud.version>
2121
<spring.cloud.gcp.version>5.0.0</spring.cloud.gcp.version>

0 commit comments

Comments
 (0)