diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e8cf779..a0b8007e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/pom.xml b/pom.xml index a02e8e8c..2f13d352 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.spotify foss-root - 9 + 15 @@ -22,57 +22,45 @@ 11 11 2.27 - 2.9.9 - 1.11.2 - 0.14.1 - 2.23.2 - 0.106.0-alpha - 1.24.0 - 3.10.0 - 4.1.42.Final - 1.14.0 - 28.1-jre - 1.4.9 + 2.12.2 + 1.15.2 + 0.16.0 + 2.33 + 1.17.7 + 30.1-jre + 1.4.13 + 1.7.30 - - com.spotify - apollo-bom - ${apollo.version} + com.google.guava + guava-bom + ${guava.version} pom import - com.google.cloud - google-cloud-bom - ${google.cloud.version} + com.fasterxml.jackson + jackson-bom + ${jackson-version} pom import - com.google.protobuf - protobuf-java - ${protobuf.version} - - - io.grpc - grpc-bom - ${grpc.version} + com.spotify + apollo-bom + ${apollo.version} pom import - com.google.guava - guava - ${guava.version} - - - com.google.code.gson - gson - 2.8.5 + com.google.cloud + libraries-bom + 19.0.0 + pom + import org.glassfish.jersey @@ -81,20 +69,25 @@ import pom + + io.opencensus + opencensus-api + 0.28.0 + + + commons-codec + commons-codec + 1.15 + + + net.java.dev.jna + jna + 5.5.0 + - - javax.xml.bind - jaxb-api - 2.3.1 - - - javax.activation - activation - 1.1.1 - com.spotify.metrics semantic-metrics-core @@ -123,12 +116,12 @@ org.slf4j jul-to-slf4j - 1.7.26 + ${slf4j.version} org.slf4j slf4j-api - 1.7.26 + ${slf4j.version} ch.qos.logback @@ -137,7 +130,7 @@ com.google.cloud.bigtable bigtable-client-core - 1.12.1 + 1.19.0 com.google.cloud @@ -159,16 +152,12 @@ com.google.cloud.sql postgres-socket-factory - 1.0.5 + 1.0.13 org.postgresql postgresql - 42.2.2 - - - org.eclipse.jetty - jetty-server + 42.2.18 com.typesafe @@ -177,12 +166,12 @@ com.zaxxer HikariCP - 3.1.0 + 3.4.5 org.springframework spring-jdbc - 5.0.7.RELEASE + 5.3.2 com.github.spotbugs @@ -193,7 +182,7 @@ org.apache.commons commons-compress - 1.19 + 1.20 provided @@ -204,11 +193,12 @@ io.kubernetes client-java - 8.0.0 + 9.0.2 com.google.code.gson gson + 2.8.6 @@ -249,7 +239,7 @@ maven-dependency-plugin - 2.10 + 3.1.2 prepare-package @@ -269,30 +259,10 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 - - - com.puppycrawl.tools - checkstyle - 8.29 - - checkstyle.xml true - - - validate - validate - - check - - - true - - - com.coveo @@ -312,12 +282,11 @@ with fmt-maven-plugin, i.e. trailing spaces in comments --> org.codehaus.mojo license-maven-plugin - 1.19 com.github.spotbugs spotbugs-maven-plugin - 3.1.11 + 4.2.0 maven-enforcer-plugin @@ -328,14 +297,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12.4 - - - org.apache.maven.surefire - surefire-junit4 - 2.12.4 - - org.apache.maven.plugins @@ -380,15 +341,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 - - - - foo - bar - - - org.codehaus.mojo