Merge pull request #109 from AxonFramework/dependency-upgrade/jobrunr-7

Upgrade to JobRunr 7.2.2

.github/workflows/main.yml

@@ -53,11 +53,15 @@ jobs:
         if: ${{ !matrix.sonar-enabled }}
         run: |
           ./mvnw -B -U -Dstyle.color=always clean verify
+        env:
+          JOBRUNR_PRO_LICENSE: ${{ secrets.JOB_RUNR_PRO_LICENSE }}
 
       - name: Build with Coverage reports
         if: matrix.sonar-enabled
         run: |
           ./mvnw -B -U -Dstyle.color=always -Dcoverage clean verify
+        env:
+          JOBRUNR_PRO_LICENSE: ${{ secrets.JOB_RUNR_PRO_LICENSE }}
 
       - name: Sonar Analysis
         if: matrix.sonar-enabled

.github/workflows/pullrequest.yml

@@ -32,7 +32,7 @@ jobs:
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 
-      - name: Set JobRunrPro credentials
+      - name: Set Maven server credentials
         uses: s4u/[email protected]
         with:
           servers: |
@@ -46,11 +46,15 @@ jobs:
         if: ${{ !matrix.sonar-enabled }}
         run: |
           ./mvnw -B -U -Dstyle.color=always clean verify
+        env:
+          JOBRUNR_PRO_LICENSE: ${{ secrets.JOB_RUNR_PRO_LICENSE }}
 
       - name: Build with Coverage reports
         if: matrix.sonar-enabled
         run: |
           ./mvnw -B -U -Dstyle.color=always -Possrh -Dcoverage clean verify
+        env:
+          JOBRUNR_PRO_LICENSE: ${{ secrets.JOB_RUNR_PRO_LICENSE }}
 
       - name: Sonar Analysis
         if: ${{ success() && matrix.sonar-enabled && github.event.pull_request.head.repo.full_name == github.repository }}

jobrunrpro-spring-boot-3-integrationtests/pom.xml

@@ -38,7 +38,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jobrunr.version>6.0.0</jobrunr.version>
+        <jobrunr.version>7.2.2</jobrunr.version>
         <axon.version>4.10.0</axon.version>
         <jococo.version>0.8.11</jococo.version>
         <testcontainers.version>1.20.1</testcontainers.version>

jobrunrpro/src/main/java/org/axonframework/extensions/jobrunrpro/util/JobRunrProUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2023. Axon Framework
+ * Copyright (c) 2010-2024. Axon Framework
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 import java.util.List;
 
 import static org.jobrunr.storage.JobSearchRequestBuilder.aJobSearchRequest;
-import static org.jobrunr.storage.PageRequest.ascOnUpdatedAt;
+import static org.jobrunr.storage.Paging.OffsetBasedPage.ascOnUpdatedAt;
 
 /**
  * Utility methods specifically for JobRunr Pro

jobrunrpro/src/test/java/org/axonframework/extensions/jobrunrpro/deadline/JobRunrProDeadlineManagerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2023. Axon Framework
+ * Copyright (c) 2010-2024. Axon Framework
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
 import org.jobrunr.scheduling.JobScheduler;
 import org.jobrunr.storage.JobSearchRequest;
 import org.jobrunr.storage.Page;
-import org.jobrunr.storage.PageRequest;
 import org.jobrunr.storage.StorageProvider;
+import org.jobrunr.storage.navigation.PageRequest;
 import org.junit.jupiter.api.*;
 
 import static org.junit.jupiter.api.Assertions.*;

pom.xml

@@ -53,7 +53,7 @@
         </sonar.coverage.jacoco.xmlReportPaths>
 
         <axon.version>4.10.0</axon.version>
-        <jobrunr.version>6.3.5</jobrunr.version>
+        <jobrunr.version>7.2.2</jobrunr.version>
 
         <spring.version>5.3.39</spring.version>
         <spring.boot.version>2.7.18</spring.boot.version><!-- Don't upgrade due to JDK8 -->