From 55896db37d7f85d4ddb46657594ca9a65635cf8d Mon Sep 17 00:00:00 2001 From: Jeff Nelson Date: Sat, 31 Oct 2026 19:34:10 -0400 Subject: [PATCH 1/2] Adopt the shared Cinchapi dependency BOM --- build.gradle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 2832f06..dd0c2ae 100644 --- a/build.gradle +++ b/build.gradle @@ -16,12 +16,13 @@ plugins { ext.concourseVersion = '0.10.5' dependencies { - implementation group: 'com.cinchapi', name: 'accent4j', version: '1.12.0', changing:true + implementation platform('com.cinchapi:cinchapi-bom:1.0.0') + implementation group: 'com.cinchapi', name: 'accent4j' implementation group: 'com.cinchapi', name: 'concourse-driver-java', version: concourseVersion, changing:true // needed for util classes... implementation group: 'com.google.code.findbugs', name: 'jsr305', version:'2.0.1' - implementation group: 'com.google.guava', name:'guava', version:'25.1-jre' + implementation group: 'com.google.guava', name:'guava' - testImplementation 'junit:junit:4.11' + testImplementation 'junit:junit' } ext.generateSourcesJar = true @@ -65,7 +66,8 @@ repositories { def exclusions = [[group : 'com.google.guava', module: 'guava']] exclusions.each { exclusion -> configurations.implementation.dependencies.all { - if (name != exclusion.module || group != exclusion.group) { + if ((name != exclusion.module || group != exclusion.group) + && (name != 'cinchapi-bom' || group != 'com.cinchapi')) { exclude group: exclusion.group, module: exclusion.module } } From 3fe20ba3e6a4b1e5dd97074006259611dafd74f3 Mon Sep 17 00:00:00 2001 From: Jeff Nelson Date: Sun, 1 Nov 2026 10:31:16 -0500 Subject: [PATCH 2/2] Run CircleCI on config version 2.1 CircleCI no longer runs version 2 configs, so no pipeline ran for this branch. Declare version 2.1 and keep the existing job and its branch behavior. Move any step-level context, which version 2.1 rejects, to the workflow, and replace retired images. --- .circleci/config.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1d6c07..eaf3ff2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ -version: 2 +version: 2.1 jobs: build: docker: - - image: circleci/openjdk:8-jdk-browsers + - image: cimg/openjdk:8.0.322 environment: GRADLE_OPTS: "-Djenkins=true" TERM: dumb @@ -12,7 +12,6 @@ jobs: path: ~/$CIRCLE_PROJECT_REPONAME - run: name: Build and Upload - context: cloudsmith-creds command: | cd ~/$CIRCLE_PROJECT_REPONAME ./gradlew clean build publish --refresh-dependencies @@ -32,4 +31,10 @@ jobs: mkdir -p ~/artifacts/ find . -type f -regex ".*/build/libs/.*jar" -exec cp {} ~/artifacts/ \; - store_artifacts: - path: ~/artifacts \ No newline at end of file + path: ~/artifacts + +workflows: + build: + jobs: + - build: + context: cloudsmith-creds