Skip to content

Commit f3c4a9e

Browse files
committed
Merge branch 'master' into fix-maven-warnings
2 parents bdcec27 + dc1b352 commit f3c4a9e

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
steps:
6969
- uses: actions/checkout@v3
7070
- name: Create k8s Kind Cluster
71-
uses: helm/kind-action@v1.5.0
71+
uses: helm/kind-action@v1.7.0
7272
- name: Setup Java
7373
uses: actions/setup-java@v3
7474
with:

client-java-contrib/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM docker:stable
44
RUN apk add --no-cache git bash && \
55
wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64 && \
66
chmod +x /usr/bin/kind && \
7-
wget -O /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.20.2/bin/linux/amd64/kubectl && \
7+
wget -O /usr/bin/kubectl https://dl.k8s.io/release/v1.26.4/bin/linux/amd64/kubectl && \
88
chmod +x /usr/bin/kubectl && \
99
git clone https://github.com/kubernetes-client/gen.git && \
1010
cd gen && \

fluent-gen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<plugin>
2020
<groupId>org.apache.felix</groupId>
2121
<artifactId>maven-bundle-plugin</artifactId>
22-
<version>5.1.8</version>
22+
<version>5.1.9</version>
2323
</plugin>
2424
</plugins>
2525
</build>

fluent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<plugin>
3636
<groupId>org.apache.felix</groupId>
3737
<artifactId>maven-bundle-plugin</artifactId>
38-
<version>5.1.8</version>
38+
<version>5.1.9</version>
3939
</plugin>
4040
<plugin>
4141
<groupId>com.diffplug.spotless</groupId>

pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@
4242
<snakeyaml.version>2.0</snakeyaml.version>
4343
<slf4j.version>2.0.7</slf4j.version>
4444
<caffeine.version>2.9.3</caffeine.version>
45-
<protobuf.version>3.22.3</protobuf.version>
45+
<protobuf.version>3.23.1</protobuf.version>
4646
<junit.version>4.13</junit.version>
4747
<bucket4j.version>7.6.0</bucket4j.version>
4848
<bouncycastle.version>1.73</bouncycastle.version>
4949
<gson.version>2.10.1</gson.version>
5050
<jsr305.version>3.0.2</jsr305.version>
5151
<okhttp3.version>4.10.0</okhttp3.version>
52-
<swagger-core.version>1.6.10</swagger-core.version>
52+
<swagger-core.version>1.6.11</swagger-core.version>
5353
<sundrio.version>0.94.0</sundrio.version>
5454
<gsonfire.version>1.8.5</gsonfire.version>
5555
<apache.commons.lang3.version>3.12.0</apache.commons.lang3.version>
5656
<apache.commons.collections4.version>4.4</apache.commons.collections4.version>
5757
<apache.commons.compress>1.23.0</apache.commons.compress>
58-
<apache.commons.io>2.11.0</apache.commons.io>
58+
<apache.commons.io>2.12.0</apache.commons.io>
5959
<common.codec.version>1.15</common.codec.version>
6060
<spring.boot.version>2.7.5</spring.boot.version>
6161
<spring.version>5.3.23</spring.version>
@@ -304,7 +304,7 @@
304304
<dependency>
305305
<groupId>com.fasterxml.jackson.core</groupId>
306306
<artifactId>jackson-annotations</artifactId>
307-
<version>2.15.0</version>
307+
<version>2.15.1</version>
308308
<scope>test</scope>
309309
</dependency>
310310
</dependencies>
@@ -329,7 +329,7 @@
329329
<plugin>
330330
<groupId>org.apache.felix</groupId>
331331
<artifactId>maven-bundle-plugin</artifactId>
332-
<version>5.1.8</version>
332+
<version>5.1.9</version>
333333
<extensions>true</extensions>
334334
</plugin>
335335
<plugin>
@@ -363,7 +363,7 @@
363363
<plugin>
364364
<groupId>org.codehaus.mojo</groupId>
365365
<artifactId>build-helper-maven-plugin</artifactId>
366-
<version>3.3.0</version>
366+
<version>3.4.0</version>
367367
</plugin>
368368
<plugin>
369369
<groupId>org.apache.maven.plugins</groupId>
@@ -373,7 +373,7 @@
373373
<plugin>
374374
<groupId>org.apache.maven.plugins</groupId>
375375
<artifactId>maven-surefire-plugin</artifactId>
376-
<version>3.0.0</version>
376+
<version>3.1.0</version>
377377
<configuration>
378378
<trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1226 workaround -->
379379
</configuration>
@@ -418,7 +418,7 @@
418418
<plugin>
419419
<groupId>org.apache.maven.plugins</groupId>
420420
<artifactId>maven-assembly-plugin</artifactId>
421-
<version>3.5.0</version>
421+
<version>3.6.0</version>
422422
</plugin>
423423
<plugin>
424424
<groupId>org.apache.maven.plugins</groupId>
@@ -572,7 +572,7 @@ limitations under the License.
572572
<plugin>
573573
<groupId>org.apache.maven.plugins</groupId>
574574
<artifactId>maven-gpg-plugin</artifactId>
575-
<version>3.0.1</version>
575+
<version>3.1.0</version>
576576
<executions>
577577
<execution>
578578
<id>sign-artifacts</id>

0 commit comments

Comments
 (0)