chore!: migrate javax -> jakarta

.github/workflows/develop-status.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [11, 19]
+        jdk: [17, 19]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/main-status.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [11, 19]
+        jdk: [17, 19]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/pr-verify.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [11, 19]
+        jdk: [17, 19]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
@@ -46,14 +46,14 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Cache local Maven repository
       uses: actions/cache@v2
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
+        key: ${{ runner.os }}-jdk17-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          ${{ runner.os }}-jdk11-maven-
+          ${{ runner.os }}-jdk17-maven-
     - name: Check formatting
       run: mvn -B formatter:validate impsort:check xml-format:xml-check
     - name: Build
@@ -79,14 +79,14 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Cache local Maven repository
       uses: actions/cache@v2
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
+        key: ${{ runner.os }}-jdk17-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          ${{ runner.os }}-jdk11-maven-
+          ${{ runner.os }}-jdk17-maven-
     - name: Check formatting
       run: mvn -B formatter:validate impsort:check xml-format:xml-check
     - name: Build

CONTRIBUTING.md

@@ -95,7 +95,7 @@ For import statements, the following conventions hold:
 
 - we do not use wildcard imports or wildcard static imports
 - we allow static imports where possible, but do not require their use
-- we apply a fixed ordering for import statements, following Eclipse conventions. Import statements are ordered in groups separated by a single empty line, in the following order: static imports, java.\*, javax.\*, org.\*, com.\*, everything else.
+- we apply a fixed ordering for import statements, following Eclipse conventions. Import statements are ordered in groups separated by a single empty line, in the following order: static imports, java.\*, javax.\*, jakarta.\*, org.\*, com.\*, everything else.
 
 There are various ways to apply these conventions to your code, depending on which editor/IDE you use.
 
@@ -115,7 +115,7 @@ Similarly, to apply templates:
 For import organization, the Eclipse defaults should be fine, but you can make sure as follows:
 
 1. go to 'Preferences' -> 'Java' -> 'Code Style' -> 'Organize Imports'. 
-2. Make sure the list of ordered groups corresponds to 'java', 'javax', 'org', 'com'.
+2. Make sure the list of ordered groups corresponds to 'java', 'javax','jakarta', 'org', 'com'.
 3. Make sure the numbers of (static) imports needed for wildcard imports are set suitable high (99 or more).
 
 You can apply import organization by hitting Ctrl+Shift+O, or you can configure Eclipse to automtaically organize imports on save. This can be activated by going to 'Preferences' -> 'Java' -> 'Editor' -> 'Save Actions' and making sure the 'Organize imports' option checkbox is ticked.

core/http/protocol/src/main/java/org/eclipse/rdf4j/http/protocol/transaction/TransactionSAXParser.java

