Skip to content

Commit bd31dc8

Browse files
committed
Merge remote-tracking branch 'apache/main' into fix/3871_graalvm-filter
2 parents 92e9115 + 214f09d commit bd31dc8

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

.asf.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ github:
6262
# Enforce Review-then-Commit
6363
protected_branches:
6464
main:
65-
# All commits must be signed
66-
required_signatures: true
6765
# All reviews must be addressed before merging
6866
required_conversation_resolution: true
6967
# At least one positive review must be present

log4j-samples-aspectj/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<log4j2.version>${log4j.version}</log4j2.version>
3333

3434
<!-- Dependency versions -->
35-
<aspectj.version>1.9.24</aspectj.version>
35+
<aspectj.version>1.9.25</aspectj.version>
3636
</properties>
3737

3838
<dependencies>

log4j-samples-graalvm/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
<!-- Dependencies (alphabetical) -->
6262
<assertj.version>3.27.6</assertj.version>
6363
<json-org.version>20250517</json-org.version>
64-
<json-unit.version>4.1.1</json-unit.version>
65-
<junit.version>6.0.0</junit.version>
66-
<logback.version>1.5.19</logback.version>
64+
<json-unit.version>5.0.0</json-unit.version>
65+
<junit.version>6.0.1</junit.version>
66+
<logback.version>1.5.20</logback.version>
6767
<slf4j.version>2.0.17</slf4j.version>
6868

6969
<!-- IT to run for each profile -->
@@ -274,7 +274,7 @@
274274
<plugin>
275275
<groupId>org.graalvm.buildtools</groupId>
276276
<artifactId>native-maven-plugin</artifactId>
277-
<version>0.11.1</version>
277+
<version>0.11.2</version>
278278
<extensions>true</extensions>
279279
<executions>
280280
<execution>
@@ -327,7 +327,7 @@
327327
<plugin>
328328
<groupId>org.codehaus.mojo</groupId>
329329
<artifactId>exec-maven-plugin</artifactId>
330-
<version>3.6.1</version>
330+
<version>3.6.2</version>
331331
<executions>
332332
<execution>
333333
<id>run-executable</id>
@@ -432,7 +432,7 @@
432432
<plugin>
433433
<groupId>org.graalvm.buildtools</groupId>
434434
<artifactId>native-maven-plugin</artifactId>
435-
<version>0.11.1</version>
435+
<version>0.11.2</version>
436436
<extensions>true</extensions>
437437
<executions>
438438
<execution>
@@ -527,7 +527,7 @@
527527
<plugin>
528528
<groupId>org.graalvm.buildtools</groupId>
529529
<artifactId>native-maven-plugin</artifactId>
530-
<version>0.11.1</version>
530+
<version>0.11.2</version>
531531
<extensions>true</extensions>
532532
<executions>
533533
<execution>

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,18 @@
8989
<flume.version>1.11.0</flume.version>
9090
<jetty.version>11.0.26</jetty.version>
9191
<javax-jms.version>2.0.1</javax-jms.version>
92-
<spotbugs-annotations.version>4.9.6</spotbugs-annotations.version>
93-
<spring-boot.version>3.5.6</spring-boot.version>
92+
<spotbugs-annotations.version>4.9.8</spotbugs-annotations.version>
93+
<spring-boot.version>3.5.7</spring-boot.version>
9494
<spring-cloud.version>2025.0.0</spring-cloud.version>
9595

9696
<!-- Pinned transitive dependencies -->
9797
<!-- Try removing from time to time -->
98-
<error_prone.version>2.42.0</error_prone.version>
98+
<error_prone.version>2.44.0</error_prone.version>
9999
<guava.version>33.5.0-jre</guava.version>
100100
<httpclient.version>4.5.14</httpclient.version>
101-
<jackson.version>2.20.0</jackson.version>
101+
<jackson.version>2.20.1</jackson.version>
102102
<joda-time.version>2.14.0</joda-time.version>
103-
<kotlin.version>2.2.20</kotlin.version>
103+
<kotlin.version>2.2.21</kotlin.version>
104104
<snakeyaml.version>2.5</snakeyaml.version>
105105
<slf4j.version>2.0.17</slf4j.version>
106106
</properties>

0 commit comments

Comments
 (0)