Merge pull request #14 from muellners/develop
update spring dependencies
diff --git a/.gitignore b/.gitignore
index 536de5a..97a49d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
.idea
build/
target/
-
+.project
+.settings
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/build.gradle b/build.gradle
index 4e151d9..6a38b4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,16 +21,16 @@
}
dependencies {
- classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.10.0'
+ classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
classpath ("org.ajoberstar:grgit:2.0.0")
}
}
plugins {
- id 'com.github.hierynomus.license' version '0.13.1'
- id("org.nosphere.apache.rat") version "0.3.1"
- id "com.jfrog.artifactory" version "4.9.5"
- id "io.spring.dependency-management" version "1.0.8.RELEASE"
+ id 'com.github.hierynomus.license' version '0.15.0'
+ id("org.nosphere.apache.rat") version "0.6.0"
+ id "com.jfrog.artifactory" version "4.15.1"
+ id "io.spring.dependency-management" version "1.0.9.RELEASE"
id 'maven-publish'
id 'java'
id 'idea'
@@ -40,9 +40,9 @@
ext {
versions = [
- springcontext : '4.3.3.RELEASE',
- springboot : '1.4.1.RELEASE',
- findbugs : '3.0.1'
+ springcontext : '5.2.5.RELEASE',
+ springboot : '2.2.6.RELEASE',
+ findbugs : '3.0.2'
]
changesetId = grgit.head().id
}
@@ -62,8 +62,8 @@
dependencyManagement {
imports {
- mavenBom 'io.spring.platform:platform-bom:Athens-RELEASE'
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Camden.SR1'
+ mavenBom 'io.spring.platform:platform-bom:Cairo-SR8'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR2'
}
}
@@ -75,7 +75,8 @@
)
testCompile(
- [group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springboot]
+ [group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springboot],
+ [group: 'junit', name: 'junit']
)
}
@@ -120,6 +121,6 @@
rat {
// List of exclude directives, defaults to ['**/.gradle/**']
- excludes = [ ".idea/**", ".gradle/**", "gradle/**", "build/**", "gradlew", "gradlew.bat", "README.md" ]
- plainOutput = true
+ excludes = [ ".idea/**", ".gradle/**", "gradle/**", "build/**", "gradlew", "gradlew.bat", "README.md", ".settings/**", ".project" ]
+ //plainOutput = true
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 290541c..6623300 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
