Skip to content

Commit 47e6216

Browse files
authored
Merge pull request #842 from DataDog/mar-kolya/limit-couchbase-latest-dep-version
Do not try to build against couchbase 2.7.5 since it didn't sync up w…
2 parents 48f951c + d900289 commit 47e6216

2 files changed

Lines changed: 14 additions & 5 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- run:
2727
name: Build Project
28-
command: GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Ddatadog.forkedMaxHeapSize=1G -Ddatadog.forkedMinHeapSize=64M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileTestScala compileTestJava --build-cache --parallel --stacktrace --no-daemon --max-workers=8
28+
command: GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Ddatadog.forkedMaxHeapSize=1G -Ddatadog.forkedMinHeapSize=64M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileLatestDepTestGroovy compileTestScala compileLatestDepTestScala compileTestJava compileLatestDepTestJava --build-cache --parallel --stacktrace --no-daemon --max-workers=8
2929

3030
- run:
3131
name: Collect Libs

dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@ muzzle {
1717
pass {
1818
group = 'com.couchbase.client'
1919
module = 'java-client'
20-
versions = "[2.0.0,)"
21-
assertInverse = true
20+
// Looks like 2.7.5 was just released and didn't sync up with mirrors properly causing build failures
21+
// TODO: remove this on a few days.
22+
versions = "[2.0.0,2.7.5)"
23+
// assertInverse = true
24+
}
25+
fail {
26+
group = 'com.couchbase.client'
27+
module = 'java-client'
28+
versions = "(,2.0.0)"
2229
}
2330
fail {
2431
group = 'com.couchbase.client'
@@ -46,6 +53,8 @@ dependencies {
4653
testCompile group: 'com.couchbase.client', name: 'java-client', version: '2.5.0'
4754

4855
latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.+'
49-
latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.6+'
50-
latestDepTestCompile group: 'com.couchbase.client', name: 'encryption', version: '+'
56+
// Looks like 2.7.5 was just released and didn't sync up with mirrors properly causing build failures
57+
// TODO: remove this on a few days.
58+
latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.7.4'
59+
latestDepTestCompile group: 'com.couchbase.client', name: 'encryption', version: '1.0.0'
5160
}

0 commit comments

Comments
 (0)