diff --git a/README.TXT b/README.TXT
index 64ec18cb558832f14f31dab1273051ba26e63d53..fb0539affa82b591ff445fcf1594f0e4ef66f264 100644
--- a/README.TXT
+++ b/README.TXT
@@ -1,6 +1,6 @@
#######################################################################
# Ontology alignment API and implementation #
-# 06/12/2015, version 4.8 #
+# 23/10/2015, version 4.7+ #
# http://alignapi.gforge.inria.fr #
#######################################################################
@@ -145,4 +145,4 @@ The alignment server is then available through HTTP with:
http://localhost:8089/html/
For debugging, using logback, do:
-$ java -cp lib/slf4j/logback-core-1.0.9.jar:lib/slf4j/logback-classic-1.0.9.jar:lib/alignsvc.jar -Dlogback.configurationFile=logback.xml fr.inrialpes.exmo.align.service.AlignmentService -Dwndict=../WordNet-3.0/dict -H
+$ java -cp lib/slf4j/logback-core-1.1.3.jar:lib/slf4j/logback-classic-1.1.3.jar:lib/alignsvc.jar -Dlogback.configurationFile=logback.xml fr.inrialpes.exmo.align.service.AlignmentService -Dwndict=../WordNet-3.0/dict -H
diff --git a/html/relnotes.html b/html/relnotes.html
index d66be9eab5e90117c5f876babd9d5fd0849e4ed0..8a729dc701b2193a7dc29024bd157802739053b9 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -87,6 +87,9 @@ with a warning:
<li>Upgraded to <span style="color: green">lucene 5.3.1</span> (lib)</li>
<li>Upgraded to <span style="color: green">commons cli 1.3.1</span> (lib)</li>
<li>Upgraded to <span style="color: green">Jena 3.0.0</span> (lib)</li>
+<li>Upgraded to <span style="color: green">Jade 4.3.3</span> (lib)</li>
+<li>Upgraded to <span style="color: green">mysql 5.1.36</span> and <span style="color: green">postgres 9.4-1204</span> (lib)</li>
+<li>Upgraded to <span style="color: green">Jetty 9.3.3</span> (lib)</li>
</ul></p>
<h2>Version 4.7 (2014): 06/12/2014 - Al pesto</h2>
diff --git a/lib/jade/iiop.jar b/lib/jade/iiop.jar
deleted file mode 100755
index 18fbf19c907481dea27147e55abfef009ade7ab3..0000000000000000000000000000000000000000
Binary files a/lib/jade/iiop.jar and /dev/null differ
diff --git a/lib/jade/iiop.pom b/lib/jade/iiop.pom
deleted file mode 100644
index 234a59e8a3cf3219604ceafab7e7f8571bf58367..0000000000000000000000000000000000000000
--- a/lib/jade/iiop.pom
+++ /dev/null
@@ -1,28 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>FIPA</groupId>
- <artifactId>iiop</artifactId>
- <version>3.3</version> <!-- or is it 3.7 ?-->
- <name>FIPA IIOP For Jade</name>
- <description>Part of Jade implementing FIPA IIOP</description>
- <licenses>
- <license>
- <name>GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- </license>
- </licenses>
-
- <url>http://jade.tilab.com/</url>
- <!--distributionManagement>
- <downloadUrl></downloadUrl>
- </distributionManagement>
-
- <dependencies>
- <dependency>
- <groupId>jade</groupId>
- <artifactId>jade</artifactId>
- </dependency>
- </dependencies-->
-
-</project>
diff --git a/lib/jade/jade-http.jar b/lib/jade/jade-http.jar
deleted file mode 100755
index b0b9c010e3b06b186736afda9865280a7f414858..0000000000000000000000000000000000000000
Binary files a/lib/jade/jade-http.jar and /dev/null differ
diff --git a/lib/jade/jade-http.pom b/lib/jade/jade-http.pom
deleted file mode 100644
index b86f5ecb85c4c6af77322c65b96be8a4ec0dc609..0000000000000000000000000000000000000000
--- a/lib/jade/jade-http.pom
+++ /dev/null
@@ -1,31 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>jade.mtp</groupId>
- <artifactId>http</artifactId>
- <version>3.3</version>
- <name>Jade HTTP Message transport protocol</name>
- <licenses>
- <license>
- <name>GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- </license>
- </licenses>
-
- <url>http://jade.tilab.com/</url>
- <!--distributionManagement>
- <downloadUrl></downloadUrl>
- </distributionManagement-->
-
- <!--dependencies>
- <dependency>
- <groupId>jade</groupId>
- <artifactId>jade</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xml</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- </dependencies-->
-
-</project>
diff --git a/lib/jade/jade.jar b/lib/jade/jade.jar
index 96ff81644c66124fcbb974b438de1d2bbf00797b..b7b1a1d3a31960746df2afdc75ee0625cb7c5759 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 039a7f532cb40bd4afc1123913173f187f0a825c..9d4b25104fea8741ec8abbc765e9e0936c063e30 100644
--- a/lib/jade/jade.pom
+++ b/lib/jade/jade.pom
@@ -3,7 +3,7 @@
<groupId>jade</groupId>
<artifactId>jade</artifactId>
- <version>3.3</version>
+ <version>4.3.3</version>
<name>Java Agent Development Environment (JADE)</name>
<description></description>
<licenses>
diff --git a/lib/jdbc/mysql-connector-java.jar b/lib/jdbc/mysql-connector-java.jar
index 2f1b7ab5fb924a6e637a6b605721ea85f0af7884..21b99db0971c6070b0b7bfaa45f0187b64576458 100644
Binary files a/lib/jdbc/mysql-connector-java.jar and b/lib/jdbc/mysql-connector-java.jar differ
diff --git a/lib/jdbc/mysql-connector-java.pom b/lib/jdbc/mysql-connector-java.pom
index f9be14a8db5eca32122766f15c38ad4cb5ba1151..193ed75fb198769affe5d779c8899e6a87bc797f 100644
--- a/lib/jdbc/mysql-connector-java.pom
+++ b/lib/jdbc/mysql-connector-java.pom
@@ -3,7 +3,7 @@
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.28</version>
+ <version>5.1.36</version>
<name>Java Database connector (JDBC) for MySQL</name>
<licenses>
<license>
diff --git a/lib/jdbc/postgresql-jdbc4.jar b/lib/jdbc/postgresql-jdbc4.jar
index 04a86ad7a67a96c37fa4fc1e71fec951d220dda5..61b202169bd8910e0f362aee65abd37c09ed17d5 100644
Binary files a/lib/jdbc/postgresql-jdbc4.jar and b/lib/jdbc/postgresql-jdbc4.jar differ
diff --git a/lib/jdbc/postgresql-jdbc4.pom b/lib/jdbc/postgresql-jdbc4.pom
index 39db5e83be61153847c87c08d6d6c4dc58491300..6821ea0a522ee258f707a06e669b30f78c6f3d27 100644
--- a/lib/jdbc/postgresql-jdbc4.pom
+++ b/lib/jdbc/postgresql-jdbc4.pom
@@ -3,7 +3,7 @@
<groupId>org.postgresql</groupId>
<artifactId>postgresql-jdbc4</artifactId>
- <version>9.3-1100</version>
+ <version>9.4-1204</version>
<name>Java Database connector (JDBC) for Postgres</name>
<licenses>
<license>
diff --git a/lib/jetty/jetty-http.jar b/lib/jetty/jetty-http.jar
index 36539aeffbb7c7fd4c86a0008b0ef4a7233f51b6..576174222301614b0b3cc706084cf0abed6db48e 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 3d941699d716a27f3352f309b30141f71e26bfc6..4db8604447ac0ae53bc602424df9608f72002222 100644
--- a/lib/jetty/jetty-http.pom
+++ b/lib/jetty/jetty-http.pom
@@ -3,25 +3,12 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>9.1.4.v20140401</version>
+ <version>9.3.3.v20150827</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-http</artifactId>
<name>Jetty :: Http Utility</name>
<url>http://www.eclipse.org/jetty</url>
- <!-- Extended from included pom.xml -->
- <packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
-
<properties>
<bundle-symbolic-name>${project.groupId}.http</bundle-symbolic-name>
</properties>
@@ -39,33 +26,10 @@
</dependencies>
<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)",javax.net.*,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
<execution>
<id>test-jar</id>
<goals>
@@ -73,11 +37,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/lib/jetty/jetty-io.jar b/lib/jetty/jetty-io.jar
index 79a7dd206fbd5b94c4fa467a1d082eeefeabc236..acc919d40da9edb2a44c5019f71eb202ca6c2c09 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 43e84785bf48ea27e3af9047ea87d1ef595d8130..b9c5ef2cfed6e0430a35944957f4e601b44f06ab 100644
--- a/lib/jetty/jetty-io.pom
+++ b/lib/jetty/jetty-io.pom
@@ -2,25 +2,12 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>9.1.4.v20140401</version>
+ <version>9.3.3.v20150827</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-io</artifactId>
<name>Jetty :: IO Utility</name>
<url>http://www.eclipse.org/jetty</url>
- <!-- Extended from included pom.xml -->
- <packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
-
<properties>
<bundle-symbolic-name>${project.groupId}.io</bundle-symbolic-name>
</properties>
@@ -43,35 +30,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
diff --git a/lib/jetty/jetty-server.jar b/lib/jetty/jetty-server.jar
index d43e7f7b30672fa35edcb20b0320260b20239026..ea3e704237c03e99b0c4705e5c90ad3177c54fe9 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 2ff2d46cea7efeb731a41e8513273c63aa7b12c4..ec60a56e011433c1a91d1c915c69199d154f571d 100644
--- a/lib/jetty/jetty-server.pom
+++ b/lib/jetty/jetty-server.pom
@@ -2,26 +2,13 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>9.1.4.v20140401</version>
+ <version>9.3.3.v20150827</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-server</artifactId>
<name>Jetty :: Server Core</name>
<description>The core jetty server artifact.</description>
<url>http://www.eclipse.org/jetty</url>
- <!-- Extended from included pom.xml -->
- <packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
-
<properties>
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
</properties>
@@ -39,7 +26,7 @@
</goals>
<configuration>
<instructions>
- <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.jmx.*;version="9.1";resolution:=optional,*</Import-Package>
+ <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.jmx.*;resolution:=optional,*</Import-Package>
<_nouses>true</_nouses>
</instructions>
</configuration>
@@ -50,12 +37,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
<execution>
<id>test-jar</id>
<goals>
@@ -63,28 +44,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>config</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/lib/jetty/jetty-util.jar b/lib/jetty/jetty-util.jar
index 79a1abd544de6c6dd7919f2770084dc4fe2db058..b1a4ba81441ba622046a0a859976e8277ad78e8b 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 fd7d6ee13a308c6e214c13370b56441c1c20f5cb..a1473ff836ebba68b4652c5849fa66bc827de01f 100644
--- a/lib/jetty/jetty-util.pom
+++ b/lib/jetty/jetty-util.pom
@@ -2,25 +2,13 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>9.1.4.v20140401</version>
+ <version>9.3.3.v20150827</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-util</artifactId>
<name>Jetty :: Utilities</name>
<description>Utility classes for Jetty</description>
<url>http://www.eclipse.org/jetty</url>
- <!-- Extended from included pom.xml -->
- <packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
<properties>
<bundle-symbolic-name>${project.groupId}.util</bundle-symbolic-name>
</properties>
@@ -37,41 +25,12 @@
</goals>
<configuration>
<instructions>
- <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,*</Import-Package>
+ <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>
- <!--
- Required for OSGI
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>config</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
@@ -87,6 +46,11 @@
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-perf-helper</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
diff --git a/lib/ontosim/ontosim.jar b/lib/ontosim/ontosim.jar
index 1baee1c85f021ee9fe93bb5f3370f6231a07b5a8..b7d2be7aa78be8d23506630393a7949f2266a73d 100644
Binary files a/lib/ontosim/ontosim.jar and b/lib/ontosim/ontosim.jar differ
diff --git a/lib/ontosim/ontosim.pom b/lib/ontosim/ontosim.pom
index 5235ca12bc5cfbedd273a3d54f1cbea1443d58a8..9fb54b954f917420abd43590f552e129d736fee4 100644
--- a/lib/ontosim/ontosim.pom
+++ b/lib/ontosim/ontosim.pom
@@ -3,7 +3,7 @@
<groupId>fr.inrialpes.exmo</groupId>
<artifactId>ontosim</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<name>OntoSim</name>
<description>OntoSim is a library and API for distances and similarities between ontologies.</description>
<licenses>