Skip to content

#79 Upgrade GitHub actions #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomwetjens wants to merge 2 commits into
base: main
Choose a base branch
from
Open

#79 Upgrade GitHub actions #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fde029
Upgrade GitHub actions
tomwetjens Apr 24, 2025
a669a2e
Replace deprecated MockBean annotation
tomwetjens Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: maven

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
language: [ 'java' ]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: maven

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
contents: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
server-id: ossrh
server-username: OSSRH_TOKEN_USER
Expand Down
20 changes: 10 additions & 10 deletions spring/src/test/java/org/lfenergy/shapeshifter/spring/ShapeshifterSpringIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
import org.mockito.Captor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;

import java.time.Duration;
Expand Down Expand Up @@ -76,23 +76,23 @@ class ShapeshifterSpringIntegrationTest {
static class TestConfig {
}

@MockBean
@MockitoBean
private UftpParticipantService uftpParticipantService;
@MockBean
@MockitoBean
private UftpValidatorSupport uftpValidatorSupport;
@MockBean
@MockitoBean
private ParticipantSupport participantSupport;
@MockBean
@MockitoBean
private UftpMessageSupport uftpMessageSupport;
@MockBean
@MockitoBean
private ContractSupport contractSupport;
@MockBean
@MockitoBean
private CongestionPointSupport congestionPointSupport;
@MockBean
@MockitoBean
private UftpIncomingHandler<PayloadMessageType> uftpIncomingHandler;
@MockBean
@MockitoBean
private UftpOutgoingHandler<PayloadMessageType> uftpOutgoingHandler;
@MockBean
@MockitoBean
private UftpErrorProcessor uftpErrorProcessor;

@Autowired
Expand Down
Loading