Skip to content
Snippets Groups Projects
Commit c32d7865 authored by Grégory Mantelet's avatar Grégory Mantelet
Browse files

[TAP] Upgrade STIL version.

The Gradle build file, the ANT build file and the README have also been updating
so that reflecting this upgrade as well as the migration from
com.oreilly.servlet to Apache Commons File Upload.

TAPLib versions of the former commit have also been fixed.
parent 25276fce
No related branches found
No related tags found
No related merge requests found
...@@ -47,8 +47,8 @@ Below are summed up the dependencies of each library: ...@@ -47,8 +47,8 @@ Below are summed up the dependencies of each library:
| STIL Library | | | X | | STIL Library | | | X |
In the `lib` directory, you will find 2 JAR files: 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 *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/)*: `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 *[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`). 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`).
......
...@@ -8,7 +8,7 @@ repositories { ...@@ -8,7 +8,7 @@ repositories {
} }
dependencies { 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 'javax.servlet:javax.servlet-api:3.0.1'
compile 'postgresql:postgresql:9.1-901.jdbc4' compile 'postgresql:postgresql:9.1-901.jdbc4'
compile 'org.slf4j:slf4j-api:1.7.25' compile 'org.slf4j:slf4j-api:1.7.25'
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<property name="commonsFileUploadJarName" value="commons-fileupload-1.3.3.jar" /> <property name="commonsFileUploadJarName" value="commons-fileupload-1.3.3.jar" />
<property name="commonsFileUploadJar" value="${libDir}/${commonsFileUploadJarName}" /> <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="stilJar" value="${libDir}/${stilJarName}" />
<property name="slf4jApiJarName" value="slf4j-api-1.7.25.jar" /> <property name="slf4jApiJarName" value="slf4j-api-1.7.25.jar" />
......
No preview for this file type
...@@ -86,7 +86,7 @@ import uk.ac.starlink.votable.VOTableVersion; ...@@ -86,7 +86,7 @@ import uk.ac.starlink.votable.VOTableVersion;
* </p> * </p>
* *
* @author Gr&eacute;gory Mantelet (CDS;ARI) * @author Gr&eacute;gory Mantelet (CDS;ARI)
* @version 2.2 (03/2019) * @version 2.3 (03/2019)
*/ */
public class VOTableFormat implements OutputFormat { public class VOTableFormat implements OutputFormat {
......
...@@ -52,7 +52,7 @@ import uws.service.log.UWSLog.LogLevel; ...@@ -52,7 +52,7 @@ import uws.service.log.UWSLog.LogLevel;
* <p><i>See {@link #forward(String, String, HttpServletRequest, HttpServletResponse)} for more details</i></p> * <p><i>See {@link #forward(String, String, HttpServletRequest, HttpServletResponse)} for more details</i></p>
* *
* @author Gr&eacute;gory Mantelet (ARI;CDS) * @author Gr&eacute;gory Mantelet (ARI;CDS)
* @version 2.2 (03/2019) * @version 2.3 (03/2019)
* @since 2.1 * @since 2.1
*/ */
public abstract class ForwardResource implements TAPResource { public abstract class ForwardResource implements TAPResource {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment