Update dependencies (primarily Spring Boot 3.1)

theotherp · Sep 23, 2023 · b32af00 · b32af00
1 parent 4a985c5
commit b32af00
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/buildNative.yml b/.github/workflows/buildNative.yml
@@ -15,6 +15,8 @@ jobs:
             HYDRA_NATIVE_BUILD: true
         runs-on: ${{ matrix.os }}
         steps:
+            -   name: Log free memory
+                run: free -s 1 -h -c 3
             -   uses: actions/checkout@v3
                 with:
                     # Check out last 15 commits

diff --git a/other/mockserver/pom.xml b/other/mockserver/pom.xml
@@ -24,7 +24,6 @@
         <logback.version>1.2.3</logback.version>
         <guava.version>31.1-jre</guava.version>
         <junit.version>4.12</junit.version>
-        <maven.compiler.plugin.version>3.6.2</maven.compiler.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <spring.boot.maven.version>3.0.1</spring.boot.maven.version>

diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,6 @@
                 <configuration>
                     <commitish>master</commitish>
                     <githubToken>${env.GITHUB_TOKEN}</githubToken>
-                    <discordToken>${env.DISCORD_TOKEN}</discordToken>
                     <linuxAmd64Asset>${basedir}/releases/linux-amd64-release/target/nzbhydra2-${project.version}-amd64-linux.zip</linuxAmd64Asset>
                     <linuxArm64Asset>${basedir}/releases/linux-arm64-release/target/nzbhydra2-${project.version}-arm64-linux.zip</linuxArm64Asset>
                     <windowsAsset>${basedir}/releases/windows-release/target/nzbhydra2-${project.version}-windows.zip</windowsAsset>
@@ -105,25 +104,24 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
 
-        <spring.boot.version>3.0.4</spring.boot.version>
-        <spring.boot.devtools.version>3.0.4</spring.boot.devtools.version>
-        <spring.boot.maven.version>3.0.4</spring.boot.maven.version>
-        <spring.oxm.version>6.0.6</spring.oxm.version>
-        <spring-data-commons.version>3.0.3</spring-data-commons.version>
+        <spring.boot.version>3.1.4</spring.boot.version>
+        <spring.boot.devtools.version>3.1.4</spring.boot.devtools.version>
+        <spring.boot.maven.version>3.1.4</spring.boot.maven.version>
+        <spring.oxm.version>6.0.12</spring.oxm.version>
+        <spring-data-commons.version>3.1.4</spring-data-commons.version>
         <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
-        <jackson.version>2.14.0</jackson.version>
+        <jackson.version>2.15.0</jackson.version>
         <lombok.version>1.18.30</lombok.version>
-        <logback.version>1.4.5</logback.version>
+        <logback.version>1.4.11</logback.version>
         <guava.version>23.0</guava.version>
         <junit.version>4.13.2</junit.version>
-        <okhttp.version>4.10.0</okhttp.version>
+        <okhttp.version>4.11.0</okhttp.version>
         <logstash-logback-encoder.version>7.2</logstash-logback-encoder.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-io.version>2.11.0</commons-io.version>
         <flyway-core.version>9.10.2</flyway-core.version>
         <jaxb.sun.core.version>2.3.0.1</jaxb.sun.core.version>
         <jaxb.sun.impl.version>3.0.1</jaxb.sun.impl.version>
-        <maven.compiler.plugin.version>3.6.2</maven.compiler.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <uri-scheme-handler.version>2.0.0</uri-scheme-handler.version>
         <javers-core.version>6.8.1</javers-core.version>

diff --git a/releases/pom.xml b/releases/pom.xml
@@ -19,7 +19,6 @@
     </modules>
 
     <properties>
-        <maven.compiler.plugin.version>3.6.2</maven.compiler.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/tests/system/src/test/java/org/nzbhydra/AuthLoginTest.java b/tests/system/src/test/java/org/nzbhydra/AuthLoginTest.java
@@ -24,9 +24,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.util.Base64Utils;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Collections;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -48,9 +48,10 @@ public void shouldRequireLogin() {
         if (configManager.getCurrentConfig().getAuth().getAuthType() == AuthType.NONE) {
             return;
         }
-        HydraResponse hydraResponse = hydraClient.get("/config/main", Collections.singletonMap("Authorization", "Basic " + new String(Base64Utils.encode("wrong:password".getBytes(StandardCharsets.UTF_8))))).dontRaiseIfUnsuccessful();
+
+        HydraResponse hydraResponse = hydraClient.get("/config/main", Collections.singletonMap("Authorization", "Basic " + new String(Base64.getEncoder().encode("wrong:password".getBytes(StandardCharsets.UTF_8))))).dontRaiseIfUnsuccessful();
         assertThat(hydraResponse.getStatus()).isEqualTo(401);
-        hydraResponse = hydraClient.get("/config/main", Collections.singletonMap("Authorization", "Basic " + new String(Base64Utils.encode("test:test".getBytes(StandardCharsets.UTF_8)))));
+        hydraResponse = hydraClient.get("/config/main", Collections.singletonMap("Authorization", "Basic " + new String(Base64.getEncoder().encode("test:test".getBytes(StandardCharsets.UTF_8)))));
         assertThat(hydraResponse.getStatus()).isEqualTo(200);
     }