Replace jakarta dependency with java.util.Base64

tordanik · Oct 1, 2024 · 66946c2 · 66946c2
1 parent dac4207
commit 66946c2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -164,12 +164,6 @@
 			<version>1.0.6</version>
 		</dependency>
 
-		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.2</version>
-		</dependency>
-
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>

diff --git a/src/main/java/org/osm2world/core/target/common/material/TextureData.java b/src/main/java/org/osm2world/core/target/common/material/TextureData.java
@@ -14,6 +14,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -30,8 +31,6 @@
 import org.osm2world.core.util.Resolution;
 import org.osm2world.core.util.color.LColor;
 
-import jakarta.xml.bind.DatatypeConverter;
-
 /**
  * a texture with metadata necessary for calculating texture coordinates.
  */
@@ -125,7 +124,7 @@ public String getDataUri() {
 		RasterImageFormat format = getRasterImageFormat();
 		try (var stream = new ByteArrayOutputStream()) {
 		    writeRasterImageToStream(stream);
-		    return "data:" + format.mimeType() + ";base64," + DatatypeConverter.printBase64Binary(stream.toByteArray());
+		    return "data:" + format.mimeType() + ";base64," + Base64.getEncoder().encodeToString(stream.toByteArray());
 		} catch (IOException e) {
 		    throw new Error(e);
 		}

diff --git a/src/main/java/org/osm2world/core/target/gltf/GltfTarget.java b/src/main/java/org/osm2world/core/target/gltf/GltfTarget.java
@@ -50,8 +50,6 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonIOException;
 
-import jakarta.xml.bind.DatatypeConverter;
-
 /**
  * builds a glTF or glb (binary glTF) output file
  */
@@ -229,8 +227,7 @@ private int createBufferView(ByteBuffer byteBuffer, @Nullable Integer target) {
 			case GLTF -> {
 
 				String dataUri = "data:application/gltf-buffer;base64,"
-						+ DatatypeConverter.printBase64Binary(byteBuffer.array());
-				// TODO: replace with java.util.Base64?
+						+ Base64.getEncoder().encodeToString(byteBuffer.array());
 
 				GltfBuffer buffer = new GltfBuffer(byteBuffer.capacity());
 				buffer.uri = dataUri;