Merge pull request #1 from slloyd-src/jakarta

Jakarta updates for modern Java

Author: pahjbo

ADQLLib/build.gradle

@@ -17,7 +17,7 @@ distributions {
 }
 
 dependencies {
-    implementation 'uk.ac.starlink:stil:4.2'
+    implementation 'uk.ac.starlink:stil:4.3.1'
     implementation 'postgresql:postgresql:9.1-901.jdbc4'
 }
 
@@ -98,7 +98,16 @@ publishing {
                     url = 'http://example.com/my-library/'
                 }
             }
-
+        }
+    }
+    repositories {
+        maven {
+            name = "nexus"
+            url = uri("https://repo.dev.uksrc.org/repository/maven-snapshots/")
+            credentials {
+                username = findProperty("nexusUsername") ?: System.getenv("NEXUS_USERNAME")
+                password = findProperty("nexusPassword") ?: System.getenv("NEXUS_PASSWORD")
+            }
         }
     }
 }

TAPLib/build.gradle

@@ -1,3 +1,6 @@
+plugins {
+    id 'maven-publish'
+}
 
 // Describe the library:
 version = "2.4-beta"
@@ -11,7 +14,7 @@ dependencies {
     implementation project(':UWSLib')
 
     implementation fileTree(dir: '../lib', includes: ['stil_3.3-2.jar'])
-    implementation 'javax.servlet:javax.servlet-api:3.0.1'
+    implementation 'jakarta.servlet:jakarta.servlet-api:5.0.0'
     implementation 'org.slf4j:slf4j-api:1.7.25'
     implementation 'org.json:json:20231013'
 
@@ -24,6 +27,54 @@ dependencies {
     testRuntimeOnly 'org.xerial:sqlite-jdbc:3.44.1.0'
 
     /* Needed to run Gradle with Java 9+: */
-    // https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api
-	implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+
+    implementation ("uk.ac.starlink:stil:4.3.1")
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'fr.unistra.cds' // Change this to the correct group
+            artifactId = 'TAPlib' // Change this for each library
+            version = '2.4-SNAPSHOT'
+
+            from components.java
+            pom {
+                name = 'TAPlib'
+                description = 'Java library to deploy a TAP service. This is a cloned version of the original to allow the updating of older java functionality'
+                url = 'http://cdsportal.u-strasbg.fr/taptuto/'
+
+                licenses {
+                    license {
+                        name = 'GNU Lesser General Public License version 3'
+                        url = 'https://opensource.org/license/lgpl-3-0'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'gmantele'
+                        name = 'Grégory Mantelet'
+                        email = '[email protected]'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:git://github.com/slloyd-src/vollt.git'
+                    developerConnection = 'scm:git:ssh://github.com/slloyd-src/vollt.git'
+                    url = 'http://example.com/my-library/'
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            name = "nexus"
+            url = uri("https://repo.dev.uksrc.org/repository/maven-snapshots/")
+            credentials {
+                username = findProperty("nexusUsername") ?: System.getenv("NEXUS_USERNAME")
+                password = findProperty("nexusPassword") ?: System.getenv("NEXUS_PASSWORD")
+            }
+        }
+    }
 }

TAPLib/docker/Dockerfile

@@ -49,8 +49,8 @@ RUN wget -O /usr/local/tomcat/webapps/tap/WEB-INF/lib/commons-fileupload.jar \
             'https://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar'
 RUN wget -O /usr/local/tomcat/webapps/tap/WEB-INF/lib/commons-io.jar \
             'https://repo1.maven.org/maven2/commons-io/commons-io/2.6/commons-io-2.6.jar'
-RUN wget -O /usr/local/tomcat/webapps/tap/WEB-INF/lib/javax-servlet-api.jar \
-            'https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar'
+RUN wget -O /usr/local/tomcat/webapps/tap/WEB-INF/lib/jakarta-servlet-api.jar \
+            'https://repo1.maven.org/maven2/jakarta/servlet/jakarta.servlet-api/3.0.1/jakarta.servlet-api-3.0.1.jar'
 RUN wget -O /usr/local/tomcat/webapps/tap/WEB-INF/lib/json.jar \
             'https://repo1.maven.org/maven2/org/json/json/20180813/json-20180813.jar'
 RUN wget -O /usr/local/tomcat/webapps/tap/WEB-INF/lib/slf4j-api.jar \

TAPLib/docker/scripts/tap-starter.sh

@@ -46,7 +46,7 @@ CONTEXT_FILE=$WEBAPPS_DIR/tap/META-INF/context.xml
 # Start the Context and Resource definitions:
 echo -e '<Context>\n\t<Resource name="jdbc/tapdb" auth="Container"' > $CONTEXT_FILE
 # Set the Resource type (SQL's Datasource):
-echo -e '\t\ttype="javax.sql.DataSource"' >> $CONTEXT_FILE
+echo -e '\t\ttype="jakarta.sql.DataSource"' >> $CONTEXT_FILE
 # Set the JDBC driver:
 case "$DB_TYPE" in
     postgres|pgsphere)

TAPLib/docker/tomcat/tap-webapp/WEB-INF/web.xml

@@ -12,7 +12,7 @@
 
   <resource-ref>
 		<res-ref-name>jdbc/testdb</res-ref-name>
-		<res-type>javax.sql.DataSource</res-type>
+		<res-type>jakarta.sql.DataSource</res-type>
 		<res-auth>Container</res-auth>
 	</resource-ref>
 

TAPLib/src/tap/ADQLExecutor.java

@@ -23,7 +23,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import adql.parser.ADQLParser;
 import adql.parser.ADQLQueryFactory;

TAPLib/src/tap/AbstractTAPFactory.java

@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import adql.db.DBChecker;
 import adql.parser.ADQLParser;

TAPLib/src/tap/TAPFactory.java

@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import adql.parser.ADQLParser;
 import adql.parser.ADQLQueryFactory;
@@ -308,7 +308,7 @@ protected TAPFactory(final ServiceConnection service) throws NullPointerExceptio
 	 * 	with the given request, in order to ensure that the returned object is always a {@link TAPJob}.
 	 * </p>
 	 *
-	 * @see uws.service.AbstractUWSFactory#createJob(javax.servlet.http.HttpServletRequest, uws.job.user.JobOwner)
+	 * @see uws.service.AbstractUWSFactory#createJob(jakarta.servlet.http.HttpServletRequest, uws.job.user.JobOwner)
 	 * @see #createTAPJob(HttpServletRequest, JobOwner)
 	 */
 	@Override

TAPLib/src/tap/TAPRequestParser.java

@@ -23,7 +23,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import uws.UWSException;
 import uws.UWSToolBox;

TAPLib/src/tap/TAPSyncJob.java

@@ -24,7 +24,7 @@
 import java.util.Date;
 import java.util.Iterator;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import tap.parameters.TAPExecutionDurationController;
 import tap.parameters.TAPParameters;