Skip to content

Commit

Permalink
Merge branch 'master' into renovate/puppeteer-22.x
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoayyed authored Jun 20, 2024
2 parents 384862d + 067f5c7 commit 48bc11d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/initializr-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ concurrency:

jobs:
initialize:
runs-on: macos-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK
Expand All @@ -47,7 +47,7 @@ jobs:

supported-versions-cas:
needs: [ initialize ]
runs-on: macos-latest
runs-on: ubuntu-latest
outputs:
supported-versions: ${{ steps.get-supported-versions.outputs.supported-versions }}
steps:
Expand All @@ -65,7 +65,7 @@ jobs:
run: echo "supported-versions=$(./gradlew --no-daemon -q versions-cas)" >> $GITHUB_OUTPUT

build:
runs-on: macos-latest
runs-on: ubuntu-latest
needs: [ supported-versions-cas ]
continue-on-error: false
strategy:
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/resources/application-initializr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ cas-initializr:
validate: false
branch: "6.6"
type: cas-mgmt
tomcat-version: 9.0.84
tomcat-version: 9.0.90
java-version: 11
container-base-image: eclipse-temurin:11-jdk
gradle-version: 7.6
Expand All @@ -43,11 +43,11 @@ cas-initializr:
- version: 6.6.15.1
platform-version: 6.6.0
boot-version: 2.7.3
sync: false
validate: false
sync: true
validate: true
branch: "6.6"
type: cas
tomcat-version: 9.0.87
tomcat-version: 9.0.90
java-version: 11
container-base-image: eclipse-temurin:11-jdk
gradle-version: 7.6
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ org.gradle.unsafe.configuration-cache=false
# to match version numbers.

group=org.apereo.cas
version=0.0.82
version=0.0.83

sourceCompatibility=17

springInitializrVersion=0.20.1
springInitializrVersion=0.21.0
springBootInitializrVersion=3.3.0
###################################
# Plugin Versions
Expand Down Expand Up @@ -42,4 +42,4 @@ casLatestVersion=7.1.0-SNAPSHOT

casManagementLatestVersion=7.0.0-SNAPSHOT

apacheTomcat10LatestVersion=10.1.24
apacheTomcat10LatestVersion=10.1.25
12 changes: 6 additions & 6 deletions ui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10528,14 +10528,14 @@ write-file-atomic@^3.0.0:
typedarray-to-buffer "^3.1.5"

ws@^7.4.6:
version "7.5.9"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
version "7.5.10"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==

ws@^8.13.0:
version "8.13.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
version "8.17.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==

xml-name-validator@^3.0.0:
version "3.0.0"
Expand Down

0 comments on commit 48bc11d

Please sign in to comment.