Skip to content

Commit 758a994

Browse files
SK-2871: Upgrade and prune Java dependencies (#340)
- Bump jackson-datatype-jdk8/jsr310 2.17.2 -> 2.18.6 (align with jackson-databind) - Bump dotenv-java 2.2.0 -> 3.2.0 - Migrate commons-codec Base64 -> java.util.Base64 (Token, Utils); drop commons-codec - Remove unused compile-scoped deps: jsr305, gson-fire, logging-interceptor, jaxb-api, jakarta.annotation-api, and their orphaned version properties Verified: mvn clean test compiles clean; the 5 remaining failures are pre-existing env-dependent tests (require local .env/credentials) and also fail on clean HEAD. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent d920b2c commit 758a994

3 files changed

Lines changed: 7 additions & 42 deletions

File tree

pom.xml

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@
3636
<maven.compiler.target>8</maven.compiler.target>
3737
<okhttp-version>4.12.0</okhttp-version>
3838
<gson-version>2.10.1</gson-version>
39-
<gson-fire-version>1.9.0</gson-fire-version>
4039
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<okhttp-version>4.12.0</okhttp-version>
4240
<junit-version>4.13.2</junit-version>
43-
<javax-xml-bind-version>2.3.1</javax-xml-bind-version>
44-
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
4541
<sdk.version>${project.version}</sdk.version>
4642
</properties>
4743

@@ -55,30 +51,20 @@
5551
<dependency>
5652
<groupId>com.fasterxml.jackson.datatype</groupId>
5753
<artifactId>jackson-datatype-jdk8</artifactId>
58-
<version>2.17.2</version>
54+
<version>2.18.6</version>
5955
<scope>compile</scope>
6056
</dependency>
6157
<dependency>
6258
<groupId>com.fasterxml.jackson.datatype</groupId>
6359
<artifactId>jackson-datatype-jsr310</artifactId>
64-
<version>2.17.2</version>
60+
<version>2.18.6</version>
6561
<scope>compile</scope>
6662
</dependency>
6763
<!-- newly added v2 dependencies -->
6864
<dependency>
6965
<groupId>io.github.cdimascio</groupId>
7066
<artifactId>dotenv-java</artifactId>
71-
<version>2.2.0</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>com.google.code.findbugs</groupId>
75-
<artifactId>jsr305</artifactId>
76-
<version>3.0.2</version>
77-
</dependency>
78-
<dependency>
79-
<groupId>io.gsonfire</groupId>
80-
<artifactId>gson-fire</artifactId>
81-
<version>${gson-fire-version}</version>
67+
<version>3.2.0</version>
8268
</dependency>
8369
<dependency>
8470
<groupId>com.google.code.gson</groupId>
@@ -90,33 +76,12 @@
9076
<artifactId>okhttp</artifactId>
9177
<version>${okhttp-version}</version>
9278
</dependency>
93-
<dependency>
94-
<groupId>com.squareup.okhttp3</groupId>
95-
<artifactId>logging-interceptor</artifactId>
96-
<version>${okhttp-version}</version>
97-
</dependency>
9879
<!-- existing dependencies -->
99-
<dependency>
100-
<groupId>commons-codec</groupId>
101-
<artifactId>commons-codec</artifactId>
102-
<version>1.15</version>
103-
</dependency>
10480
<dependency>
10581
<groupId>io.jsonwebtoken</groupId>
10682
<artifactId>jjwt</artifactId>
10783
<version>0.12.6</version>
10884
</dependency>
109-
<dependency>
110-
<groupId>jakarta.annotation</groupId>
111-
<artifactId>jakarta.annotation-api</artifactId>
112-
<version>${jakarta-annotation-version}</version>
113-
<scope>provided</scope>
114-
</dependency>
115-
<dependency>
116-
<groupId>javax.xml.bind</groupId>
117-
<artifactId>jaxb-api</artifactId>
118-
<version>${javax-xml-bind-version}</version>
119-
</dependency>
12085
<!-- existing test dependencies -->
12186
<dependency>
12287
<groupId>junit</groupId>

src/main/java/com/skyflow/serviceaccount/util/Token.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.skyflow.logs.ErrorLogs;
1010
import com.skyflow.logs.InfoLogs;
1111
import com.skyflow.utils.logger.LogUtil;
12-
import org.apache.commons.codec.binary.Base64;
12+
import java.util.Base64;
1313

1414
import java.nio.charset.StandardCharsets;
1515
import java.util.Date;
@@ -40,7 +40,7 @@ static JsonObject decoded(String encodedToken) throws JsonSyntaxException, Skyfl
4040
LogUtil.printErrorLog(ErrorLogs.INVALID_BEARER_TOKEN.getLog());
4141
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.JwtDecodeError.getMessage());
4242
}
43-
byte[] decodedBytes = Base64.decodeBase64(split[1]);
43+
byte[] decodedBytes = Base64.getUrlDecoder().decode(split[1]);
4444
return JsonParser.parseString(new String(decodedBytes, StandardCharsets.UTF_8)).getAsJsonObject();
4545
}
4646
}

src/main/java/com/skyflow/utils/Utils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.skyflow.serviceaccount.util.BearerToken;
1313
import com.skyflow.utils.logger.LogUtil;
1414
import com.skyflow.vault.connection.InvokeConnectionRequest;
15-
import org.apache.commons.codec.binary.Base64;
15+
import java.util.Base64;
1616

1717
import java.io.File;
1818
import java.net.MalformedURLException;
@@ -90,7 +90,7 @@ public static PrivateKey getPrivateKeyFromPem(String pemKey) throws SkyflowExcep
9090
privateKeyContent = privateKeyContent.replace(PKCS8PrivateFooter, "");
9191
privateKeyContent = privateKeyContent.replace("\n", "");
9292
privateKeyContent = privateKeyContent.replace("\r\n", "");
93-
privateKey = parsePkcs8PrivateKey(Base64.decodeBase64(privateKeyContent));
93+
privateKey = parsePkcs8PrivateKey(Base64.getDecoder().decode(privateKeyContent));
9494
} else {
9595
LogUtil.printErrorLog(ErrorLogs.JWT_INVALID_FORMAT.getLog());
9696
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.JwtInvalidFormat.getMessage());

0 commit comments

Comments
 (0)