Upgrade Gradle to 3.4.1 and others

Apply `io.spring.dependency-management` plugin to use boms for dependencies
This commit is contained in:
Artem Bilan
2017-03-09 09:28:27 -05:00
parent f75c86aba7
commit 416ac4305c
4 changed files with 49 additions and 42 deletions

View File

@@ -3,9 +3,13 @@ buildscript {
maven { url 'http://repo.spring.io/plugins-release' }
}
dependencies {
classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE'
classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
}
configurations.classpath.resolutionStrategy.eachDependency {
if (it.requested.name == 'dependency-management-plugin') {
it.useVersion '1.0.0.RELEASE'
}
}
}
plugins {
@@ -13,7 +17,7 @@ plugins {
id 'eclipse'
id 'idea'
id 'jacoco'
id 'org.sonarqube' version '2.1'
id 'org.sonarqube' version '2.2.1'
id 'checkstyle'
}
description = 'Spring Integration AWS Support'
@@ -29,6 +33,27 @@ repositories {
maven { url 'http://repo.spring.io/libs-milestone' }
}
ext {
assertjVersion = '3.6.2'
servletApiVersion = '3.1.0'
slf4jVersion = '1.7.22'
springCloudAwsVersion = '1.1.3.RELEASE'
springIntegrationVersion = '4.3.8.RELEASE'
idPrefix = 'aws'
linkHomepage = 'https://github.com/spring-projects/spring-integration-aws'
linkCi = 'https://build.spring.io/browse/INTEXT'
linkIssue = 'https://jira.spring.io/browse/INTEXT'
linkScmUrl = 'https://github.com/spring-projects/spring-integration-aws'
linkScmConnection = 'https://github.com/spring-projects/spring-integration-aws.git'
linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-aws.git'
}
ext.javadocLinks = [
"http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/"
] as String[]
compileJava {
sourceCompatibility = 1.7
targetCompatibility = 1.7
@@ -47,45 +72,27 @@ sourceSets {
}
}
apply plugin: 'io.spring.dependency-management'
if (project.hasProperty('platformVersion')) {
apply plugin: 'spring-io'
}
dependencyManagement {
dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-aws-dependencies:$springCloudAwsVersion"
mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion"
}
if (project.hasProperty('platformVersion')) {
springIoTestRuntime {
imports {
mavenBom "io.spring.platform:platform-bom:${platformVersion}"
mavenBom "io.spring.platform:platform-bom:$platformVersion"
}
}
}
springIoDependencyVersionMappingCheck {
configuration = configurations.testRuntime
failOnUnmappedDirectDependency = false
}
}
ext {
assertjVersion = '3.6.2'
awsSdkVersion = '1.11.42'
servletApiVersion = '3.1.0'
slf4jVersion = '1.7.22'
springCloudAwsVersion = '1.1.3.RELEASE'
springIntegrationVersion = '4.3.7.RELEASE'
idPrefix = 'aws'
linkHomepage = 'https://github.com/spring-projects/spring-integration-aws'
linkCi = 'https://build.spring.io/browse/INTEXT'
linkIssue = 'https://jira.spring.io/browse/INTEXT'
linkScmUrl = 'https://github.com/spring-projects/spring-integration-aws'
linkScmConnection = 'https://github.com/spring-projects/spring-integration-aws.git'
linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-aws.git'
}
ext.javadocLinks = [
"http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/"
] as String[]
jacoco {
toolVersion = "0.7.8"
}
@@ -96,18 +103,18 @@ checkstyle {
}
dependencies {
compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
compile "org.springframework.cloud:spring-cloud-aws-core:$springCloudAwsVersion"
compile 'org.springframework.integration:spring-integration-core'
compile 'org.springframework.cloud:spring-cloud-aws-core'
compile("org.springframework.cloud:spring-cloud-aws-messaging:$springCloudAwsVersion", optional)
compile("org.springframework.integration:spring-integration-file:$springIntegrationVersion", optional)
compile("org.springframework.integration:spring-integration-http:$springIntegrationVersion", optional)
compile('org.springframework.cloud:spring-cloud-aws-messaging', optional)
compile('org.springframework.integration:spring-integration-file', optional)
compile('org.springframework.integration:spring-integration-http', optional)
compile("com.amazonaws:aws-java-sdk-kinesis:$awsSdkVersion", optional)
compile('com.amazonaws:aws-java-sdk-kinesis', optional)
compile("javax.servlet:javax.servlet-api:$servletApiVersion", provided)
testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion"
testCompile 'org.springframework.integration:spring-integration-test'
testCompile "org.assertj:assertj-core:$assertjVersion"
testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"

Binary file not shown.

View File

@@ -1,6 +1,6 @@
#Tue Feb 07 15:09:04 EST 2017
#Wed Mar 08 16:38:04 EST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip

View File

@@ -33,8 +33,8 @@ def customizePom(pom, gradleProject) {
description = gradleProject.description
url = 'https://github.com/spring-projects/spring-integration-aws'
organization {
name = 'SpringSource'
url = 'http://springsource.org'
name = 'SpringIO'
url = 'http://spring.io'
}
licenses {
license {