Skip to content

Commit f9d1483

Browse files
authored
Merge branch 'main' into tidy-licenses
2 parents 850c7d5 + 3573f8c commit f9d1483

File tree

14 files changed

+590
-231
lines changed

14 files changed

+590
-231
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25.6-alpine AS go
1+
FROM golang:1.26.0-alpine AS go
22

33
FROM azul/zulu-openjdk-alpine:25 AS jlink
44

ant/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
4343
</includes>
4444
<filtering>true</filtering>
4545
</resource>
46+
<resource>
47+
<directory>${basedir}/src/main/resources</directory>
48+
<includes>
49+
<include>META-INF/services/*</include>
50+
</includes>
51+
<filtering>false</filtering>
52+
</resource>
4653
<resource>
4754
<directory>${basedir}</directory>
4855
<targetPath>META-INF</targetPath>

0 commit comments

Comments
 (0)