Commit Graph

1652 Commits

Author SHA1 Message Date
dependabot[bot] 7835454532
Bump asm.version from 7.3.1 to 9.0
Bumps `asm.version` from 7.3.1 to 9.0.

Updates `asm` from 7.3.1 to 9.0

Updates `asm-commons` from 7.3.1 to 9.0

Updates `asm-tree` from 7.3.1 to 9.0

Updates `asm-analysis` from 7.3.1 to 9.0

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-05 06:23:54 +00:00
dependabot[bot] 0b9e59f794
Bump javax.annotation-api from 1.3 to 1.3.2
Bumps [javax.annotation-api](https://github.com/javaee/javax.annotation) from 1.3 to 1.3.2.
- [Release notes](https://github.com/javaee/javax.annotation/releases)
- [Commits](https://github.com/javaee/javax.annotation/compare/1.3...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-05 06:23:15 +00:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358)
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:02:32 -05:00
Joakim Erdfelt 6b9ae705a9
Fixing build when using maven 3.6.3 (#5366)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 20:41:58 +10:00
Joakim Erdfelt a5fe448a21
Fixing enforcer rule around junit versioning
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 10:02:37 -05:00
Joakim Erdfelt f8b06e8bc6
Bumping jetty-test-helper from 5.4 to 5.5
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 07:07:15 -05:00
Joakim Erdfelt 1904903f8c
Merge pull request #5356 from eclipse/jetty-9.4.x_no_wagon_ssh
remove maven-wagon-ssh dependency
2020-09-28 06:49:28 -05:00
olivier lamy 92c9d782c2 Revert "Bump derbytools from 10.14.2.0 to 10.15.2.0 (#5345)"
This reverts commit 71388ef575.
2020-09-28 20:06:35 +10:00
dependabot[bot] 39f6111227
Bump maven-shade-plugin from 3.2.2 to 3.2.4 (#5335)
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.2...maven-shade-plugin-3.2.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-28 19:17:20 +10:00
dependabot[bot] 71388ef575
Bump derbytools from 10.14.2.0 to 10.15.2.0 (#5345)
Bumps derbytools from 10.14.2.0 to 10.15.2.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-28 19:15:08 +10:00
olivier lamy 88a2816d09 remove wagon ssh dependency
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-28 14:41:57 +10:00
olivier lamy 730a442499 use last jacoco plugin version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-23 17:20:12 +10:00
Olivier Lamy 53f3bbd32d
upgrade ant dependencies version to 1.10.8 to avoid security warning (#5275)
* upgrade ant dependency version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* ant 1.10.8
2020-09-18 06:25:04 +10:00
Olivier Lamy 3849a9118f
h2s spec maven plugin 1.0.0 with h2spec 2.6.0 (#5231)
* use our fork of h2spec-maven-plugin and upgrade version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* add a profile to run spec server

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use h2spec plugin new version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* version h2spec 1.0.0

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* exclude specs we know not working

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use our own package name

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* test no exclusion

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* restore known failure

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* h2spec maven plugin version 1.0.0

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* change default port for manual testing

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-14 21:01:10 +10:00
Olivier Lamy 26d50c8e29
Jetty 9.4.x not skipping tests failure and fix jaas test (#5255)
* remove -Dmaven.test.failure.ignore=true

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* get JAASLdapLoginServiceTest working

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* increase memory

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use only single thread to have more readable log in Jenkins

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* disable java8

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* test only java8

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* increase memory

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* try -T3

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* restore jdk11/14

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* try more memory

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* archive logs from Jenkins

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* archive logs from Jenkins

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* more memory

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* skip jacoco

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* test useManifestOnlyJar true

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* junit

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* useManifestOnlyJar false

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* debug maven surefire

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* very simple build to debug

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* try M5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* try not using withMaven

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* no debug surefire M4

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* all jdk and M5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* enable jacoco only for java8

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* reduce memory usage for test

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* avoid duplications of warnings parsing

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix my bad

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-11 13:11:04 +10:00
Olivier Lamy 2d9fcf20ea
upgrade some maven plugins version (#5143)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-15 10:32:01 +10:00
Joakim Erdfelt e1e8e50112
Merge pull request #5130 from eclipse/jetty-9.4.x-remove-overlay-deployer
Remove long dead jetty-overlay-deployer module
2020-08-12 10:04:43 -05:00
Olivier Lamy 12667497e1
Jetty 9.4.x surefire 3.0.0 m5 (#5136)
* test surefire 3.0.0-M5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* simplify code to avoid some timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-12 10:27:12 +10:00
Joakim Erdfelt a700708165
Removing dead maven modules
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-11 08:30:34 -05:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
Joakim Erdfelt 980ad4c666
Reverting accidental upgrade to surefire
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-22 14:38:33 -05:00
Joakim Erdfelt 1b5268b511
Issue #5069 - Fixing assumeConnectTimeout test condition
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-21 16:04:27 -05:00
Joakim Erdfelt cb898ac74a
Bumping up to Checkstyle 8.29
+ This is in response to a dependabot notification
  of vulnerabilities in Checkstyle 8.20

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-25 09:24:36 -05:00
Olivier Lamy a644a4b390
no need of creating/attaching sources twice for release as it is done in the default build (and we do not need forking a lifecycle for that) (#4938)
* no need of creating/attaching sources twice for release as it is done in the default build

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* comment

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* no need to fork a lifecycle when attaching sources files

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-19 12:47:46 +10:00
olivier lamy f745d5d5df remove unused imports and upgrade testcontainers.version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-15 17:40:15 +10:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
olivier lamy c48aee0a54 maven war plugin 3.3.0
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-11 10:08:41 +10:00
Jan Bartel 74a2ce7a42
Issue #4826 Upgrade to apache jsp 8.5.54 (#4932)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-06-03 10:04:55 +02:00
olivier lamy ab0d5e7121 simplify release script to not call goals already triggered by eclipse-release profile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-31 09:04:59 +10:00
olivier lamy c05bd6c26d use testcontainers/docker to run jdbc sessions tests with Mariadb remote
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 16:00:23 +10:00
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00
Jan Bartel 6527b3b083
Issue #4868 update asm 7.3.1 (#4869)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-05-13 12:12:14 +02:00
olivier lamy 933ab641ee test helper 5.4
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-11 15:38:15 +10:00
olivier lamy cba05a3db0 increase surefire memory
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 11:00:49 +10:00
Olivier Lamy 78992a126c
Start a mongo instance for testing using docker via java code (#4840)
* remove slow mongo maven plugin which was forking an external process and now run mongodb in a container so we can even now test with different version using -Dmongo.docker.version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 07:06:03 +10:00
olivier lamy 32aa5d6453 not sure if it is used but at least we will not hit this repo when building
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-22 14:52:14 +10:00
Simone Bordet fe7f71fda1 Excluding the "external" tests to make builds in Jenkins more reliable.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-19 16:47:49 +02:00
Simone Bordet 15f7e0671b Issue #4443 - Track backport of ALPN APIs to Java 8.
Removed Java 8 profiles, not needed anymore.
Jetty 9.4.x requires Java 9+ to be built, in order to build Java 9 specific modules.
The ALPN boot jar used in tests was either replaced by the ALPN agent or the tests only run in Java 9+.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-18 16:21:36 +02:00
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
Simone Bordet 6df47dd183 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4443-alpn-backport-8u252'. 2020-03-18 10:57:23 +01:00
Simone Bordet 785b640327 Fixes #2896 - Wrong Certificate Selected When Using Multiple Virtual Host Names in Conscrypt
Updating to a Conscrypt version that supports this feature.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 23:40:38 +01:00
Simone Bordet 9bb92f81bd Issue #4443 - Track backport of ALPN APIs to Java 8.
Modified jetty-alpn-openjdk8-* classes to support both
pre 8u252 (via alpn-boot) and post 8u252 (via standard API).

Replaced usages of -Xbootclasspath with -javaagent, and
using Jetty ALPN Agent jar rather than Jetty ALPN boot jar.

Removed all alpn-1.8.0*.mod files since now it is
possible to use a fixed version of the ALPN Agent
to cover all the versions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:40:29 +01:00
Olivier Lamy 3a77542303
upgrade shade plugin and align version (#4639)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-05 09:10:12 +10:00
Olivier Lamy 3a8b45d20c
Issue #4619 align derby version (#4626)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 10:20:27 +10:00
Joakim Erdfelt 8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00
Joakim Erdfelt a304fd9f35 Updating to version 9.4.27.v20200227 2020-02-27 12:21:57 -06:00
Olivier Lamy 602e700e02
use pmd plugin 3.13.0 (#4566)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-02-12 16:30:56 +10:00
Simone Bordet 7746be770a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-30 10:17:10 +01:00
Simone Bordet f52ed62f36 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-30 10:09:34 +01:00
Simone Bordet 305e4609b2 Updated ALPN version for JDK 8u241 and 8u242.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-30 10:03:38 +01:00
olivier lamy ff19bef4dc alpn for jdk 1.8.0_242
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-24 19:59:28 +10:00
Greg Wilkins a76fd0e948 updated Weld
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-21 10:21:52 +01:00
Jan Bartel fedc7c6599
Issue #4360 Update to jasper 8.5.49 (#4487)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 09:21:16 +01:00
Joakim Erdfelt 56fc476d55 Updating to version 9.4.27-SNAPSHOT 2020-01-17 07:00:10 -06:00
Joakim Erdfelt 7b38981d25 Updating to version 9.4.26.v20200117 2020-01-17 06:21:47 -06:00
Joakim Erdfelt 33a5a257aa
Updates from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 11:32:04 -06:00
Joakim Erdfelt 1c00006ca7
Checkstyle now mandatory on build
+ Removed checkstyle suppressions
+ Force scan on source directories (main and test)
+ Excluding generated / filtered / copied sources
+ Removed Jenkins job for checkstyle

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 14:47:16 -06:00
Simone Bordet 69808d3851
Merge pull request #4454 from JLLeitschuh/patch-1
Use HTTPS instead of HTTP to download SNAPSHOT Deps
2020-01-07 17:23:57 +01:00
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
Jonathan Leitschuh 46140ed097 HTTPS instead of HTTP to download SNAPSHOT Deps
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
2020-01-04 11:45:43 -05:00
Joakim Erdfelt f4e7e4c3db Merge branch 'release-9.4.25' into jetty-9.4.x 2020-01-03 12:49:27 -06:00
olivier lamy e1371a1c13 happy new year
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
Joakim Erdfelt 8974176c4b Updating to version 9.4.26-SNAPSHOT 2019-12-20 11:30:41 -06:00
Joakim Erdfelt a9729c7e7f Updating to version 9.4.25.v20191220 2019-12-20 10:46:56 -06:00
Joakim Erdfelt 19e740451a
Bump up jetty-version-maven-plugin to version 2.6
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-26 14:15:23 -06:00
Joakim Erdfelt 5d7f7d6499 Merge branch 'release-9.4.24' into jetty-9.4.x 2019-11-26 10:31:28 -06:00
olivier lamy 3b7400b3f7 rerunFailingTestsCount only for Jenkins
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-25 16:09:39 +10:00
Olivier Lamy 07680b4bb2
Issue #2634 fix occasional exception stack trace in UnixSocketTest (#4339)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-21 17:04:16 +10:00
Joakim Erdfelt 0f7a3b2d91 Updating to version 9.4.25-SNAPSHOT 2019-11-20 16:08:38 -06:00
Joakim Erdfelt 363d5f2df3 Updating to version 9.4.24.v20191120 2019-11-20 15:25:01 -06:00
Joakim Erdfelt dc03431de2 Merge branch 'release-9.4.23' into jetty-9.4.x 2019-11-20 07:14:53 -06:00
olivier lamy 9ab6a073fa we do not need those repositories now
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-19 20:28:43 +10:00
Joakim Erdfelt 453d41940b Updating to version 9.4.24-SNAPSHOT 2019-11-18 13:52:51 -06:00
Joakim Erdfelt abbccc65d6 Updating to version 9.4.23.v20191118 2019-11-18 13:09:44 -06:00
Jan Bartel ac63c121b6 Issue #3869 Update to asm 7.2
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-18 16:49:15 +11:00
olivier lamy e69eea86c8 make rerunFailingTestsCount a property so we can change it on cli if needed
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-18 07:20:42 +10:00
Olivier Lamy 905deeb49a
Jetty 9.4.x rerun failing tests count set to 3 and upgrade surefire which supports it for junit5 (#4320)
* rerunFailingTestsCount and test surefire 3.0.0-M4 fixing it for junit5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-18 07:10:44 +10:00
Joakim Erdfelt 43d95cd984 Updating to version 9.3.29-SNAPSHOT 2019-11-05 13:02:10 -06:00
Joakim Erdfelt d7dd68d6e9 Updating to version 9.3.28.v20191105 2019-11-05 11:46:40 -06:00
Joakim Erdfelt b17439c731 Updating to version 9.2.30-SNAPSHOT 2019-11-05 11:23:21 -06:00
Joakim Erdfelt 36c95fdd43 Updating to version 9.2.29.v20191105 2019-11-05 10:43:15 -06:00
Joakim Erdfelt 1ed13b6b30 Updating to version 9.4.23-SNAPSHOT 2019-10-22 09:19:41 -05:00
Joakim Erdfelt b1e6b55512 Updating to version 9.4.22.v20191022 2019-10-22 08:20:50 -05:00
olivier lamy 66dd5ad788 use last jacoco plugin 0.8.5
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-10-20 21:44:15 +10:00
Simone Bordet 94aff6b848 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2019-10-16 22:14:22 +02:00
Simone Bordet abc92e5c5d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2019-10-16 21:53:17 +02:00
Simone Bordet c9bf1744a5 Updated ALPN version for JDK 8u231 and 8u232.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-16 21:11:46 +02:00
Joakim Erdfelt 7807eafad9 Updating to version 9.4.22-SNAPSHOT 2019-09-26 10:46:28 -05:00
Joakim Erdfelt 72970db61a Updating to version 9.4.21.v20190926 2019-09-26 09:59:15 -05:00
Joakim Erdfelt e013c24326
Merge pull request #4038 from eclipse/jetty-9.4.x-OpenId
OpenID Connect Authentication
2019-09-13 16:42:17 -05:00
olivier lamy 2d6e9b0efc use maven invoker plugin 3.2.1 released version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-13 11:17:34 +10:00
Olivier Lamy 39a3cd6b3c
force mergeUserSettings to true (#4051)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-06 13:28:32 +10:00