diff --git a/README.md b/README.md index 747513291a046fe955e628dbb1d77c955742df55..be8c1cfe20f1da75ad11d2f244ce81f9c9b7bb0b 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ Below are summed up the dependencies of each library: | STIL Library | | | X | In the `lib` directory, you will find 2 JAR files: -* The *HTTP Multipart Library*: `cos-1.5beta.jar` (i.e. package `com.oreilly.servlet`). This library helps dealing with uploads. -* The *[STIL Library](http://www.star.bris.ac.uk/~mbt/stil/)*: `stil3.1.jar` (i.e. packages `nom.tap`, `org.apache.tools.bzip2`, `uk.ac.starlink`). This library helps supporting VOTable (read and write) and some other output formats. +* The *HTTP Multipart Library*: `commons-fileupload-1.3.3.jar` (and `commons-io-2.6.jar`). This library helps dealing with uploads. +* The *[STIL Library](http://www.star.bris.ac.uk/~mbt/stil/)*: `stil_3.3-2.jar` (i.e. packages `nom.tap`, `org.apache.tools.bzip2`, `uk.ac.starlink`). This library helps supporting VOTable (read and write) and some other output formats. The *Postgres JDBC Driver* is needed ONLY IF you want to use (and keep) `adql.translator.PgSphereTranslator`. You can get this driver on the [PostgreSQL website](https://jdbc.postgresql.org/download.html). The required package for the ADQL and TAP libraries is `org.postgresql` (and particularly the class `org.postgresql.Driver`). diff --git a/build.gradle b/build.gradle index 5bbf284f2114a19f113bf57977ac54b7d3ad141f..5f771fa974259ea7e873bf8923d603e0e2da326e 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ repositories { } dependencies { - compile fileTree(dir: 'lib', includes: ['stil_3.1.jar']) + compile fileTree(dir: 'lib', includes: ['stil_3.3-2.jar']) compile 'javax.servlet:javax.servlet-api:3.0.1' compile 'postgresql:postgresql:9.1-901.jdbc4' compile 'org.slf4j:slf4j-api:1.7.25' diff --git a/buildTAP.xml b/buildTAP.xml index d174abb9be9f5ca18c28adc1c7aea7f307adad1a..1e9f50b64b5fb6ea4ef9ead859397cd610ae9fec 100644 --- a/buildTAP.xml +++ b/buildTAP.xml @@ -17,7 +17,7 @@ <property name="commonsFileUploadJarName" value="commons-fileupload-1.3.3.jar" /> <property name="commonsFileUploadJar" value="${libDir}/${commonsFileUploadJarName}" /> - <property name="stilJarName" value="stil_3.1.jar" /> + <property name="stilJarName" value="stil_3.3-2.jar" /> <property name="stilJar" value="${libDir}/${stilJarName}" /> <property name="slf4jApiJarName" value="slf4j-api-1.7.25.jar" /> diff --git a/lib/stil_3.1.jar b/lib/stil_3.1.jar deleted file mode 100644 index 2889b40826b24ba3b774e5c88d11ec633d47cab4..0000000000000000000000000000000000000000 Binary files a/lib/stil_3.1.jar and /dev/null differ diff --git a/lib/stil_3.3-2.jar b/lib/stil_3.3-2.jar new file mode 100644 index 0000000000000000000000000000000000000000..68d04aa63a34c1412ed778110114aeeb69351b01 Binary files /dev/null and b/lib/stil_3.3-2.jar differ diff --git a/src/tap/formatter/VOTableFormat.java b/src/tap/formatter/VOTableFormat.java index cf3f7248774223213beabf2e250f5255c8f2fb74..c641a6f95ba3ab2263180f65f60f31d324fdf10c 100644 --- a/src/tap/formatter/VOTableFormat.java +++ b/src/tap/formatter/VOTableFormat.java @@ -86,7 +86,7 @@ import uk.ac.starlink.votable.VOTableVersion; * </p> * * @author Grégory Mantelet (CDS;ARI) - * @version 2.2 (03/2019) + * @version 2.3 (03/2019) */ public class VOTableFormat implements OutputFormat { diff --git a/src/tap/resource/ForwardResource.java b/src/tap/resource/ForwardResource.java index 673924995495c002c06a917a0d09f6dec9c98423..a13102a8288389d549a2025bc8a91453116a7357 100644 --- a/src/tap/resource/ForwardResource.java +++ b/src/tap/resource/ForwardResource.java @@ -52,7 +52,7 @@ import uws.service.log.UWSLog.LogLevel; * <p><i>See {@link #forward(String, String, HttpServletRequest, HttpServletResponse)} for more details</i></p> * * @author Grégory Mantelet (ARI;CDS) - * @version 2.2 (03/2019) + * @version 2.3 (03/2019) * @since 2.1 */ public abstract class ForwardResource implements TAPResource {