Applied the http patch from Emmanuel Bourg
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/trunk@1749726 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index b60b4ad..5094431 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,18 +55,17 @@
<!-- Set versions for depending jars -->
<ant.version>1.9.6</ant.version>
- <bcprov.version>1.54</bcprov.version>
+ <bcprov.version>1.53</bcprov.version>
<commons.cli.version>1.3.1</commons.cli.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.daemon.version>1.0.15</commons.daemon.version>
- <commons.io.version>2.4</commons.io.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.net.version>3.4</commons.net.version>
<commons.pool.version>1.6</commons.pool.version>
<dnsjava.version>2.1.7</dnsjava.version>
<ehcache.version>2.8.5</ehcache.version>
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
- <jetty.version>6.1.26</jetty.version>
+ <jetty.version>9.2.16.v20160414</jetty.version>
<junit.version>4.12</junit.version>
<ldapsdk.version>4.1</ldapsdk.version>
<log4j.version>1.2.17</log4j.version>
@@ -1046,12 +1045,6 @@
<!-- Commons dependencies -->
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons.collections.version}</version>
@@ -1220,24 +1213,12 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- <version>6.1.14</version>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
<groupId>findbugs</groupId>
<artifactId>annotations</artifactId>
<version>${findbugs.annotations.version}</version>