Fix the examples so they compile and tests are green

Signed-off-by: Dave Syer <dsyer@vmware.com>
kubernetes-client · Jan 8, 2021 · 763ca3b · 763ca3b
1 parent dd41558
commit 763ca3b
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 11 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -70,6 +70,51 @@ jobs:
             -B \
             -De2e.skip=false \
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+  examples:
+    runs-on: ubuntu-latest
+    name: Examples smoke test
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11.0.x
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: |
+          mvn clean install \
+          -q \
+          -Dmaven.test.skip=true
+      - name: Build Cert Manager Contrib
+        run: |
+          cd client-java-contrib/cert-manager
+          mvn clean install \
+          -q \
+          -Dmaven.test.skip=true
+      - name: Build Prometheus Contrib
+        run: |
+          cd client-java-contrib/prometheus-operator
+          mvn clean install \
+          -q \
+          -Dmaven.test.skip=true
+      - name: Version 10
+        run: |
+          cd examples/examples-release-10
+          mvn clean install
+      - name: Version 11
+        run: |
+          cd examples/examples-release-11
+          mvn clean install
+      - name: Version 12
+        run: |
+          cd examples/examples-release-12
+          mvn clean install
   codegen:
     runs-on: ubuntu-latest
     services:

diff --git a/examples/examples-release-11/pom.xml b/examples/examples-release-11/pom.xml
@@ -1,16 +1,17 @@
 <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">
 	<modelVersion>4.0.0</modelVersion>
 
+	<groupId>io.kubernetes</groupId>
 	<artifactId>client-java-examples-release-11</artifactId>
-	<packaging>bundle</packaging>
 	<name>client-java-examples-release-11</name>
     <version>1.0.0</version>
     <properties>
-        <kubernetes.client.version>10.0.0</kubernetes.client.version>
+        <kubernetes.client.version>11.0.0</kubernetes.client.version>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <junit.version>4.13.1</junit.version>
+		<junit.version>4.13.1</junit.version>
+		<spring.boot.version>2.4.1</spring.boot.version>
     </properties>
 
 	<dependencies>
@@ -57,12 +58,12 @@
 		<dependency>
 			<groupId>io.kubernetes</groupId>
 			<artifactId>client-java-cert-manager-models</artifactId>
-			<version>0.16.1-SNAPSHOT</version>
+			<version>10.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>io.kubernetes</groupId>
 			<artifactId>client-java-prometheus-operator-models</artifactId>
-			<version>0.38.1-SNAPSHOT</version>
+			<version>10.0.1</version>
 		</dependency>
 		<!-- test dependencies -->
 		<dependency>

diff --git a/examples/examples-release-12/pom.xml b/examples/examples-release-12/pom.xml
@@ -4,14 +4,18 @@
 	<parent>
 		<groupId>io.kubernetes</groupId>
 		<artifactId>client-java-examples-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>11.0.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 
 	<artifactId>client-java-examples-release-12</artifactId>
-	<packaging>bundle</packaging>
 	<name>client-java-examples-release-12</name>
 
+	<properties>
+		<kubernetes.prometheus.version>11.0.1-SNAPSHOT</kubernetes.prometheus.version>
+		<kubernetes.cert-manager.version>11.0.1-SNAPSHOT</kubernetes.cert-manager.version>
+	</properties>
+
 	<dependencies>
         <dependency>
             <groupId>io.prometheus</groupId>
@@ -55,12 +59,12 @@
 		<dependency>
 			<groupId>io.kubernetes</groupId>
 			<artifactId>client-java-cert-manager-models</artifactId>
-			<version>0.16.1-SNAPSHOT</version>
+			<version>${kubernetes.cert-manager.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.kubernetes</groupId>
 			<artifactId>client-java-prometheus-operator-models</artifactId>
-			<version>0.38.1-SNAPSHOT</version>
+			<version>${kubernetes.prometheus.version}</version>
 		</dependency>
 		<!-- test dependencies -->
 		<dependency>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -15,7 +15,7 @@
 	<name>client-java-examples-parent</name>
 
 	<properties>
-		<kubernetes.client.version>10.0.1-SNAPSHOT</kubernetes.client.version>
+		<kubernetes.client.version>11.0.1-SNAPSHOT</kubernetes.client.version>
 	</properties>
 
 	<modules>