Skip to content

Commit

Permalink
Merge branch 'jacekkow:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
XSmeets authored Oct 14, 2024
2 parents 1ef4a34 + f7b5843 commit 1e87abb
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
steps:
- id: checkout
name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- id: java
name: Install Java and Maven
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
Expand All @@ -40,7 +40,7 @@ jobs:
mvn -B test package
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jar
path: target/${{ steps.vars.outputs.artifactId }}-${{ steps.vars.outputs.projectVersion }}.jar
Expand All @@ -59,11 +59,11 @@ jobs:
steps:
- id: checkout
name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- id: download_artifact
name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: jar

Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
steps:
- id: download_artifact
name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: jar

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
steps:
- id: checkout
name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- id: java
name: Install Java and Maven
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
Expand All @@ -38,7 +38,7 @@ jobs:
mvn -B test package
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jar
path: target/${{ steps.vars.outputs.artifactId }}-${{ steps.vars.outputs.projectVersion }}.jar
Expand All @@ -57,11 +57,11 @@ jobs:
steps:
- id: checkout
name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- id: download_artifact
name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: jar

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
steps:
- id: checkout
name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- id: java
name: Install Java and Maven
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@

<groupId>org.keycloak</groupId>
<artifactId>keycloak-protocol-cas</artifactId>
<version>25.0.6</version>
<version>26.0.0</version>
<name>Keycloak CAS Protocol</name>
<description />

<properties>
<keycloak.version>${project.version}</keycloak.version>
<apache.httpcomponents.version>4.5.14</apache.httpcomponents.version>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<jboss.logging.tools.version>2.2.1.Final</jboss.logging.tools.version>
<jboss.logging.version>3.6.0.Final</jboss.logging.version>
<jboss.logging.tools.version>3.0.1.Final</jboss.logging.tools.version>
<junit.version>4.13.2</junit.version>
<resteasy.version>6.2.7.Final</resteasy.version>
<resteasy.version>6.2.9.Final</resteasy.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
<project.build.outputTimestamp>1726822103</project.build.outputTimestamp>
<project.build.outputTimestamp>1728031754</project.build.outputTimestamp>
</properties>

<dependencies>
Expand Down Expand Up @@ -130,7 +130,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.13.0</version>
<version>5.14.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 1e87abb

Please sign in to comment.