Skip to content

Commit 95fb9d4

Browse files
bonzofenixbonzofenix
authored
Merge branch 'main' into fixed-acceptance-test-org-v2
2 parents 3a62db4 + b33f9d0 commit 95fb9d4

53 files changed

Lines changed: 398 additions & 363 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/image.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-tools
4545

4646
- name: Install devbox
47-
uses: jetify-com/devbox-install-action@22b0f5500b14df4ea357ce673fbd4ced940ed6a1 # v0.13.0
47+
uses: jetify-com/devbox-install-action@8c6a66ed6273138b1915457069de78cb52fe3bd7 # v0.15.0
4848

4949
- name: Get ginkgo version from autoscaler-release
5050
id: ginkgo

‎ci/dockerfiles/autoscaler-tools/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252
1+
FROM ubuntu@sha256:53958ec7b67c2c9355df922dd08dbf0360611f8c3cdb656875e81873db9ffdba
22
LABEL maintainer="autoscaler-team"
33

44
ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
@@ -72,15 +72,15 @@ RUN wget -q https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_V
7272

7373
# Install bbl
7474
# renovate: datasource=github-releases depName=bosh-bootloader lookupName=cloudfoundry/bosh-bootloader
75-
ARG BBL_VERSION=v9.0.36
75+
ARG BBL_VERSION=v9.0.45
7676
RUN wget -q https://github.com/cloudfoundry/bosh-bootloader/releases/download/${BBL_VERSION}/bbl-${BBL_VERSION}_linux_amd64 && \
7777
mv bbl-* /usr/local/bin/bbl &&\
7878
chmod +x /usr/local/bin/bbl &&\
7979
bbl --version
8080

8181
# Install credhub
8282
# renovate: datasource=github-releases depName=credhub-cli lookupName=cloudfoundry/credhub-cli
83-
ARG CREDHUB_VERSION=2.9.50
83+
ARG CREDHUB_VERSION=2.9.57
8484
RUN wget -q https://github.com/cloudfoundry/credhub-cli/releases/download/${CREDHUB_VERSION}/credhub-linux-amd64-${CREDHUB_VERSION}.tgz && \
8585
tar xvfz credhub-linux-amd64-${CREDHUB_VERSION}.tgz && \
8686
mv credhub /usr/local/bin/credhub &&\

‎dbtasks/pom.xml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>3.5.15</version>
17+
<version>4.1.0</version>
1818
<relativePath/>
1919
</parent>
2020

@@ -27,6 +27,9 @@
2727
<dependency>
2828
<groupId>org.liquibase</groupId>
2929
<artifactId>liquibase-core</artifactId>
30+
<!-- Pinned to latest 4.x: Liquibase 5+ uses the Functional Source License (FSL),
31+
which is incompatible with open-source distribution. Renovate updates are
32+
disabled for this package (see renovate.json). -->
3033
<version>4.33.0</version>
3134
</dependency>
3235
<dependency>
@@ -37,23 +40,14 @@
3740
<dependency>
3841
<groupId>org.yaml</groupId>
3942
<artifactId>snakeyaml</artifactId>
40-
<version>2.6</version>
4143
</dependency>
4244
<dependency>
4345
<groupId>org.postgresql</groupId>
4446
<artifactId>postgresql</artifactId>
45-
<version>42.7.11</version>
4647
</dependency>
4748
<dependency>
4849
<groupId>com.mysql</groupId>
4950
<artifactId>mysql-connector-j</artifactId>
50-
<version>9.7.0</version>
51-
</dependency>
52-
<!-- Spring Boot -->
53-
54-
<dependency>
55-
<groupId>org.springframework.boot</groupId>
56-
<artifactId>spring-boot-starter</artifactId>
5751
</dependency>
5852
<dependency>
5953
<groupId>org.springframework.boot</groupId>
@@ -62,7 +56,6 @@
6256
<dependency>
6357
<groupId>org.apache.commons</groupId>
6458
<artifactId>commons-lang3</artifactId>
65-
<version>3.20.0</version>
6659
</dependency>
6760
</dependencies>
6861

