From 2a20b930f0b98ee0e8d96f09de9009eaf2b84362 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 9 May 2026 12:06:11 +0200 Subject: [PATCH] #130 upgraded github actions --- .github/workflows/maven-release.yml | 14 +++++++------- .github/workflows/maven.yml | 8 ++++---- .github/workflows/npm.yml | 6 +++--- .github/workflows/sonar-java.yml | 4 ++-- .../api/services/TriggerServiceTest.java | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 33d4a9a..5da6e61 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -12,12 +12,12 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Set up Java 11 for publishing to Maven Central Repository - uses: actions/setup-java@v3 + - name: Set up Java 17 for publishing to Maven Central Repository + uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'temurin' server-id: maven-central-release server-username: MAVEN_USERNAME @@ -35,10 +35,10 @@ jobs: MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} - - name: Set up Java 11 for publishing to GitHub Packages - uses: actions/setup-java@v3 + - name: Set up Java 17 for publishing to GitHub Packages + uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'temurin' - name: Publish to GitHub Packages Apache Maven run: mvn deploy --file quartz-manager-parent/pom.xml -P "deploy-github,build-webjar" diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d7313c6..911227e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,11 +25,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: maven - name: Build and test with Maven diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml index 4b9066b..8ef8e55 100644 --- a/.github/workflows/npm.yml +++ b/.github/workflows/npm.yml @@ -25,13 +25,13 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [22.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: 'npm' diff --git a/.github/workflows/sonar-java.yml b/.github/workflows/sonar-java.yml index cf43625..3990173 100644 --- a/.github/workflows/sonar-java.yml +++ b/.github/workflows/sonar-java.yml @@ -13,11 +13,11 @@ jobs: name: Build and analyze runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'zulu' # Alternative distribution options are available. diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/TriggerServiceTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/TriggerServiceTest.java index 0d7979d..dd0c365 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/TriggerServiceTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/TriggerServiceTest.java @@ -12,12 +12,12 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerKey; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.TypeDescriptor; import java.util.List; import java.util.Set; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; class TriggerServiceTest { @@ -39,8 +39,8 @@ class TriggerServiceTest { void givenATrigger_whenTheyAreFecthed_TheServiceReturnsTheDtos() throws SchedulerException { String triggerTestName = "triggerTest"; Mockito.when(scheduler.getTriggerKeys(any())).thenReturn(Set.of(TriggerKey.triggerKey(triggerTestName))); - Mockito.when(conversionService.convert(any(Set.class), any(TypeDescriptor.class), any(TypeDescriptor.class))) - .thenReturn(List.of(TriggerKeyDTO.builder().name(triggerTestName).build())); + Mockito.when(conversionService.convert(any(TriggerKey.class), eq(TriggerKeyDTO.class))) + .thenReturn(TriggerKeyDTO.builder().name(triggerTestName).build()); List triggerKeyDTOs = triggerService.fetchTriggers(); Assertions.assertThat(triggerKeyDTOs).hasSize(1);