Skip to content
This repository was archived by the owner on Mar 31, 2022. It is now read-only.

upgraded kubernetes client-java to 9.0.2 and other upgrades #132

Draft
balaji wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

upgraded kubernetes client-java to 9.0.2 and other upgrades #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33e0c66
upgraded kubernetes client-java to 9.0.2 and other upgrades
Mar 10, 2021
06e799e
revert fmt plugin for this PR
Mar 10, 2021
166490e
test circleci 2.1
Mar 10, 2021
227b5fb
set maven_opts in the command line
Mar 10, 2021
3e952a8
try if default works
Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 18 additions & 37 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,23 @@
# Java Maven CircleCI 2.0 configuration file
#
# Check https://circleci.com/docs/2.0/language-java/ for more details
#
version: 2
executorType: machine
jobs:
build:
docker:
# specify the version you desire here
- image: circleci/openjdk:11-jdk
version: 2.1
orbs:
maven: circleci/maven@1.1

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/postgres:9.4

working_directory: ~/repo

environment:
# Customize the JVM maximum heap limit
MAVEN_OPTS: -Xmx3200m
executors:
jdk11:
docker:
- image: 'cimg/openjdk:11.0'

jobs:
build:
executor: jdk11
steps:
- checkout
- maven/with_cache:
steps:
- run: mvn clean verify
- maven/process_test_results

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "pom.xml" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: mvn dependency:go-offline

- save_cache:
paths:
- ~/.m2
key: v1-dependencies-{{ checksum "pom.xml" }}

# run tests
- run: mvn verify
workflows:
build:
jobs:
- build
148 changes: 50 additions & 98 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.spotify</groupId>
<artifactId>foss-root</artifactId>
<version>9</version>
<version>15</version>
</parent>

<properties>
Expand All @@ -22,57 +22,45 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<jersey-version>2.27</jersey-version>
<jackson-version>2.9.9</jackson-version>
<testcontainers.version>1.11.2</testcontainers.version>
<auto-matter.version>0.14.1</auto-matter.version>
<dagger.version>2.23.2</dagger.version>
<google.cloud.version>0.106.0-alpha</google.cloud.version>
<grpc.version>1.24.0</grpc.version>
<protobuf.version>3.10.0</protobuf.version>
<netty.version>4.1.42.Final</netty.version>
<apollo.version>1.14.0</apollo.version>
<guava.version>28.1-jre</guava.version>
<dockerfile-maven-version>1.4.9</dockerfile-maven-version>
<jackson-version>2.12.2</jackson-version>
<testcontainers.version>1.15.2</testcontainers.version>
<auto-matter.version>0.16.0</auto-matter.version>
<dagger.version>2.33</dagger.version>
<apollo.version>1.17.7</apollo.version>
<guava.version>30.1-jre</guava.version>
<dockerfile-maven-version>1.4.13</dockerfile-maven-version>
<slf4j.version>1.7.30</slf4j.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- To make enforcer plugin happy -->
<dependency>
<groupId>com.spotify</groupId>
<artifactId>apollo-bom</artifactId>
<version>${apollo.version}</version>
<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>${guava.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bom</artifactId>
<version>${google.cloud.version}</version>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<groupId>com.spotify</groupId>
<artifactId>apollo-bom</artifactId>
<version>${apollo.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>19.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey</groupId>
Expand All @@ -81,20 +69,25 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>0.28.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.5.0</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.spotify.metrics</groupId>
<artifactId>semantic-metrics-core</artifactId>
Expand Down Expand Up @@ -123,12 +116,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.26</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.26</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand All @@ -137,7 +130,7 @@
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-core</artifactId>
<version>1.12.1</version>
<version>1.19.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
Expand All @@ -159,16 +152,12 @@
<dependency>
<groupId>com.google.cloud.sql</groupId>
<artifactId>postgres-socket-factory</artifactId>
<version>1.0.5</version>
<version>1.0.13</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>42.2.18</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
Expand All @@ -177,12 +166,12 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.1.0</version>
<version>3.4.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.3.2</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
Expand All @@ -193,7 +182,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.19</version>
<version>1.20</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -204,11 +193,12 @@
<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
<version>8.0.0</version>
<version>9.0.2</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>

<!-- test scope -->
Expand Down Expand Up @@ -249,7 +239,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>3.1.2</version>
<executions>
<execution>
<phase>prepare-package</phase>
Expand All @@ -269,30 +259,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.29</version>
</dependency>
</dependencies>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<failOnViolation>true</failOnViolation>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.coveo</groupId>
Expand All @@ -312,12 +282,11 @@
with fmt-maven-plugin, i.e. trailing spaces in comments -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>1.19</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.11</version>
<version>4.2.0</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
Expand All @@ -328,14 +297,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.12.4</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -380,15 +341,6 @@
<!--https://github.com/oracle/opengrok/issues/2629-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<javaApiLinks>
<property>
<name>foo</name>
<value>bar</value>
</property>
</javaApiLinks>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down