diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-04-02 13:56:32 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-04-02 15:45:00 +0200 |
| commit | 6d5d3e45847d611ea57606e744b909406371d392 (patch) | |
| tree | 61260d1a9e79e7a0a4afa54f94960a242f0e3bfd /pom.xml | |
| parent | b65a764b6bc5d28f59084a3af98df04fdf6373ba (diff) | |
| parent | 1b45b06116eee607152822d58103f5e4973d27b8 (diff) | |
| download | jgit-6d5d3e45847d611ea57606e744b909406371d392.tar.gz jgit-6d5d3e45847d611ea57606e744b909406371d392.zip | |
Merge branch 'stable-4.6'
* stable-4.6:
Update Jetty to 9.3.17.v20170317
Revert "Update Jetty to 9.4.1.v20170120 in buck build"
Revert "Update Jetty to 9.4.1.v20170120"
Change-Id: I9193b568cce9c72da899a8f3eaaf833956438e13
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -200,7 +200,7 @@ <commons-compress-version>1.6</commons-compress-version> <osgi-core-version>4.3.1</osgi-core-version> <servlet-api-version>3.1.0</servlet-api-version> - <jetty-version>9.4.3.v20170317</jetty-version> + <jetty-version>9.3.17.v20170317</jetty-version> <japicmp-version>0.5.3</japicmp-version> <httpclient-version>4.3.6</httpclient-version> <slf4j-version>1.7.2</slf4j-version> @@ -635,18 +635,6 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty-version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty-version}</version> - </dependency> - - <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <version>${osgi-core-version}</version> |