Merge pull request #6 from nbyl/spring-cleaning

update all dependencies to current version
nbyl · Feb 15, 2019 · 24d9169 · 24d9169
2 parents 0ec3935 + a20f98f
commit 24d9169
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: java
 
 script:
-  - ./gradlew check dockerBuildImage
+  - ./gradlew check
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 
@@ -20,4 +20,4 @@ cache:
 
 branches:
   only:
-  - master    
+  - master    
diff --git a/build.gradle b/build.gradle
@@ -1,36 +1,17 @@
-buildscript {
-    ext {
-        springBootVersion = '2.0.4.RELEASE'
-        springDependencyManagementVersion = '1.0.6.RELEASE'
-        gitVersion = '0.11.0'
-        dockerPluginVersion = '3.5.0'
-    }
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath("com.bmuschko:gradle-docker-plugin:${dockerPluginVersion}")
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-        classpath("gradle.plugin.com.palantir.gradle.gitversion:gradle-git-version:${gitVersion}")
-        classpath("io.spring.gradle:dependency-management-plugin:${springDependencyManagementVersion}")
-        classpath("com.aries:docker-java-shaded:3.1.0-rc-3")
-    }
+plugins {
+    id 'com.google.cloud.tools.jib' version '1.0.0'
+    id "com.palantir.git-version" version "0.11.0"
+    id "org.springframework.boot" version "2.1.2.RELEASE"
 }
 
 apply plugin: 'java'
 apply plugin: 'jacoco'
-apply plugin: 'com.bmuschko.docker-spring-boot-application'
-apply plugin: 'com.palantir.git-version'
-apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 sourceCompatibility = 8
 targetCompatibility = 8
 
-def versionDetails = versionDetails()
-version "${versionDetails.lastTag}-${versionDetails.gitHash}"
+version gitVersion()
 
 repositories {
     mavenCentral()
@@ -41,7 +22,6 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-actuator"
     compile "org.springframework.boot:spring-boot-starter-data-jpa"
     compile "org.springframework.boot:spring-boot-starter-data-rest"
-    compile "org.springframework.boot:spring-boot-starter-security"
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.liquibase:liquibase-core"
     runtime "org.hibernate:hibernate-java8"
@@ -82,13 +62,6 @@ task integrationTest(type: Test) {
     }
 }
 
-docker {
-    url 'unix:///var/run/docker.sock'
-    springBootApplication {
-        baseImage = 'openjdk:8-alpine'
-    }
-}
-
 jacocoTestReport {
     reports {
         xml.enabled true
@@ -97,3 +70,5 @@ jacocoTestReport {
 }
 
 check.dependsOn jacocoTestReport
+
+jib.to.image = "nbyl/confy"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Feb 15 11:29:27 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-all.zip