Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
artembilan committed Sep 6, 2019
1 parent a39c2b6 commit 0566576
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 15 deletions.
35 changes: 25 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlinVersion = '1.3.31'
ext.kotlinVersion = '1.3.50'
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
Expand All @@ -14,6 +14,7 @@ plugins {
id 'org.sonarqube' version '2.7.1'
id 'checkstyle'
id 'org.ajoberstar.grgit' version '3.1.1'
id "io.spring.dependency-management" version "1.0.8.RELEASE"
}

description = 'Spring Integration Kafka Support'
Expand Down Expand Up @@ -54,13 +55,13 @@ compileTestKotlin {
}

ext {
assertkVersion = '0.17'
jacksonVersion = '2.9.9'
assertkVersion = '0.19'
jacksonVersion = '2.9.9.20190807'
junitJupiterVersion = '5.5.1'
junitPlatformVersion = '1.5.1'
log4jVersion = '2.11.2'
springIntegrationVersion = '5.2.0.BUILD-SNAPSHOT'
springKafkaVersion = '2.3.0.BUILD-SNAPSHOT'
log4jVersion = '2.12.1'
springIntegrationVersion = '5.2.0.RC1'
springKafkaVersion = '2.3.0.RC1'

idPrefix = 'kafka'

Expand All @@ -75,10 +76,24 @@ ext {
files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
}

dependencyManagement {
resolutionStrategy {
cacheChangingModulesFor 0, 'seconds'
}
applyMavenExclusions = false
generatedPomCustomization {
enabled = false
}
imports {
mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
}
}


eclipse.project.natures += 'org.springframework.ide.eclipse.core.springnature'

jacoco {
toolVersion = "0.8.3"
toolVersion = "0.8.4"
}

dependencies {
Expand All @@ -100,8 +115,8 @@ dependencies {
// To avoid compiler warnings about @API annotations in JUnit code
testCompileOnly 'org.apiguardian:apiguardian-api:1.0.0'

testRuntime "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
testRuntime "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
testRuntime "com.fasterxml.jackson.core:jackson-core"
testRuntime "com.fasterxml.jackson.core:jackson-databind"
testRuntime "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
}

Expand All @@ -121,7 +136,7 @@ test {

checkstyle {
configFile = new File(rootDir, "src/checkstyle/checkstyle.xml")
toolVersion = '8.20'
toolVersion = '8.24'
}

task updateCopyrights {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -125,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
11 changes: 11 additions & 0 deletions publish-maven.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ install {

def customizePom(pom, gradleProject) {
pom.whenConfigured { generatedPom ->

// sort to make pom dependencies order consistent to ease comparison of older poms
generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
"$dep.scope:$dep.groupId:$dep.artifactId"
}

def managedVersions = dependencyManagement.managedVersions
generatedPom.dependencies.findAll{dep -> !dep.version }.each { dep ->
dep.version = managedVersions["${dep.groupId}:${dep.artifactId}"]
}

// respect 'optional' and 'provided' dependencies
gradleProject.optionalDeps.each { dep ->
generatedPom.dependencies.find { it.artifactId == dep.name }?.optional = true
Expand Down

0 comments on commit 0566576

Please sign in to comment.