Update spring for mockserver to fix startup

theotherp · Sep 23, 2023 · e287a6d · e287a6d
1 parent e643615
commit e287a6d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
@@ -55,8 +55,8 @@ jobs:
                     mvn --batch-mode install -DskipTests -T 1C
                     cd other/mockserver/
                     mvn --batch-mode spring-boot:build-image
-                    docker tag mockserver:3.0.0 ghcr.io/theotherp/mockserver:3.0.0
-                    docker push ghcr.io/theotherp/mockserver:3.0.0
+                    docker tag mockserver:3.1.0 ghcr.io/theotherp/mockserver:3.1.0
+                    docker push ghcr.io/theotherp/mockserver:3.1.0
 
     runSystemTests:
         needs: [ waitForNative, buildMockserver ]

diff --git a/core/src/main/java/org/nzbhydra/historystats/Stats.java b/core/src/main/java/org/nzbhydra/historystats/Stats.java
@@ -266,7 +266,7 @@ List<AverageResponseTime> averageResponseTimes(final StatsRequest statsRequest)
      * Calculates how unique a downloaded result was, i.e. how many other indexers could've (or not could've) provided the same result.
      */
     @Transactional(readOnly = true)
-    List<IndexerScore> indexerScores(final StatsRequest statsRequest) {
+    public List<IndexerScore> indexerScores(final StatsRequest statsRequest) {
         Stopwatch stopwatch = Stopwatch.createStarted();
         logger.debug("Calculating indexer result uniqueness scores");
 

diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -10,6 +10,8 @@
             text: "Hard crashes of the main process will now be logged properly. See #892"
         -   type: "note"
             text: "All these changes require the wrapper files to be updated."
+        -   type: "note"
+            text: "I also updated a lot of libraries - hopefully no bugs ;-)"
     final: true
 -   version: "v5.1.11"
     date: "2023-09-01"

diff --git a/other/mockserver/pom.xml b/other/mockserver/pom.xml
@@ -11,12 +11,12 @@
     </parent>
 
     <!-- Update tag of built docker container image in build scripts   -->
-    <version>3.0.0</version>
+    <version>3.1.0</version>
     <artifactId>mockserver</artifactId>
 
     <properties>
-        <spring.boot.version>3.0.1</spring.boot.version>
-        <spring.oxm.version>6.0.2</spring.oxm.version>
+        <spring.boot.version>3.1.4</spring.boot.version>
+        <spring.oxm.version>6.0.12</spring.oxm.version>
         <spring.test.version>6.0.0</spring.test.version>
         <spring.security.test.version>4.2.3.RELEASE</spring.security.test.version>
         <jackson.version>2.8.9</jackson.version>

diff --git a/tests/system/src/test/java/org/nzbhydra/StatsTest.java b/tests/system/src/test/java/org/nzbhydra/StatsTest.java
@@ -46,7 +46,7 @@ public void shouldLoadStats() throws Exception {
         StatsRequest request = new StatsRequest();
         request.setAfter(Instant.now().minusSeconds(60 * 60));
         //Something fucky going on, I don't care right now
-        request.setBefore(Instant.now().plusSeconds(60 * 60));
+        request.setBefore(Instant.now().plusSeconds(60 * 60 * 24));
         request.setIndexerApiAccessStats(true);
         request.setAvgIndexerUniquenessScore(true);
         request.setAvgResponseTimes(true);