diff --git a/build.gradle b/build.gradle index 6cd8ebc..1133efd 100644 --- a/build.gradle +++ b/build.gradle @@ -22,10 +22,6 @@ allprojects { sourceCompatibility = 1.8 targetCompatibility = 1.8 - ext { - pathSDKVersion = "[1.4.0,2.0[" - } - repositories { mavenCentral() mavenLocal() @@ -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" @@ -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" } diff --git a/encryption-service-jasypt/gradle.lockfile b/encryption-service-jasypt/gradle.lockfile index 2c63d24..5fc8292 100644 --- a/encryption-service-jasypt/gradle.lockfile +++ b/encryption-service-jasypt/gradle.lockfile @@ -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 diff --git a/encryption-service-vault/gradle.lockfile b/encryption-service-vault/gradle.lockfile index 199e7e9..9dfe974 100644 --- a/encryption-service-vault/gradle.lockfile +++ b/encryption-service-vault/gradle.lockfile @@ -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 diff --git a/exception-reporter-honeybadger/gradle.lockfile b/exception-reporter-honeybadger/gradle.lockfile index efc340d..f0c9377 100644 --- a/exception-reporter-honeybadger/gradle.lockfile +++ b/exception-reporter-honeybadger/gradle.lockfile @@ -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 diff --git a/fault-tolerant-executor-resilience4j/gradle.lockfile b/fault-tolerant-executor-resilience4j/gradle.lockfile index e54c67d..abc8aa0 100644 --- a/fault-tolerant-executor-resilience4j/gradle.lockfile +++ b/fault-tolerant-executor-resilience4j/gradle.lockfile @@ -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 diff --git a/message-broker-nats/gradle.lockfile b/message-broker-nats/gradle.lockfile index 68ba253..8765129 100644 --- a/message-broker-nats/gradle.lockfile +++ b/message-broker-nats/gradle.lockfile @@ -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 diff --git a/platform/build.gradle b/platform/build.gradle index 104c6b0..7f0e93c 100644 --- a/platform/build.gradle +++ b/platform/build.gradle @@ -1,5 +1,4 @@ plugins { - id "java-platform" id "maven-publish" id "signing" } @@ -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")) diff --git a/store-redis/gradle.lockfile b/store-redis/gradle.lockfile index 330a6a8..ec11138 100644 --- a/store-redis/gradle.lockfile +++ b/store-redis/gradle.lockfile @@ -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 diff --git a/store-vault/gradle.lockfile b/store-vault/gradle.lockfile index 199e7e9..9dfe974 100644 --- a/store-vault/gradle.lockfile +++ b/store-vault/gradle.lockfile @@ -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