@@ -77,10 +70,8 @@
7770
<plugin>
7871
<groupId>org.apache.maven.plugins</groupId>
7972
<artifactId>maven-compiler-plugin</artifactId>
80-
<version>3.15.0</version>
8173
<configuration>
82-
<source>${java.version}</source>
83-
<target>${java.version}</target>
74+
<release>${java.version}</release>
8475
</configuration>
8576
</plugin>
8677

‎devbox.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"path:.#uaa-cli": "",
99
"path:.#flatten_json-schema": "",
1010

11-
"act": "0.2.88",
11+
"act": "0.2.89",
1212
"apple-sdk": {
1313
"version": "14.4",
1414
"platforms": [
@@ -23,7 +23,7 @@
2323
"credhub-cli": "2.9.54",
2424
"curl": "8.17.0",
2525
"delve": "1.26.3",
26-
"fly": "8.2.2",
26+
"fly": "8.2.3",
2727
"gh": "2.92.0",
2828
"ginkgo": "2.28.1",
2929
"gnumake": "4.4.1",

‎devbox.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
{
22
"lockfile_version": "1",
33
"packages": {
4-
"act@0.2.88": {
5-
"last_modified": "2026-05-21T08:15:18Z",
6-
"resolved": "github:NixOS/nixpkgs/4a29d733e8a7d5b824c3d8c958a946a9867b3eb2#act",
4+
"act@0.2.89": {
5+
"last_modified": "2026-06-06T02:11:57Z",
6+
"resolved": "github:NixOS/nixpkgs/f3ce60d5372cbb1490033766bdd4748dc0128e86#act",
77
"source": "devbox-search",
8-
"version": "0.2.88",
8+
"version": "0.2.89",
99
"systems": {
1010
"aarch64-darwin": {
1111
"outputs": [
1212
{
1313
"name": "out",
14-
"path": "/nix/store/fmhnq6fn426v0crip0mkbqns2lv9251j-act-0.2.88",
14+
"path": "/nix/store/h4dq1lrf47b35lpbnp2faqpxyicbn29d-act-0.2.89",
1515
"default": true
1616
}
1717
],
18-
"store_path": "/nix/store/fmhnq6fn426v0crip0mkbqns2lv9251j-act-0.2.88"
18+
"store_path": "/nix/store/h4dq1lrf47b35lpbnp2faqpxyicbn29d-act-0.2.89"
1919
},
2020
"aarch64-linux": {
2121
"outputs": [
2222
{
2323
"name": "out",
24-
"path": "/nix/store/pdp7yd81ryadh5whbcmdnq87l732jc7b-act-0.2.88",
24+
"path": "/nix/store/yciwf350knkkrs27ga35qs8gki836dql-act-0.2.89",
2525
"default": true
2626
}
2727
],
28-
"store_path": "/nix/store/pdp7yd81ryadh5whbcmdnq87l732jc7b-act-0.2.88"
28+
"store_path": "/nix/store/yciwf350knkkrs27ga35qs8gki836dql-act-0.2.89"
2929
},
3030
"x86_64-darwin": {
3131
"outputs": [
3232
{
3333
"name": "out",
34-
"path": "/nix/store/cxphgb801n8smiqy4a64bnq6fz0dggyc-act-0.2.88",
34+
"path": "/nix/store/zfkd6hwj5d6db4ljlj0d80ai1mxs5f56-act-0.2.89",
3535
"default": true
3636
}
3737
],
38-
"store_path": "/nix/store/cxphgb801n8smiqy4a64bnq6fz0dggyc-act-0.2.88"
38+
"store_path": "/nix/store/zfkd6hwj5d6db4ljlj0d80ai1mxs5f56-act-0.2.89"
3939
},
4040
"x86_64-linux": {
4141
"outputs": [
4242
{
4343
"name": "out",
44-
"path": "/nix/store/1h0krxwvbs1s4vpvdlv9snlpsylzwdka-act-0.2.88",
44+
"path": "/nix/store/q9wh1f9ygjvwpa9k1lyb9jy05nynxdna-act-0.2.89",
4545
"default": true
4646
}
4747
],
48-
"store_path": "/nix/store/1h0krxwvbs1s4vpvdlv9snlpsylzwdka-act-0.2.88"
48+
"store_path": "/nix/store/q9wh1f9ygjvwpa9k1lyb9jy05nynxdna-act-0.2.89"
4949
}
5050
}
5151
},
@@ -561,51 +561,51 @@
561561
}
562562
}
563563
},
564-
"fly@8.2.2": {
565-
"last_modified": "2026-05-27T10:28:13Z",
566-
"resolved": "github:NixOS/nixpkgs/4100e830e085863741bc69b156ec4ccd53ab5be0#fly",
564+
"fly@8.2.3": {
565+
"last_modified": "2026-06-05T19:07:58Z",
566+
"resolved": "github:NixOS/nixpkgs/891eaa77f0eed53352194677991bd30978f9b0ad#fly",
567567
"source": "devbox-search",
568-
"version": "8.2.2",
568+
"version": "8.2.3",
569569
"systems": {
570570
"aarch64-darwin": {
571571
"outputs": [
572572
{
573573
"name": "out",
574-
"path": "/nix/store/zrnzs7wd601pal9yinsi46nha5wp3iqd-fly-8.2.2",
574+
"path": "/nix/store/yjf8rqay7q11issdl9k4m77wkwgpp2pn-fly-8.2.3",
575575
"default": true
576576
}
577577
],
578-
"store_path": "/nix/store/zrnzs7wd601pal9yinsi46nha5wp3iqd-fly-8.2.2"
578+
"store_path": "/nix/store/yjf8rqay7q11issdl9k4m77wkwgpp2pn-fly-8.2.3"
579579
},
580580
"aarch64-linux": {
581581
"outputs": [
582582
{
583583
"name": "out",
584-
"path": "/nix/store/svlfvyqghp2f4ih5a7wmya80nwfal266-fly-8.2.2",
584+
"path": "/nix/store/z05b9kjgn3zzw1wzbiys8wk9m0a18vab-fly-8.2.3",
585585
"default": true
586586
}
587587
],
588-
"store_path": "/nix/store/svlfvyqghp2f4ih5a7wmya80nwfal266-fly-8.2.2"
588+
"store_path": "/nix/store/z05b9kjgn3zzw1wzbiys8wk9m0a18vab-fly-8.2.3"
589589
},
590590
"x86_64-darwin": {
591591
"outputs": [
592592
{
593593
"name": "out",
594-
"path": "/nix/store/qvgq0kkf0jfvvqgziw6jqavdv1nxjdy2-fly-8.2.2",
594+
"path": "/nix/store/31i3wb99x8ddzrj5fx4ryiai8cxdak1j-fly-8.2.3",
595595
"default": true
596596
}
597597
],
598-
"store_path": "/nix/store/qvgq0kkf0jfvvqgziw6jqavdv1nxjdy2-fly-8.2.2"
598+
"store_path": "/nix/store/31i3wb99x8ddzrj5fx4ryiai8cxdak1j-fly-8.2.3"
599599
},
600600
"x86_64-linux": {
601601
"outputs": [
602602
{
603603
"name": "out",
604-
"path": "/nix/store/ympfdgsg7zxdmy2pdg1gs04bc4ig0ir9-fly-8.2.2",
604+
"path": "/nix/store/jr4il9bxf4prbr94qv978pfc28drys2f-fly-8.2.3",
605605
"default": true
606606
}
607607
],
608-
"store_path": "/nix/store/ympfdgsg7zxdmy2pdg1gs04bc4ig0ir9-fly-8.2.2"
608+
"store_path": "/nix/store/jr4il9bxf4prbr94qv978pfc28drys2f-fly-8.2.3"
609609
}
610610
}
611611
},

‎go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
code.cloudfoundry.org/go-log-cache/v3 v3.1.2
1010
code.cloudfoundry.org/go-loggregator/v10 v10.3.1
1111
code.cloudfoundry.org/lager/v3 v3.71.0
12-
code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20260604182237-264e3b124d88
13-
code.cloudfoundry.org/tlsconfig v0.57.0
12+
code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20260622083525-327d7078f8a4
13+
code.cloudfoundry.org/tlsconfig v0.60.0
1414
github.com/apache/thrift v0.23.0
1515
github.com/cenkalti/backoff/v5 v5.0.3
1616
github.com/cloud-gov/go-cfenv v1.19.1
@@ -27,8 +27,8 @@ require (
2727
github.com/jmoiron/sqlx v1.4.0
2828
github.com/maxbrunsfeld/counterfeiter/v6 v6.12.2
2929
github.com/ogen-go/ogen v1.20.3
30-
github.com/onsi/ginkgo/v2 v2.29.0
31-
github.com/onsi/gomega v1.41.0
30+
github.com/onsi/ginkgo/v2 v2.31.0
31+
github.com/onsi/gomega v1.42.0
3232
github.com/patrickmn/go-cache v2.1.0+incompatible
3333
github.com/prometheus/client_golang v1.23.2
3434
github.com/rubyist/circuitbreaker v2.2.1+incompatible
@@ -44,17 +44,17 @@ require (
4444
go.opentelemetry.io/otel/sdk v1.43.0
4545
go.opentelemetry.io/otel/trace v1.43.0
4646
go.yaml.in/yaml/v4 v4.0.0-rc.6
47-
golang.org/x/crypto v0.52.0
48-
golang.org/x/exp v0.0.0-20260603202125-055de637280b
47+
golang.org/x/crypto v0.53.0
48+
golang.org/x/exp v0.0.0-20260611194520-c48552f49976
4949
golang.org/x/time v0.15.0
5050
google.golang.org/grpc v1.81.1
5151
)
5252

5353
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20260610212136-7ab31c22f7ad
5454

5555
require (
56-
code.cloudfoundry.org/go-diodes v0.0.0-20260526122959-0284fcb5ac88 // indirect
57-
code.cloudfoundry.org/go-metric-registry v0.0.0-20260526123058-84feb65e848f // indirect
56+
code.cloudfoundry.org/go-diodes v0.0.0-20260615142411-472d6bcdb3c6 // indirect
57+
code.cloudfoundry.org/go-metric-registry v0.0.0-20260617164716-452ba9c14ce2 // indirect
5858
filippo.io/edwards25519 v1.2.0 // indirect
5959
github.com/Masterminds/semver/v3 v3.5.0 // indirect
6060
github.com/andybalholm/brotli v1.2.1 // indirect
@@ -75,7 +75,7 @@ require (
7575
github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab // indirect
7676
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7777
github.com/google/go-cmp v0.7.0 // indirect
78-
github.com/google/pprof v0.0.0-20260507013755-92041b743c96 // indirect
78+
github.com/google/pprof v0.0.0-20260604005048-7023385849c0 // indirect
7979
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
8080
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
8181
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -92,7 +92,7 @@ require (
9292
github.com/peterbourgon/g2s v0.0.0-20170223122336-d4e7ad98afea // indirect
9393
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9494
github.com/prometheus/client_model v0.6.2 // indirect
95-
github.com/prometheus/common v0.68.0 // indirect
95+
github.com/prometheus/common v0.69.0 // indirect
9696
github.com/prometheus/procfs v0.20.1 // indirect
9797
github.com/segmentio/asm v1.2.1 // indirect
9898
github.com/shopspring/decimal v1.4.0 // indirect
@@ -104,15 +104,15 @@ require (
104104
go.uber.org/multierr v1.11.0 // indirect
105105
go.uber.org/zap v1.27.1 // indirect
106106
go.yaml.in/yaml/v3 v3.0.4 // indirect
107-
golang.org/x/mod v0.36.0 // indirect
108-
golang.org/x/net v0.55.0 // indirect
107+
golang.org/x/mod v0.37.0 // indirect
108+
golang.org/x/net v0.56.0 // indirect
109109
golang.org/x/oauth2 v0.36.0 // indirect
110-
golang.org/x/sync v0.20.0 // indirect
111-
golang.org/x/sys v0.45.0 // indirect
112-
golang.org/x/text v0.37.0 // indirect
113-
golang.org/x/tools v0.45.0 // indirect
114-
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
115-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
110+
golang.org/x/sync v0.21.0 // indirect
111+
golang.org/x/sys v0.46.0 // indirect
112+
golang.org/x/text v0.38.0 // indirect
113+
golang.org/x/tools v0.46.0 // indirect
114+
google.golang.org/genproto/googleapis/api v0.0.0-20260618152121-87f3d3e198d3 // indirect
115+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260618152121-87f3d3e198d3 // indirect
116116
google.golang.org/protobuf v1.36.11 // indirect
117117
gopkg.in/yaml.v2 v2.4.0 // indirect
118118
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)