Skip to content

Commit 4d033c3

Browse files
at88mphat88mph
committed
Merge branch 'master' of https://github.com/kubernetes-client/java into metrics-label-selector
2 parents 56628df + bbcd336 commit 4d033c3

File tree

22 files changed

+43
-237
lines changed

22 files changed

+43
-237
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828

2929
steps:
3030
- name: Checkout repository
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v5
3232
- name: Setup Java
33-
uses: actions/setup-java@v4
33+
uses: actions/setup-java@v5
3434
with:
3535
distribution: 'temurin'
3636
java-version: 17.0.x

‎.github/workflows/generate-crd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v5
3232
- name: Run CRD Model Generation
3333
run: |
3434
read CRD_SRC_ARGS < <(echo '${{ github.event.inputs.crds }}' | perl -ne 'print join " ", map {"-u $_"} split /,/')

‎.github/workflows/generate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout Java
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434
with:
3535
token: ${{ secrets.PAT_TOKEN }}
3636
- name: Setup Java
37-
uses: actions/setup-java@v4
37+
uses: actions/setup-java@v5
3838
with:
3939
distribution: 'temurin'
4040
java-version: 17.0.x
4141
- name: Checkout Gen
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v5
4343
with:
4444
path: gen
4545
repository: kubernetes-client/gen

‎.github/workflows/maven.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
name: Verify Source Format
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
- name: Setup Java
19-
uses: actions/setup-java@v4
19+
uses: actions/setup-java@v5
2020
with:
2121
distribution: 'temurin'
2222
java-version: 11
@@ -30,9 +30,9 @@ jobs:
3030
os: [ macos-latest, windows-latest, ubuntu-latest ]
3131
runs-on: ${{ matrix.os }}
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v5
3434
- name: Setup Java
35-
uses: actions/setup-java@v4
35+
uses: actions/setup-java@v5
3636
with:
3737
distribution: 'temurin'
3838
java-version: ${{ matrix.java }}
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
name: GraalVM Maven Test
5757
steps:
58-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v5
5959
- uses: graalvm/setup-graalvm@v1
6060
with:
6161
version: '22.3.0'
@@ -67,11 +67,11 @@ jobs:
6767
runs-on: ubuntu-latest
6868
name: End-to-End Test Against Real Cluster
6969
steps:
70-
- uses: actions/checkout@v4
70+
- uses: actions/checkout@v5
7171
- name: Create k8s Kind Cluster
7272
uses: helm/[email protected]
7373
- name: Setup Java
74-
uses: actions/setup-java@v4
74+
uses: actions/setup-java@v5
7575
with:
7676
distribution: 'temurin'
7777
java-version: 17.0.x
@@ -92,9 +92,9 @@ jobs:
9292
runs-on: ubuntu-latest
9393
name: Examples smoke test
9494
steps:
95-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@v5
9696
- name: Setup Java
97-
uses: actions/setup-java@v4
97+
uses: actions/setup-java@v5
9898
with:
9999
distribution: 'temurin'
100100
java-version: 17.0.x
@@ -142,7 +142,7 @@ jobs:
142142
- 5000:5000
143143
name: CRD Java Models Code Generation
144144
steps:
145-
- uses: actions/checkout@v4
145+
- uses: actions/checkout@v5
146146
- name: Publish to Registry
147147
uses: elgohr/Publish-Docker-Github-Action@v5
148148
with:

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
echo "${{ github.event.inputs.releaseVersion }}" | perl -ne 'die unless m/^\d+\.\d+\.\d+$/'
2828
echo "${{ github.event.inputs.nextDevelopmentVersion }}" | perl -ne 'die unless m/^\d+\.\d+\.\d+-SNAPSHOT$/'
2929
- name: Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
with:
3232
token: ${{ secrets.PAT_TOKEN }}
3333
- name: Check Actor
3434
run: |
3535
# Release actor should be in the OWNER list
3636
cat OWNERS | grep ${{ github.actor }}
3737
- name: Setup Java
38-
uses: actions/setup-java@v4
38+
uses: actions/setup-java@v5
3939
with:
4040
distribution: 'temurin'
4141
java-version: 17.0.x

‎.github/workflows/snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
- name: Setup Java
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v5
2121
with:
2222
distribution: 'temurin'
2323
java-version: 17.0.x

‎e2e/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@
4242
<version>${slf4j.version}</version>
4343
<scope>test</scope>
4444
</dependency>
45-
<dependency>
46-
<groupId>org.slf4j</groupId>
47-
<artifactId>slf4j-simple</artifactId>
48-
<version>${slf4j.version}</version>
49-
<scope>test</scope>
50-
</dependency>
5145
<dependency>
5246
<groupId>org.awaitility</groupId>
5347
<artifactId>awaitility</artifactId>

‎examples/examples-release-17/pom.xml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,6 @@
77
<version>25.0.0-SNAPSHOT</version>
88

