diff --git a/html/lib.html b/html/lib.html
index b65294bb440fef90dbdf93b1d633757f43f22ece..d9bc76cca1456cf553aba0c454da5675c8bcab15 100644
--- a/html/lib.html
+++ b/html/lib.html
@@ -102,9 +102,9 @@ However, it is possible to delete the subdirectories <tt>src/fr/inrialpes/exmo/o
<dt><a href="http://dev.mysql.com/downloads/connector/j/">MySQL JDBC Connectors</a> 5.1.42: mysql-connector-java.jar [<a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GPL</a>]
or <a href="http://jdbc.postgresql.org/">Postgres JDBC connectors</a> 42.1.1: postgres-jdbc4.jar [<a href="http://jdbc.postgresql.org/license.html">BSD</a>]</dt>
<dd>This also requires MySQL to be installed. Required for alignsvc.</dd>
-<dt><a href="http://www.eclipse.org/jetty">Jetty</a> 9.1.4: jetty-server.jar jetty-http.jar jetty-io.jar jetty-util.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache</a>]</dt>
+<dt><a href="http://www.eclipse.org/jetty">Jetty</a> 9.4.6: jetty-server.jar jetty-http.jar jetty-io.jar jetty-util.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache</a>]</dt>
<dd>Required for HTTP management (HTML, REST, Web service).</dd>
-<dt><a href="https://github.com/javaee/servlet-spec/releases">Servlet API</a> 3.1: servlet-api.jar [<a href="https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html">CDDL + GPLv2 with classpath exception</a>]</dt>
+<dt><a href="https://github.com/javaee/servlet-spec/releases">Servlet API</a> 4.0: servlet-api.jar [<a href="https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html">CDDL + GPLv2 with classpath exception</a>]</dt>
<dd>Required and shipped with Jetty. This is part of Java 2 Enterprise Edition</dd>
<dt>Apache <a href="http://commons.apache.org/proper/commons-fileupload/">Commons fileupload</a> 1.3.3
and <a href="http://commons.apache.org/proper/commons-io/">Commons IO</a> 2.5: commons-fileupload.jar, commons-io.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache</a>]</dt>
@@ -118,7 +118,7 @@ and <a href="http://commons.apache.org/proper/commons-io/">Commons IO</a> 2.5: c
<h3>Required for the Agent/JADE plug-in</h3>
<dl>
-<dt><a href="http://jade.tilab.com/">Java Agent Development Environment (JADE)</a> 3.7: jade.jar http.jar iiop.jar [<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</a>]</dt>
+<dt><a href="http://jade.tilab.com/">Java Agent Development Environment (JADE)</a> 4.5: jade.jar http.jar iiop.jar [<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</a>]</dt>
<dd>Required by alignsvc (Agent version).</dd>
</dl>
@@ -135,7 +135,7 @@ and <a href="http://commons.apache.org/proper/commons-io/">Commons IO</a> 2.5: c
<h3>Required for the OSGI plug-in</h3>
<dl>
-<dt><a href="https://www.osgi.org/developer/downloads/">OSGi core framework </a> 5.0.0: osgi-core.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache</a>]</dt>
+<dt><a href="https://www.osgi.org/developer/downloads/">OSGi core framework </a> 6.0.0: osgi-core.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache</a>]</dt>
<dd>Required by alignsvc (OSGi version).</dd>
</dl>
diff --git a/html/relnotes.html b/html/relnotes.html
index 538f7da26f5d34ddaaa1aff90704f14018189ed2..e045dff40171b90db9b7f4b10bbe5b2ec6485789 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -93,10 +93,14 @@ with a warning:
<li>Upgraded to <span style="color: green">mysql 5.1.42</span> and <span style="color: green">postgres jdbc 42.1.1</span> (lib)</li>
<li>Upgraded to <span style="color: green">Commons lang 3.6</span> and <span style="color: green">Commons text 1.1</span> (lib)</li>
<li>Upgraded to <span style="color: green">Lucene 6.6.0</span> (lib)</li>
-<li>Upgraded to <span style="color: green">Thrift 0.10.0</span> (lib)</li>
+<li>Added <span style="color: green">Thrift 0.10.0</span> (lib)</li>
<li>Upgraded to <span style="color: green">HTTP Client 4.5.2</span> and <span style="color: green">HTTP Core 4.4.4</span> (lib)</li>
<li>Upgraded to <span style="color: green">Jena 3.3.0</span> (lib)</li>
<li>Upgraded to <span style="color: green">Ontosim 2.6</span> (lib)</li>
+<li>Upgraded to <span style="color: green">OSGi 6.0.0</span> (lib)</li>
+<li>Upgraded to <span style="color: green">Servlet API 4.0</span> (lib)</li>
+<li>Upgraded to <span style="color: green">Jetty 9.4.6</span> (lib)</li>
+<li>Upgraded to <span style="color: green">JADE 4.5</span> (lib)</li>
<li>Upgraded to <span style="color: green">TestNG 6.11</span> (dev)</li>
</ul></p>
diff --git a/lib/jade/jade.jar b/lib/jade/jade.jar
index b7b1a1d3a31960746df2afdc75ee0625cb7c5759..4cff7cb53ea9ea956aa06e8794b11a2759cb94a0 100755
Binary files a/lib/jade/jade.jar and b/lib/jade/jade.jar differ
diff --git a/lib/jade/jade.pom b/lib/jade/jade.pom
index 9d4b25104fea8741ec8abbc765e9e0936c063e30..97b113ea974a6d20490ce71fb69c4857da27c05d 100644
--- a/lib/jade/jade.pom
+++ b/lib/jade/jade.pom
@@ -3,7 +3,7 @@
<groupId>jade</groupId>
<artifactId>jade</artifactId>
- <version>4.3.3</version>
+ <version>4.5</version>
<name>Java Agent Development Environment (JADE)</name>
<description></description>
<licenses>
diff --git a/lib/jetty/jetty-http.jar b/lib/jetty/jetty-http.jar
index 576174222301614b0b3cc706084cf0abed6db48e..db4c0b89e9be5c91e4408f53d17ad0a786d33818 100644
Binary files a/lib/jetty/jetty-http.jar and b/lib/jetty/jetty-http.jar differ
diff --git a/lib/jetty/jetty-http.pom b/lib/jetty/jetty-http.pom
index 4db8604447ac0ae53bc602424df9608f72002222..da04701fd1439e335c2dbff5001f288662be745d 100644
--- a/lib/jetty/jetty-http.pom
+++ b/lib/jetty/jetty-http.pom
@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>9.3.3.v20150827</version>
+ <version>9.4.6.v20170531</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-http</artifactId>
@@ -18,6 +18,11 @@
<artifactId>jetty-util</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
@@ -26,6 +31,20 @@
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
+<!--
+ <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+-->
+ <Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder</Provide-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -45,6 +64,7 @@
<onlyAnalyze>org.eclipse.jetty.http.*</onlyAnalyze>
</configuration>
</plugin>
+
</plugins>
</build>
</project>
diff --git a/lib/jetty/jetty-io.jar b/lib/jetty/jetty-io.jar
index acc919d40da9edb2a44c5019f71eb202ca6c2c09..170c6711a50fa6d58a5313649c4674d4a84d2ce0 100644
Binary files a/lib/jetty/jetty-io.jar and b/lib/jetty/jetty-io.jar differ
diff --git a/lib/jetty/jetty-io.pom b/lib/jetty/jetty-io.pom
index b9c5ef2cfed6e0430a35944957f4e601b44f06ab..6938e7215682a07bdfedd044fe523754a3789cd4 100644
--- a/lib/jetty/jetty-io.pom
+++ b/lib/jetty/jetty-io.pom
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>9.3.3.v20150827</version>
+ <version>9.4.6.v20170531</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-io</artifactId>
@@ -22,11 +22,6 @@
<artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/lib/jetty/jetty-server.jar b/lib/jetty/jetty-server.jar
index ea3e704237c03e99b0c4705e5c90ad3177c54fe9..4772d729fe67dfd1201fc0e39eadb7b55cb448aa 100644
Binary files a/lib/jetty/jetty-server.jar and b/lib/jetty/jetty-server.jar differ
diff --git a/lib/jetty/jetty-server.pom b/lib/jetty/jetty-server.pom
index ec60a56e011433c1a91d1c915c69199d154f571d..a74477ec4a9da982869b0973018a16f61064044a 100644
--- a/lib/jetty/jetty-server.pom
+++ b/lib/jetty/jetty-server.pom
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>9.3.3.v20150827</version>
+ <version>9.4.6.v20170531</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-server</artifactId>
@@ -14,25 +14,6 @@
</properties>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>generate-manifest</id>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.jmx.*;resolution:=optional,*</Import-Package>
- <_nouses>true</_nouses>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -55,18 +36,9 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-test-helper</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
-<!--
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
--->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -91,9 +63,16 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/lib/jetty/jetty-util.jar b/lib/jetty/jetty-util.jar
index b1a4ba81441ba622046a0a859976e8277ad78e8b..c24989025bbe1419f7c15d4574294356371678de 100644
Binary files a/lib/jetty/jetty-util.jar and b/lib/jetty/jetty-util.jar differ
diff --git a/lib/jetty/jetty-util.pom b/lib/jetty/jetty-util.pom
index a1473ff836ebba68b4652c5849fa66bc827de01f..c0ca382cea1a658a4f8b0fba98b24c04cdeab987 100644
--- a/lib/jetty/jetty-util.pom
+++ b/lib/jetty/jetty-util.pom
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>9.3.3.v20150827</version>
+ <version>9.4.6.v20170531</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-util</artifactId>
@@ -14,23 +14,6 @@
</properties>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.slf4j;version="[1.6,2.0)";resolution:=optional,org.slf4j.impl;version="[1.6,2.0)";resolution:=optional,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
diff --git a/lib/osgi/osgi-core.jar b/lib/osgi/osgi-core.jar
index 583d4a20e3a6a16bd3fe13797995203401121390..5f229a4c400edcdcd64a7529da2af414939d2cef 100644
Binary files a/lib/osgi/osgi-core.jar and b/lib/osgi/osgi-core.jar differ
diff --git a/lib/osgi/osgi-core.pom b/lib/osgi/osgi-core.pom
index b06339491e1b26d8ce0fc3157adba585d71675d5..6f7dfbabc384a0c7bfef2bc4bb96d60004cb5f62 100644
--- a/lib/osgi/osgi-core.pom
+++ b/lib/osgi/osgi-core.pom
@@ -3,7 +3,7 @@
<groupId>org.osgi</groupId>
<artifactId>framework</artifactId>
- <version>5.0.0</version>
+ <version>6.0.0</version>
<name>OSGI framework</name>
<description>OSGI core framework</description>
<packaging>jar</packaging>
diff --git a/lib/servlet/servlet-api.jar b/lib/servlet/servlet-api.jar
index 6b14c3d267867e76c04948bb31b3de18e01412ee..193b93bf3c2d5c74d867f9e5334613bb0c30fc48 100644
Binary files a/lib/servlet/servlet-api.jar and b/lib/servlet/servlet-api.jar differ
diff --git a/lib/servlet/servlet-api.pom b/lib/servlet/servlet-api.pom
index 3d0169b6ece559f271cbca7724346c9a2f0cca8f..a4b30f2bf89f2c1e7be38c44e49a3e3ef995a311 100644
--- a/lib/servlet/servlet-api.pom
+++ b/lib/servlet/servlet-api.pom
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- NOTE: J. Euzenat
+This is the 3.1 pom with just version number changed by myself.
+There is no pom in the jar.
+-->
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
@@ -53,7 +57,7 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<packaging>jar</packaging>
- <version>3.1.0</version>
+ <version>4.0.0</version>
<properties>
<spec.version>3.1</spec.version>