Skip to content

Commit

Permalink
Merge branch 'master' into renovate/major-testing-library-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoayyed authored Jun 20, 2024
2 parents fa94e10 + 609bb23 commit 721cede
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 30 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
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ springBoot {

dependencies {
implementation "org.jooq:jool:0.9.15"
implementation "org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r"
implementation "org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r"
implementation "commons-io:commons-io:2.16.1"
implementation "com.github.vladimir-bukhtoyarov:bucket4j-core:8.0.1"
implementation "com.github.spullara.mustache.java:compiler:0.9.13"
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 app/src/main/resources/overlay/puppeteer/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"pino": "9.1.0",
"pino-pretty": "11.1.0",
"puppeteer": "22.10.0"
"pino": "9.2.0",
"pino-pretty": "11.2.1",
"puppeteer": "22.11.2"
}
}
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ org.gradle.unsafe.configuration-cache=false
# to match version numbers.

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

sourceCompatibility=17

springInitializrVersion=0.20.1
springBootInitializrVersion=3.3.0
springInitializrVersion=0.21.0
springBootInitializrVersion=3.3.1
###################################
# Plugin Versions
###################################
Expand All @@ -37,9 +37,9 @@ gradleCyclonePluginVersion=1.8.2
# Latest versions defined are expanded
# and used by application configuration.
######################################
springBootLatestVersion=3.3.0
springBootLatestVersion=3.3.1
casLatestVersion=7.1.0-SNAPSHOT

casManagementLatestVersion=7.0.0-SNAPSHOT

apacheTomcat10LatestVersion=10.1.24
apacheTomcat10LatestVersion=10.1.25
28 changes: 14 additions & 14 deletions ui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3304,11 +3304,11 @@ brace-expansion@^2.0.1:
balanced-match "^1.0.0"

braces@^3.0.2, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
version "3.0.3"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
dependencies:
fill-range "^7.0.1"
fill-range "^7.1.1"

browser-process-hrtime@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -4901,10 +4901,10 @@ filesize@^8.0.6:
resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==

fill-range@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
fill-range@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
dependencies:
to-regex-range "^5.0.1"

Expand Down Expand Up @@ -10495,14 +10495,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 721cede

Please sign in to comment.