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

README.md

+2 −2
Original line number Diff line number Diff line
@@ -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`).

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -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'

buildTAP.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

src/tap/formatter/VOTableFormat.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ import uk.ac.starlink.votable.VOTableVersion; 
 * </p>

 *

 * @author Gr&eacute;gory Mantelet (CDS;ARI)

 * @version 2.2 (03/2019)

 * @version 2.3 (03/2019)

 */

public class VOTableFormat implements OutputFormat {