diff options
| author |   Yuli Shlosberg <ys9693@att.com> | 2018-10-02 17:51:22 +0300 |
|---|---|---|
| committer |   Michael Lando <michael.lando@intl.att.com> | 2018-10-08 06:50:52 +0000 |
| commit | d4929e3b2a53ae05b6f213da9b3255c2bce12d3f (patch) | |
| tree | 07b36da71181ec87f8b4d62bb5a7999912622492 | |
| parent | 86b2f6d9686b15c8a3ec77184ec9545f6aecdc62 (diff) | |
update jetty version
Change-Id: I4dbe6a4056a21af5a72b1ee9d5316674109fdd21
Issue-ID: SDC-1707
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
| -rw-r--r-- | catalog-be/pom.xml | 7 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | ui-ci/pom.xml | 16 |
3 files changed, 14 insertions, 11 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index ac7d789d8a..f7e458973e 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -515,13 +515,6 @@ <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jetty.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <version>${jetty.version}</version> <scope>test</scope> @@ -49,7 +49,7 @@ Modifications copyright (c) 2018 Nokia <elastic-search.version>2.4.0</elastic-search.version> <catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version> <catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version> - <jetty.version>9.3.20.v20170531</jetty.version> + <jetty.version>9.4.11.v20180605</jetty.version> <!-- JSON and YAML Parsing --> <jackson.version>2.8.10</jackson.version> diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index b167cc1992..7d2b6af5f1 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -23,22 +23,32 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> - <!-- <version>21.0</version> --> <scope>compile</scope> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> + <version>2.53.1</version> - <!-- <version>3.4.0</version> --> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-server</artifactId> <version>2.53.1</version> - <!-- <version>3.4.0</version> --> <scope>runtime</scope> </dependency> |