Skip to content

Commit

Permalink
fix: add core dependency constraints to exclude bad core version
Browse files Browse the repository at this point in the history
  • Loading branch information
mattnichols committed Dec 19, 2022
1 parent 895f201 commit 3de69be
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 22 deletions.
26 changes: 20 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ allprojects {
sourceCompatibility = 1.8
targetCompatibility = 1.8

ext {
pathSDKVersion = "[1.4.0,2.0["
}

repositories {
mavenCentral()
mavenLocal()
Expand All @@ -34,8 +30,26 @@ allprojects {
}

subprojects {
if (it.name != platformProject) {

if (it.name == platformProject) {
apply plugin: "java-platform"
} else {
apply plugin: "java-library"
}

// Constraints for platform and all other projects
dependencies {
constraints {
api("com.mx.path-core:platform") {
version {
strictly "[1.4.0,2.0["
reject "1.4.0"
}
}
}
}

if (it.name != platformProject) {
apply plugin: "maven-publish"
apply plugin: "groovy"
apply plugin: "com.github.mxenabled.hush"
Expand All @@ -49,7 +63,7 @@ subprojects {
api "org.slf4j:slf4j-api:1.7.30"
}

implementation platform("com.mx.path-core:platform:${project.ext.pathSDKVersion}")
implementation platform("com.mx.path-core:platform")
implementation "com.mx.path-core:common"
}

Expand Down
4 changes: 2 additions & 2 deletions encryption-service-jasypt/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ com.google.guava:guava:28.2-jre=checkstyle
com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-codec:commons-codec:1.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions encryption-service-vault/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ com.google.guava:guava:28.2-jre=checkstyle
com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-collections:commons-collections:3.2.2=checkstyle
Expand Down
4 changes: 2 additions & 2 deletions exception-reporter-honeybadger/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=chec
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.jcabi:jcabi-log:0.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.jcabi:jcabi-manifests:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-codec:commons-codec:1.11=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions fault-tolerant-executor-resilience4j/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ com.google.guava:guava:28.2-jre=checkstyle
com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-collections:commons-collections:3.2.2=checkstyle
Expand Down
4 changes: 2 additions & 2 deletions message-broker-nats/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ com.google.guava:guava:28.2-jre=checkstyle
com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-collections:commons-collections:3.2.2=checkstyle
Expand Down
3 changes: 1 addition & 2 deletions platform/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id "java-platform"
id "maven-publish"
id "signing"
}
Expand All @@ -11,7 +10,7 @@ javaPlatform {
// Dependency versions aren't resolved, by default. Check this out to resolve this issue:
// https://github.com/gradle/gradle/issues/8887
dependencies {
api(platform("com.mx.path-core:platform:${project.ext.pathSDKVersion}"))
api platform("com.mx.path-core:platform")

constraints {
api(project(":message-broker-nats"))
Expand Down
4 changes: 2 additions & 2 deletions store-redis/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ com.google.guava:guava:28.2-jre=checkstyle
com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-collections:commons-collections:3.2.2=checkstyle
Expand Down
4 changes: 2 additions & 2 deletions store-vault/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ com.google.guava:guava:28.2-jre=checkstyle
com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:1.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-collections:commons-collections:3.2.2=checkstyle
Expand Down

0 comments on commit 3de69be

Please sign in to comment.