Fixes #1492

ini properties should be overridable
2017-04-21 13:25:52 +10:00 · 2017-04-21 13:25:52 +10:00 · 8aa64949c2
parent 29a26c76a2
commit 8aa64949c2
4 changed files with 4 additions and 4 deletions
--- a/jetty-util/src/main/config/modules/log4j-impl.mod
+++ b/jetty-util/src/main/config/modules/log4j-impl.mod
@ -26,5 +26,5 @@ Log4j is released under the Apache 2.0 license.
 http://www.apache.org/licenses/LICENSE-2.0.html

 [ini]
-log4j.version=1.2.17
+log4j.version?=1.2.17

--- a/jetty-util/src/main/config/modules/log4j2-api.mod
+++ b/jetty-util/src/main/config/modules/log4j2-api.mod
@ -21,5 +21,5 @@ Log4j is released under the Apache 2.0 license.
 http://www.apache.org/licenses/LICENSE-2.0.html

 [ini]
-log4j2.version=2.6.1
+log4j2.version?=2.6.1

--- a/jetty-util/src/main/config/modules/logback-impl.mod
+++ b/jetty-util/src/main/config/modules/logback-impl.mod
@ -34,5 +34,5 @@ or (per the licensee's choosing) under
    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html

 [ini]
-logback.version=1.1.7
+logback.version?=1.1.7

--- a/jetty-util/src/main/config/modules/slf4j-api.mod
+++ b/jetty-util/src/main/config/modules/slf4j-api.mod
@ -14,7 +14,7 @@ maven://org.slf4j/slf4j-api/${slf4j.version}|lib/slf4j/slf4j-api-${slf4j.version
 lib/slf4j/slf4j-api-${slf4j.version}.jar

 [ini]
-slf4j.version=1.7.21
+slf4j.version?=1.7.21

 [license]
 SLF4J is distributed under the MIT License.