Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -32,4 +31,10 @@ jobs:
mkdir -p ~/artifacts/
find . -type f -regex ".*/build/libs/.*jar" -exec cp {} ~/artifacts/ \;
- store_artifacts:
path: ~/artifacts
path: ~/artifacts

workflows:
build:
jobs:
- build:
context: cloudsmith-creds
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
}
Expand Down