Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
This commit is contained in:
commit
e19233c1e3
|
@ -414,7 +414,8 @@ TMPDIR="`cygpath -w $TMPDIR`"
|
|||
;;
|
||||
esac
|
||||
|
||||
JETTY_SYS_PROPS=$(echo -ne "-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
|
||||
BASE_JETTY_SYS_PROPS=$(echo -ne "-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
|
||||
JETTY_SYS_PROPS=(${JETTY_SYS_PROPS[*]} $BASE_JETTY_SYS_PROPS)
|
||||
|
||||
#####################################################
|
||||
# This is how the Jetty server will be started
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -104,7 +104,7 @@
|
|||
<kerb-simplekdc.version>2.0.2</kerb-simplekdc.version>
|
||||
<log4j2.version>2.17.2</log4j2.version>
|
||||
<logback.version>1.3.0-alpha16</logback.version>
|
||||
<mariadb.version>3.0.4</mariadb.version>
|
||||
<mariadb.version>3.0.5</mariadb.version>
|
||||
<mariadb.docker.version>10.3.6</mariadb.docker.version>
|
||||
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
|
||||
<maven.resolver.version>1.8.0</maven.resolver.version>
|
||||
|
|
Loading…
Reference in New Issue