Skip to content

Commit 4db441e

Browse files
authored
Merge branch 'main' into renovate/googlecloudplatform-functions-framework-conformance-digest
2 parents dcaedee + 88e3f96 commit 4db441e

File tree

11 files changed

+52
-52
lines changed

11 files changed

+52
-52
lines changed

.github/workflows/codeql.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ jobs:
1414
analyze:
1515
name: Analyze
1616
runs-on: ubuntu-latest
17-
17+
1818
permissions:
1919
actions: read
2020
contents: read
2121
security-events: write
2222

2323
strategy:
2424
fail-fast: false
25-
matrix:
25+
matrix:
2626
# Autobuild each of these seperate maven projects
2727
working-directory: ['invoker', 'functions-framework-api', 'function-maven-plugin']
2828

2929
steps:
3030
- name: Harden Runner
31-
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
31+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
3232
with:
3333
disable-sudo: true
3434
egress-policy: block
@@ -37,16 +37,17 @@ jobs:
3737
github.com:443
3838
objects.githubusercontent.com:443
3939
proxy.golang.org:443
40+
release-assets.githubusercontent.com:443
4041
repo.maven.apache.org:443
4142
storage.googleapis.com:443
4243
uploads.github.com:443
43-
44+
4445
- name: Checkout repository
45-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
46+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4647

4748
# Initializes the CodeQL tools for scanning.
4849
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
50+
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
5051
with:
5152
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
5253
languages: java
@@ -57,15 +58,13 @@ jobs:
5758
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5859
# queries: security-extended,security-and-quality
5960

60-
61-
6261
- name: Build
6362
run: |
6463
(cd functions-framework-api/ && mvn install)
6564
(cd invoker/ && mvn clean install)
6665
(cd function-maven-plugin && mvn install)
6766
6867
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
68+
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
7069
with:
7170
category: ${{ matrix.working-directory }}

.github/workflows/conformance.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
]
1919
steps:
2020
- name: Harden Runner
21-
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
21+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
2222
with:
2323
disable-sudo: true
2424
egress-policy: block
@@ -27,21 +27,22 @@ jobs:
2727
github.com:443
2828
objects.githubusercontent.com:443
2929
proxy.golang.org:443
30+
release-assets.githubusercontent.com:443
3031
repo.maven.apache.org:443
3132
storage.googleapis.com:443
3233
33-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3435

3536
- name: Set up JDK ${{ matrix.java }}
36-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
37+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
3738
with:
3839
java-version: ${{ matrix.java }}
3940
distribution: temurin
4041

4142
- name: Setup Go
42-
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
43+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
4344
with:
44-
go-version: '1.21'
45+
go-version: '1.25'
4546

4647
- name: Build API with Maven
4748
run: (cd functions-framework-api/ && mvn install)
@@ -94,4 +95,4 @@ jobs:
9495
useBuildpacks: false
9596
validateConcurrency: true
9697
cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.ConcurrentHttpConformanceFunction'"
97-
startDelay: 10
98+
startDelay: 10

.github/workflows/lint.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Harden Runner
16-
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
16+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
1717
with:
1818
disable-sudo: true
1919
egress-policy: block
2020
allowed-endpoints: >
2121
github.com:443
2222
repo.maven.apache.org:443
23-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2424
- name: Set up JDK
25-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2626
with:
2727
java-version: 11.x
2828
distribution: temurin
@@ -38,15 +38,15 @@ jobs:
3838
runs-on: ubuntu-latest
3939
steps:
4040
- name: Harden Runner
41-
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
41+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
4242
with:
4343
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
4444

45-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 # v2 minimum required
45+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # v2 minimum required
4646
- name: Set up JDK
47-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
47+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
4848
with:
49-
java-version: 17.x
49+
java-version: 21.x
5050
distribution: temurin
5151
- name: Run formatter
5252
id: formatter

.github/workflows/scorecard.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Harden Runner
29-
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
29+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
3030
with:
3131
disable-sudo: true
3232
egress-policy: block
@@ -43,14 +43,14 @@ jobs:
4343
www.bestpractices.dev:443
4444
*.sigstore.dev:443
4545
*.github.com:443
46-
46+
4747
- name: "Checkout code"
48-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
48+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4949
with:
5050
persist-credentials: false
5151

5252
- name: "Run analysis"
53-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
53+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
5454
with:
5555
results_file: results.sarif
5656
results_format: sarif
@@ -62,6 +62,6 @@ jobs:
6262

6363
# Upload the results to GitHub's code scanning dashboard.
6464
- name: "Upload to code-scanning"
65-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
65+
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
6666
with:
6767
sarif_file: results.sarif

.github/workflows/unit.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
]
2020
steps:
2121
- name: Harden Runner
22-
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
22+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
2323
with:
2424
disable-sudo: true
2525
egress-policy: block
@@ -28,9 +28,9 @@ jobs:
2828
repo.maven.apache.org:443
2929
api.adoptium.net:443
3030
*.githubusercontent.com:443
31-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3232
- name: Set up JDK ${{ matrix.java }}
33-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
33+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
3434
with:
3535
java-version: ${{ matrix.java }}
3636
distribution: temurin

