8000 Fix the examples so they compile and tests are green · tony-clarke-amdocs/java@763ca3b · GitHub
[go: up one dir, main page]
Skip to content

Commit 763ca3b

Browse files
author
Dave Syer
committed
Fix the examples so they compile and tests are green
Signed-off-by: Dave Syer <dsyer@vmware.com>
1 parent dd41558 commit 763ca3b

File tree

4 files changed

+61
-11
lines changed

4 files changed

+61
-11
lines changed

‎.github/workflows/maven.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,51 @@ jobs:
7070
-B \
7171
-De2e.skip=false \
7272
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
73+
examples:
74+
runs-on: ubuntu-latest
75+
name: Examples smoke test
76+
steps:
77+
- uses: actions/checkout@v2
78+
- name: Setup Java
79+
uses: actions/setup-java@v1
80+
with:
81+
java-version: 11.0.x
82+
- name: Cache local Maven repository
83+
uses: actions/cache@v2
84+
with:
85+
path: ~/.m2/repository
86+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
87+
restore-keys: |
88+
${{ runner.os }}-maven-
89+
- name: Build with Maven
90+
run: |
91+
mvn clean install \
92+
-q \
93+
-Dmaven.test.skip=true
94+
- name: Build Cert Manager Contrib
95+
run: |
96+
cd client-java-contrib/cert-manager
97+
mvn clean install \
98+
-q \
99+
-Dmaven.test.skip=true
100+
- name: Build Prometheus Contrib
101+
run: |
102+
cd client-java-contrib/prometheus-operator
103+
mvn clean install \
104+
-q \
105+
-Dmaven.test.skip=true
106+
- name: Version 10
107+
run: |
108+
cd examples/examples-release-10
109+
mvn clean install
110+
- name: Version 11
111+
run: |
112+
cd examples/examples-release-11
113+
mvn clean install
114+
- name: Version 12
115+
run: |
116+
cd examples/examples-release-12
117+
mvn clean install
73118
codegen:
74119
runs-on: ubuntu-latest
75120
services:

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33

4+
<groupId>io.kubernetes</groupId>
45
<artifactId>client-java-examples-release-11</artifactId>
5-
<packaging>bundle</packaging>
66
<name>client-java-examples-release-11</name>
77
<version>1.0.0</version>
88
<properties>
9-
<kubernetes.client.version>10.0.0</kubernetes.client.version>
9+
<kubernetes.client.version>11.0.0</kubernetes.client.version>
1010
<java.version>1.8</java.version>
1111
<maven.compiler.source>${java.version}</maven.compiler.source>
1212
<maven.compiler.target>${java.version}</maven.compiler.target>
13-
<junit.version>4.13.1</junit.version>
13+
<junit.version>4.13.1</junit.version>
14+
<spring.boot.version>2.4.1</spring.boot.version>
1415
</properties>
1516

1617
<dependencies>
@@ -57,12 +58,12 @@
5758
<dependency>
5859
<groupId>io.kubernetes</groupId>
5960
<artifactId>client-java-cert-manager-models</artifactId>
60-
<version>0.16.1-SNAPSHOT</version>
61+
<version>10.0.1</version>
6162
</dependency>
6263
<dependency>
6364
<groupId>io.kubernetes</groupId>
6465
<artifactId>client-java-prometheus-operator-models</artifactId>
65-
<version>0.38.1-SNAPSHOT</version>
66+
<version>10.0.1</version>
6667
</dependency>
6768
<!-- test dependencies -->
6869
<dependency>

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

Lines changed: 9 additions & 5 deletions
< 9E7A td data-grid-cell-id="diff-8db57fcdc632e7bb56b27e1b1c3d67a65d8e8252425ce6a9994166056696f4a9-57-61-2" data-line-anchor="diff-8db57fcdc632e7bb56b27e1b1c3d67a65d8e8252425ce6a9994166056696f4a9R61" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);padding-right:24px" tabindex="-1" valign="top" class="focusable-grid-cell diff-text-cell right-side-diff-cell left-side">
<artifactId>client-java-cert-manager-models</artifactId>
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@
44
<parent>
55
<groupId>io.kubernetes</groupId>
66
<artifactId>client-java-examples-parent</artifactId>
7-
<version>1.0.0-SNAPSHOT</version>
8-
<relativePath>../pom.xml</relativePath>
7+
<version>11.0.1-SNAPSHOT</version>
8+
<relativePath>..</relativePath>
99
</parent>
1010

1111
<artifactId>client-java-examples-release-12</artifactId>
12-
<packaging>bundle</packaging>
1312
<name>client-java-examples-release-12</name>
1413

14+
<properties>
15+
<kubernetes.prometheus.version>11.0.1-SNAPSHOT</kubernetes.prometheus.version>
16+
<kubernetes.cert-manager.version>11.0.1-SNAPSHOT</kubernetes.cert-manager.version>
17+
</properties>
18+
1519
<dependencies>
1620
<dependency>
1721
<groupId>io.prometheus</groupId>
@@ -55,12 +59,12 @@
5559
<dependency>
5660
<groupId>io.kubernetes</groupId>
5761
58-
<version>0.16.1-SNAPSHOT</version>
62+
<version>${kubernetes.cert-manager.version}</version>
5963
</dependency>
6064
<dependency>
6165
<groupId>io.kubernetes</groupId>
6266
<artifactId>client-java-prometheus-operator-models</artifactId>
63-
<version>0.38.1-SNAPSHOT</version>
67+
<version>${kubernetes.prometheus.version}</version>
6468
</dependency>
6569
<!-- test dependencies -->
6670
<dependency>

‎examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<name>client-java-examples-parent</name>
1616

1717
<properties>
18-
<kubernetes.client.version>10.0.1-SNAPSHOT</kubernetes.client.version>
18+
<kubernetes.client.version>11.0.1-SNAPSHOT</kubernetes.client.version>
1919
</properties>
2020

2121
<modules>

0 commit comments

Comments
 (0)
0