Skip to content

Commit

Permalink
Refactor version props to dependencies.gradle
Browse files Browse the repository at this point in the history
This is what we need to satisfy Dependabot expectations
  • Loading branch information
artembilan committed Dec 22, 2023
1 parent 28a30fa commit d20fb3e
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 43 deletions.
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ ext {
javaProjects = subprojects - project(':function-dependencies')
}

apply from: 'dependencies.gradle'

allprojects {
group = 'org.springframework.cloud.fn'

Expand Down Expand Up @@ -44,9 +46,9 @@ allprojects {
}

imports {
mavenBom "org.springframework.boot:spring-boot-dependencies:${property('spring-boot.version')}"
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${property('spring-cloud.version')}"
mavenBom "io.awspring.cloud:spring-cloud-aws-dependencies:${property('spring-cloud-aws.version')}"
mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion"
mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion"
mavenBom "io.awspring.cloud:spring-cloud-aws-dependencies:$springCloudAwsVersion"
}

}
Expand Down
2 changes: 1 addition & 1 deletion common/aws-s3-common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
api "org.springframework.integration:spring-integration-aws:${property('spring-integration-aws.version')}"
api "org.springframework.integration:spring-integration-aws:$springIntegrationAwsVersion"
api 'io.awspring.cloud:spring-cloud-aws-starter-s3'
api 'software.amazon.awssdk:aws-crt-client'
api 'org.springframework.integration:spring-integration-file'
Expand Down
8 changes: 2 additions & 6 deletions common/metadata-store-common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ext {
curatorVersion = '5.5.0'
}

dependencies {
optionalApi 'org.springframework.integration:spring-integration-redis'
optionalApi 'org.springframework.boot:spring-boot-starter-data-redis'
Expand All @@ -12,9 +8,9 @@ dependencies {
optionalApi 'io.awspring.cloud:spring-cloud-aws-starter'
optionalApi 'org.springframework.integration:spring-integration-zookeeper'
optionalApi 'org.springframework.integration:spring-integration-hazelcast'
optionalApi "org.springframework.integration:spring-integration-aws:${property('spring-integration-aws.version')}"
optionalApi "org.springframework.integration:spring-integration-aws:$springIntegrationAwsVersion"
api 'software.amazon.awssdk:dynamodb'

testImplementation 'org.hsqldb:hsqldb'
testImplementation "org.apache.curator:curator-test:$curatorVersion"
testImplementation 'org.apache.curator:curator-test:5.5.0'
}
9 changes: 3 additions & 6 deletions common/tensorflow-common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
ext {
tensorflowVersion='1.15.0'
commonsCompressVersion='1.25.0'
commonsIoVersion='2.15.0'
pcollectionsVersion='4.0.1'
}

dependencies {
api "org.tensorflow:tensorflow:$tensorflowVersion"
api "org.tensorflow:proto:$tensorflowVersion"
api "org.apache.commons:commons-compress:$commonsCompressVersion"
api "commons-io:commons-io:$commonsIoVersion"
api 'org.apache.commons:commons-compress:1.25.0'
api 'commons-io:commons-io:2.15.0'
api 'org.apache.commons:commons-lang3'
api "org.pcollections:pcollections:$pcollectionsVersion"
api 'org.pcollections:pcollections:4.0.1'
}
6 changes: 1 addition & 5 deletions common/twitter-common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
ext {
twitter4jVersion='4.0.7'
}

dependencies {
api "org.twitter4j:twitter4j-stream:$twitter4jVersion"
api 'org.twitter4j:twitter4j-stream:4.0.7'
api 'org.springframework.integration:spring-integration-ip'
}
10 changes: 10 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ext {
springBootVersion = '3.2.0'
springCloudVersion = '2023.0.0'
springCloudAwsVersion = '3.0.3'
springIntegrationAwsVersion = '3.0.4'

debeziumVersion = '2.4.1.Final'
ftpServerVersion = '1.2.0'
mockserverVersion = '5.13.2'
}
4 changes: 0 additions & 4 deletions function/twitter-function/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ext {
mockserverVersion='5.13.2'
}

dependencies {
api project(':twitter-common')

Expand Down
8 changes: 0 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,3 @@ org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
org.gradle.caching=true
org.gradle.parallel=true

spring-boot.version=3.2.0
spring-cloud.version=2023.0.0-SNAPSHOT
spring-cloud-aws.version=3.0.3
spring-integration-aws.version=3.0.4
angus-mail.version=2.0.2

debeziumVersion = 2.4.1.Final
ftpServerVersion=1.2.0
8 changes: 2 additions & 6 deletions supplier/mail-supplier/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
ext {
greenmailVersion='2.1.0-alpha-3'
}

dependencies {
api 'org.springframework.integration:spring-integration-mail'
api 'org.springframework.boot:spring-boot-starter-mail'
api "org.eclipse.angus:jakarta.mail:${property('angus-mail.version')}"
api 'org.eclipse.angus:jakarta.mail:2.0.2'

testImplementation "com.icegreen:greenmail:$greenmailVersion"
testImplementation 'com.icegreen:greenmail:2.1.0-alpha-3'
}
4 changes: 0 additions & 4 deletions supplier/twitter-supplier/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ext {
mockserverVersion='5.13.2'
}

dependencies {
api project(':twitter-common')
api 'org.springframework.integration:spring-integration-jms'
Expand Down

0 comments on commit d20fb3e

Please sign in to comment.