From 05d9cad752f1fab7935c350bb95fbbdf539514de Mon Sep 17 00:00:00 2001
From: TK Gospodinov <tgospodinov@pandora.com>
Date: Fri, 13 Oct 2017 16:50:18 -0700
Subject: [PATCH] resolved issue #392: made the logback version number
 configurable through the gretty gradle extension

---
 .../src/main/groovy/org/akhikhl/gretty/ServerConfig.groovy      | 1 +
 .../src/main/groovy/org/akhikhl/gretty/GrettyPlugin.groovy      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/gretty-core/src/main/groovy/org/akhikhl/gretty/ServerConfig.groovy b/libs/gretty-core/src/main/groovy/org/akhikhl/gretty/ServerConfig.groovy
index 27df708ad..c3194cf09 100644
--- a/libs/gretty-core/src/main/groovy/org/akhikhl/gretty/ServerConfig.groovy
+++ b/libs/gretty-core/src/main/groovy/org/akhikhl/gretty/ServerConfig.groovy
@@ -70,6 +70,7 @@ class ServerConfig {
   String springBootVersion
   String springLoadedVersion
   String springVersion
+  String logbackVersion
   Boolean singleSignOn
   /**
    * Tomcat-specific: Enables JNDI naming which is disabled by default.
diff --git a/libs/gretty/src/main/groovy/org/akhikhl/gretty/GrettyPlugin.groovy b/libs/gretty/src/main/groovy/org/akhikhl/gretty/GrettyPlugin.groovy
index 63161b97f..569624c5e 100644
--- a/libs/gretty/src/main/groovy/org/akhikhl/gretty/GrettyPlugin.groovy
+++ b/libs/gretty/src/main/groovy/org/akhikhl/gretty/GrettyPlugin.groovy
@@ -82,7 +82,7 @@ class GrettyPlugin implements Plugin<Project> {
     String springLoadedVersion = project.gretty.springLoadedVersion ?: (project.hasProperty('springLoadedVersion') ? project.springLoadedVersion : Externalized.getString('springLoadedVersion'))
     String springVersion = project.gretty.springVersion ?: (project.hasProperty('springVersion') ? project.springVersion : Externalized.getString('springVersion'))
     String slf4jVersion = Externalized.getString('slf4jVersion')
-    String logbackVersion = Externalized.getString('logbackVersion')
+    String logbackVersion = project.gretty.logbackVersion ?: (project.hasProperty('logbackVersion') ? project.logbackVersion :Externalized.getString('logbackVersion'))
 
     project.dependencies {
       grettyStarter "org.akhikhl.gretty:gretty-starter:$grettyVersion"