function-maven-plugin/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
<dependency>
4242
<groupId>org.apache.maven</groupId>
4343
<artifactId>maven-plugin-api</artifactId>
44-
<version>3.9.9</version>
44+
<version>3.9.11</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.apache.maven</groupId>
4848
<artifactId>maven-core</artifactId>
49-
<version>3.9.9</version>
49+
<version>3.9.11</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>com.google.cloud.functions.invoker</groupId>
6060
<artifactId>java-function-invoker</artifactId>
61-
<version>1.4.0</version>
61+
<version>1.4.1</version>
6262
</dependency>
6363

6464
<dependency>
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>com.google.truth</groupId>
7373
<artifactId>truth</artifactId>
74-
<version>1.4.4</version>
74+
<version>1.4.5</version>
7575
<scope>test</scope>
7676
</dependency>
7777
<dependency>
@@ -132,7 +132,7 @@
132132
<plugin>
133133
<groupId>org.apache.maven.plugins</groupId>
134134
<artifactId>maven-javadoc-plugin</artifactId>
135-
<version>3.11.2</version>
135+
<version>3.12.0</version>
136136
<executions>
137137
<execution>
138138
<id>attach-javadocs</id>
@@ -145,7 +145,7 @@
145145
<plugin>
146146
<groupId>org.apache.maven.plugins</groupId>
147147
<artifactId>maven-gpg-plugin</artifactId>
148-
<version>3.2.7</version>
148+
<version>3.2.8</version>
149149
<executions>
150150
<execution>
151151
<id>sign-artifacts</id>

functions-framework-api/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
<properties>
3030
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
31-
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
32-
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
31+
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
32+
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
3333
<junit.jupiter.version>5.3.2</junit.jupiter.version>
3434
</properties>
3535

@@ -177,7 +177,7 @@
177177
<plugin>
178178
<groupId>org.apache.maven.plugins</groupId>
179179
<artifactId>maven-gpg-plugin</artifactId>
180-
<version>3.2.7</version>
180+
<version>3.2.8</version>
181181
<executions>
182182
<execution>
183183
<id>sign-artifacts</id>

invoker/conformance/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>com.google.code.gson</groupId>
3535
<artifactId>gson</artifactId>
36-
<version>2.12.1</version>
36+
<version>2.13.2</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>io.cloudevents</groupId>

invoker/core/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>com.google.code.gson</groupId>
7171
<artifactId>gson</artifactId>
72-
<version>2.12.1</version>
72+
<version>2.13.2</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.ryanharter.auto.value</groupId>
@@ -98,12 +98,12 @@
9898
<dependency>
9999
<groupId>org.eclipse.jetty</groupId>
100100
<artifactId>jetty-servlet</artifactId>
101-
<version>9.4.57.v20241219</version>
101+
<version>9.4.58.v20250814</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>org.eclipse.jetty</groupId>
105105
<artifactId>jetty-server</artifactId>
106-
<version>9.4.57.v20241219</version>
106+
<version>9.4.58.v20250814</version>
107107
</dependency>
108108
<dependency>
109109
<groupId>com.beust</groupId>
@@ -122,7 +122,7 @@
122122
<dependency>
123123
<groupId>org.mockito</groupId>
124124
<artifactId>mockito-core</artifactId>
125-
<version>5.16.0</version>
125+
<version>5.20.0</version>
126126
<scope>test</scope>
127127
</dependency>
128128
<dependency>
@@ -139,19 +139,19 @@
139139
<dependency>
140140
<groupId>com.google.truth</groupId>
141141
<artifactId>truth</artifactId>
142-
<version>1.4.4</version>
142+
<version>1.4.5</version>
143143
<scope>test</scope>
144144
</dependency>
145145
<dependency>
146146
<groupId>com.google.truth.extensions</groupId>
147147
<artifactId>truth-java8-extension</artifactId>
148-
<version>1.4.4</version>
148+
<version>1.4.5</version>
149149
<scope>test</scope>
150150
</dependency>
151151
<dependency>
152152
<groupId>org.eclipse.jetty</groupId>
153153
<artifactId>jetty-client</artifactId>
154-
<version>9.4.57.v20241219</version>
154+
<version>9.4.58.v20250814</version>
155155
<scope>test</scope>
156156
</dependency>
157157
</dependencies>
@@ -174,7 +174,7 @@
174174
<plugin>
175175
<groupId>org.apache.maven.plugins</groupId>
176176
<artifactId>maven-shade-plugin</artifactId>
177-
<version>3.6.0</version>
177+
<version>3.6.1</version>
178178
<executions>
179179
<execution>
180180
<phase>package</phase>

invoker/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-javadoc-plugin</artifactId>
83-
<version>3.11.2</version>
83+
<version>3.12.0</version>
8484
<executions>
8585
<execution>
8686
<id>attach-javadocs</id>
@@ -93,7 +93,7 @@
9393
<plugin>
9494
<groupId>org.apache.maven.plugins</groupId>
9595
<artifactId>maven-gpg-plugin</artifactId>
96-
<version>3.2.7</version>
96+
<version>3.2.8</version>
9797
<executions>
9898
<execution>
9999
<id>sign-artifacts</id>

0 commit comments

Comments
 (0)