Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix examples so they compile and tests are green #1474

Merged
merged 1 commit into from Jan 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 45 additions & 0 deletions .github/workflows/maven.yml
Expand Up @@ -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:
Expand Down
11 changes: 6 additions & 5 deletions 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>
Expand Down Expand Up @@ -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>
Expand Down
14 changes: 9 additions & 5 deletions examples/examples-release-12/pom.xml
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Expand Up @@ -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>
Expand Down