Skip to content

Commit

Permalink
Merge branch 'main' into renovate/gha-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
UnicornChance authored Dec 2, 2024
2 parents 3a7d24a + fb90de6 commit 7fba682
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions bundles/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ packages:
- name: core-base
path: ../uds-core/build/
# renovate: datasource=github-tags depName=defenseunicorns/uds-core versioning=semver
ref: 0.31.2
ref: 0.32.0
overrides:
istio-admin-gateway:
uds-istio-config:
Expand All @@ -43,7 +43,7 @@ packages:
- name: core-identity-authorization
path: ../uds-core/build/
# renovate: datasource=github-tags depName=defenseunicorns/uds-core versioning=semver
ref: 0.31.2
ref: 0.32.0
overrides:
keycloak:
keycloak:
Expand All @@ -65,4 +65,4 @@ packages:
- name: core-monitoring
path: ../uds-core/build/
# renovate: datasource=github-tags depName=defenseunicorns/uds-core versioning=semver
ref: 0.31.2
ref: 0.32.0
4 changes: 2 additions & 2 deletions src/plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<keycloak.version>26.0.5</keycloak.version>
<keycloak.version>26.0.6</keycloak.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.18.1</version>
<version>2.18.2</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

includes:
- remote: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/lint.yaml
- remote: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/lint.yaml

variables:
- name: VERSION
Expand All @@ -18,7 +18,7 @@ variables:
- name: CORE_VERSION
description: UDS Core Version for Releases and Clone
# renovate: datasource=github-tags depName=defenseunicorns/uds-core versioning=semver
default: "v0.31.2"
default: "v0.32.0"

tasks:
- name: build-and-publish
Expand Down

0 comments on commit 7fba682

Please sign in to comment.