99
<dependencies>
10-
<dependency>
11-
<groupId>ch.qos.logback</groupId>
12-
<artifactId>logback-classic</artifactId>
13-
<version>1.5.18</version>
14-
<scope>runtime</scope>
15-
</dependency>
16-
<dependency>
17-
<groupId>io.prometheus</groupId>
18-
<artifactId>simpleclient</artifactId>
19-
<version>0.15.0</version>
20-
</dependency>
21-
<dependency>
22-
<groupId>io.prometheus</groupId>
23-
<artifactId>simpleclient_httpserver</artifactId>
24-
<version>0.15.0</version>
25-
</dependency>
2610
<dependency>
2711
<groupId>io.kubernetes</groupId>
2812
<artifactId>client-java-api</artifactId>
@@ -51,7 +35,7 @@
5135
<dependency>
5236
<groupId>commons-cli</groupId>
5337
<artifactId>commons-cli</artifactId>
54-
<version>1.9.0</version>
38+
<version>1.10.0</version>
5539
</dependency>
5640
<dependency>
5741
<groupId>io.kubernetes</groupId>
@@ -76,19 +60,6 @@
7660
<version>3.13.1</version>
7761
<scope>test</scope>
7862
</dependency>
79-
<!--for
80-
spring controller example-->
81-
<dependency>
82-
<groupId>org.springframework.boot</groupId>
83-
<artifactId>spring-boot-starter-web</artifactId>
84-
<version>${spring.boot.version}</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.springframework.boot</groupId>
88-
<artifactId>spring-boot-starter-actuator</artifactId>
89-
<version>${spring.boot.version}</version>
90-
</dependency>
91-
9263
</dependencies>
9364

9465
<build>

‎examples/examples-release-18/pom.xml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,6 @@
88

99

1010
<dependencies>
11-
<dependency>
12-
<groupId>ch.qos.logback</groupId>
13-
<artifactId>logback-classic</artifactId>
14-
<version>1.5.18</version>
15-
<scope>runtime</scope>
16-
</dependency>
17-
<dependency>
18-
<groupId>io.prometheus</groupId>
19-
<artifactId>simpleclient</artifactId>
20-
<version>0.15.0</version>
21-
</dependency>
22-
<dependency>
23-
<groupId>io.prometheus</groupId>
24-
<artifactId>simpleclient_httpserver</artifactId>
25-
<version>0.15.0</version>
26-
</dependency>
2711
<dependency>
2812
<groupId>io.kubernetes</groupId>
2913
<artifactId>client-java-api</artifactId>
@@ -52,7 +36,7 @@
5236
<dependency>
5337
<groupId>commons-cli</groupId>
5438
<artifactId>commons-cli</artifactId>
55-
<version>1.9.0</version>
39+
<version>1.10.0</version>
5640
</dependency>
5741
<dependency>
5842
<groupId>io.kubernetes</groupId>
@@ -77,19 +61,6 @@
7761
<version>3.13.1</version>
7862
<scope>test</scope>
7963
</dependency>
80-
<!--for
81-
spring controller example-->
82-
<dependency>
83-
<groupId>org.springframework.boot</groupId>
84-
<artifactId>spring-boot-starter-web</artifactId>
85-
<version>${spring.boot.version}</version>
86-
</dependency>
87-
<dependency>
88-
<groupId>org.springframework.boot</groupId>
89-
<artifactId>spring-boot-starter-actuator</artifactId>
90-
<version>${spring.boot.version}</version>
91-
</dependency>
92-
9364
</dependencies>
9465

9566
<build>

‎examples/examples-release-19/pom.xml

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,6 @@
77
<version>25.0.0-SNAPSHOT</version>
88

99
<dependencies>
10-
<dependency>
11-
<groupId>ch.qos.logback</groupId>
12-
<artifactId>logback-classic</artifactId>
13-
<version>1.5.18</version>
14-
<scope>runtime</scope>
15-
</dependency>
16-
<dependency>
17-
<groupId>io.prometheus</groupId>
18-
<artifactId>simpleclient</artifactId>
19-
<version>0.15.0</version>
20-
</dependency>
21-
<dependency>
22-
<groupId>io.prometheus</groupId>
23-
<artifactId>simpleclient_httpserver</artifactId>
24-
<version>0.15.0</version>
25-
</dependency>
2610
<dependency>
2711
<groupId>io.kubernetes</groupId>
2812
<artifactId>client-java-api</artifactId>
@@ -51,7 +35,7 @@
5135
<dependency>
5236
<groupId>commons-cli</groupId>
5337
<artifactId>commons-cli</artifactId>
54-
<version>1.9.0</version>
38+
<version>1.10.0</version>
5539
</dependency>
5640
<dependency>
5741
<groupId>io.kubernetes</groupId>
@@ -76,24 +60,6 @@
7660
<version>3.13.1</version>
7761
<scope>test</scope>
7862
</dependency>
79-
<!--for
80-
spring controller example-->
81-
<dependency>
82-
<groupId>org.springframework.boot</groupId>
83-
<artifactId>spring-boot-starter-web</artifactId>
84-
<version>${spring.boot.version}</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.springframework.boot</groupId>
88-
<artifactId>spring-boot-starter-actuator</artifactId>
89-
<version>${spring.boot.version}</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>com.amazonaws</groupId>
93-
<artifactId>aws-java-sdk-sts</artifactId>
94-
<version>1.12.788</version>
95-
</dependency>
96-
9763
</dependencies>
9864

9965
<build>

0 commit comments

Comments
 (0)