@@ -93,7 +93,7 @@ public void startTag(String tagName, Map<String, String> atts, String text) thro
 			String encoding = atts.get(TransactionXMLConstants.ENCODING_ATT);
 
 			if (encoding != null && "base64".equalsIgnoreCase(encoding)) {
-				text = new String(javax.xml.bind.DatatypeConverter.parseBase64Binary(text));
+				text = new String(jakarta.xml.bind.DatatypeConverter.parseBase64Binary(text));
 			}
 			Literal lit;
 			if (lang != null) {

core/http/protocol/src/main/java/org/eclipse/rdf4j/http/protocol/transaction/TransactionWriter.java

@@ -14,7 +14,7 @@
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 
 import org.eclipse.rdf4j.common.xml.XMLUtil;
 import org.eclipse.rdf4j.common.xml.XMLWriter;

core/repository/manager/pom.xml

@@ -61,8 +61,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>test</scope>
 		</dependency>

core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/AbstractRDFParser.java

@@ -21,7 +21,7 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
+import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter;
 
 import org.eclipse.rdf4j.common.net.ParsedIRI;
 import org.eclipse.rdf4j.model.BNode;

pom.xml

@@ -331,7 +331,7 @@
 		</profile>
 	</profiles>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<maven.compiler.release>${java.version}</maven.compiler.release>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -343,15 +343,15 @@
 		<httpcore.version>4.4.15</httpcore.version>
 		<jsonldjava.version>0.13.4</jsonldjava.version>
 		<last.japicmp.compare.version>4.0.0</last.japicmp.compare.version>
-		<jaxb.version>2.3.3</jaxb.version>
+		<jaxb.version>3.0.1</jaxb.version>
 		<lucene.version>8.5.1</lucene.version>
 		<lwjgl.version>3.3.1</lwjgl.version>
 		<solr.version>8.4.1</solr.version>
 		<elasticsearch.version>7.8.1</elasticsearch.version>
-		<spring.version>5.3.23</spring.version>
+		<spring.version>6.0.4</spring.version>
 		<guava.version>30.1.1-jre</guava.version>
 		<jmhVersion>1.35</jmhVersion>
-		<servlet.version>3.1.0</servlet.version>
+		<servlet.version>5.0.0</servlet.version>
 		<junit.version>5.8.2</junit.version>
 	</properties>
 	<dependencyManagement>
@@ -861,7 +861,7 @@
 					<artifactId>impsort-maven-plugin</artifactId>
 					<version>1.8.0</version>
 					<configuration>
-						<groups>java.,javax.,org.,com.</groups>
+						<groups>java.,javax.,jakarta.,org.,com.</groups>
 						<staticGroups>java,*</staticGroups>
 					</configuration>
 				</plugin>

spring-components/pom.xml

@@ -13,7 +13,7 @@
 		<module>rdf4j-spring-demo</module>
 	</modules>
 	<properties>
-		<spring.boot.version>2.7.5</spring.boot.version>
+		<spring.boot.version>3.0.1</spring.boot.version>
 	</properties>
 	<artifactId>rdf4j-spring-components</artifactId>
 	<name>RDF4J: Spring components</name>

spring-components/rdf4j-spring-demo/src/main/java/org/eclipse/rdf4j/spring/demo/support/InitialDataInserter.java

@@ -11,7 +11,7 @@
 
 package org.eclipse.rdf4j.spring.demo.support;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.eclipse.rdf4j.spring.support.DataInserter;
 import org.springframework.core.io.Resource;

spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/repository/remote/RemoteRepositoryProperties.java

@@ -11,8 +11,8 @@
 
 package org.eclipse.rdf4j.spring.repository.remote;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 
 import org.hibernate.validator.constraints.Length;
 import org.springframework.boot.context.properties.ConfigurationProperties;

spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/uuidsource/sequence/UUIDSequenceConfig.java

@@ -11,7 +11,7 @@
 
 package org.eclipse.rdf4j.spring.uuidsource.sequence;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/uuidsource/sequence/UUIDSequenceProperties.java

@@ -11,8 +11,8 @@
 
 package org.eclipse.rdf4j.spring.uuidsource.sequence;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/uuidsource/simple/SimpleRepositoryUUIDSourceProperties.java

@@ -11,7 +11,7 @@
 
 package org.eclipse.rdf4j.spring.uuidsource.simple;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-components/spring-boot-sparql-web/src/main/java/org/eclipse/rdf4j/http/server/readonly/EvaluateResultHttpResponse.java

@@ -13,7 +13,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.http.server.readonly.sparql.EvaluateResult;
 

spring-components/spring-boot-sparql-web/src/main/java/org/eclipse/rdf4j/http/server/readonly/QueryResponder.java

@@ -15,8 +15,8 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.common.annotation.Experimental;
 import org.eclipse.rdf4j.http.server.readonly.sparql.SparqlQueryEvaluator;

testsuites/benchmark/pom.xml

@@ -95,9 +95,9 @@
 			</activation>
 			<dependencies>
 				<dependency>
-					<groupId>javax.annotation</groupId>
-					<artifactId>javax.annotation-api</artifactId>
-					<version>1.3.2</version>
+					<groupId>jakarta.annotation</groupId>
+					<artifactId>jakarta.annotation-api</artifactId>
+					<version>2.0.0</version>
 				</dependency>
 			</dependencies>
 		</profile>

tools/pom.xml

@@ -51,29 +51,29 @@
 		<dependencies>
 			<!-- Java Enterprise Edition -->
 			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>javax.servlet-api</artifactId>
+				<groupId>jakarta.servlet</groupId>
+				<artifactId>jakarta.servlet-api</artifactId>
 				<version>${servlet.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>javax.servlet.jsp</groupId>
-				<artifactId>jsp-api</artifactId>
-				<version>2.2</version>
+				<groupId>jakarta.servlet.jsp</groupId>
+				<artifactId>jakarta.servlet.jsp-api</artifactId>
+				<version>3.0.0</version>
 			</dependency>
 			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
-				<version>1.2</version>
+				<groupId>jakarta.servlet.jsp.jstl</groupId>
+				<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+				<version>2.0.0</version>
 			</dependency>
 			<dependency>
 				<groupId>taglibs</groupId>
 				<artifactId>standard</artifactId>
 				<version>1.1.2</version>
 			</dependency>
 			<dependency>
-				<groupId>javax.activation</groupId>
-				<artifactId>activation</artifactId>
-				<version>1.1</version>
+				<groupId>jakarta.activation</groupId>
+				<artifactId>jakarta.activation-api</artifactId>
+				<version>2.0.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.ebaysf.web</groupId>

tools/runtime-osgi/pom.xml

@@ -35,7 +35,7 @@
 					<instructions>
 						<Bundle-SymbolicName>org.eclipse.rdf4j</Bundle-SymbolicName>
 						<Export-Package>!*text-base,!*prop-base,org.eclipse.rdf4j.*</Export-Package>
-						<Import-Package>org.slf4j.*, javax.*;resolution:=optional, org.apache.*;resolution:=optional, org.springframework.*;resolution:=optional, org.locationtech;resolution:=optional, org.elasticsearch;resolution:=optional, ch.qos.logback;resolution:=optional, *</Import-Package>
+						<Import-Package>org.slf4j.*, jakarta.*;resolution:=optional, org.apache.*;resolution:=optional, org.springframework.*;resolution:=optional, org.locationtech;resolution:=optional, org.elasticsearch;resolution:=optional, ch.qos.logback;resolution:=optional, *</Import-Package>
 						<Embed-Dependency>*; groupId=org.eclipse.rdf4j; scope=compile|runtime; type=!pom; inline=true</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 					</instructions>

tools/server-spring/pom.xml

@@ -28,18 +28,18 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
+			<groupId>jakarta.servlet.jsp</groupId>
+			<artifactId>jakarta.servlet.jsp-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
+			<groupId>jakarta.servlet.jsp.jstl</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>taglibs</groupId>

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/CommonValuesHandlerInterceptor.java

@@ -12,8 +12,8 @@
 
 import java.util.Calendar;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/MessageHandlerInterceptor.java

@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.common.webapp;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/filters/PathFilter.java

@@ -14,15 +14,15 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 /**
  * @author Herko ter Horst

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/navigation/NavigationHandlerInterceptor.java

@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.common.webapp.navigation;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/system/SystemInfoController.java

@@ -18,8 +18,8 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.common.app.AppConfiguration;
 import org.springframework.web.servlet.ModelAndView;