Skip to content

Commit ed0e977

Browse files
maemayvemaemayve
authored
Merge branch 'main' into release-please--branches--main--components--java-function-invoker
2 parents 1133ebd + 185d15f commit ed0e977

File tree

11 files changed

+35
-35
lines changed

11 files changed

+35
-35
lines changed

‎.github/workflows/codeql.yml

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

2929
steps:
3030
- name: Harden Runner
31-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
31+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3232
with:
3333
disable-sudo: true
3434
egress-policy: block
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
49+
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
5050
with:
5151
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
5252
languages: java
@@ -66,6 +66,6 @@ jobs:
6666
(cd function-maven-plugin && mvn install)
6767
6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
69+
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
7070
with:
7171
category: ${{ matrix.working-directory }}

‎.github/workflows/conformance.yaml

Lines changed: 3 additions & 3 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@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
21+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2222
with:
2323
disable-sudo: true
2424
egress-policy: block
@@ -33,13 +33,13 @@ jobs:
3333
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434

3535
- name: Set up JDK ${{ matrix.java }}
36-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
36+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
3737
with:
3838
java-version: ${{ matrix.java }}
3939
distribution: temurin
4040

4141
- name: Setup Go
42-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
42+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4343
with:
4444
go-version: '1.21'
4545

‎.github/workflows/lint.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Harden Runner
16-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
16+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
1717
with:
1818
disable-sudo: true
1919
egress-policy: block
@@ -22,7 +22,7 @@ jobs:
2222
repo.maven.apache.org:443
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
- name: Set up JDK
25-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
25+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
2626
with:
2727
java-version: 11.x
2828
distribution: temurin
@@ -38,13 +38,13 @@ jobs:
3838
runs-on: ubuntu-latest
3939
steps:
4040
- name: Harden Runner
41-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
41+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
4242
with:
4343
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
4444

4545
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 # v2 minimum required
4646
- name: Set up JDK
47-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
47+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
4848
with:
4949
java-version: 17.x
5050
distribution: temurin

‎.github/workflows/scorecard.yml

Lines changed: 3 additions & 3 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@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
29+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3030
with:
3131
disable-sudo: true
3232
egress-policy: block
@@ -50,7 +50,7 @@ jobs:
5050
persist-credentials: false
5151

5252
- name: "Run analysis"
53-
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
53+
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
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@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
65+
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
6666
with:
6767
sarif_file: results.sarif

‎.github/workflows/unit.yaml

Lines changed: 2 additions & 2 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@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
22+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2323
with:
2424
disable-sudo: true
2525
egress-policy: block
@@ -30,7 +30,7 @@ jobs:
3030
*.githubusercontent.com:443
3131
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232
- name: Set up JDK ${{ matrix.java }}
33-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
33+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
3434
with:
3535
java-version: ${{ matrix.java }}
3636
distribution: temurin

‎function-maven-plugin/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
<dependency>
5959
<groupId>com.google.cloud.functions.invoker</groupId>
6060
<artifactId>java-function-invoker</artifactId>
61-
<version>1.3.1</version>
61+
<version>1.4.0</version>
6262
</dependency>
6363

6464
<dependency>
6565
<groupId>com.google.cloud.tools</groupId>
6666
<artifactId>appengine-maven-plugin</artifactId>
67-
<version>2.8.1</version>
67+
<version>2.8.3</version>
6868
<type>jar</type>
6969
</dependency>
7070

@@ -132,7 +132,7 @@
132132
<plugin>
133133
<groupId>org.apache.maven.plugins</groupId>
134134
<artifactId>maven-javadoc-plugin</artifactId>
135-
<version>3.11.1</version>
135+
<version>3.11.2</version>
136136
<executions>
137137
<execution>
138138
<id>attach-javadocs</id>

‎functions-framework-api/pom.xml

Lines changed: 2 additions & 2 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.13.0</maven-compiler-plugin.version>
32-
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
31+
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
32+
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
3333
<junit.jupiter.version>5.3.2</junit.jupiter.version>
3434
</properties>
3535

‎invoker/conformance/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<dependency>
2929
<groupId>com.google.cloud.functions</groupId>
3030
<artifactId>functions-framework-api</artifactId>
31-
<version>1.1.0</version>
31+
<version>1.1.4</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>com.google.code.gson</groupId>
3535
<artifactId>gson</artifactId>
36-
<version>2.11.0</version>
36+
<version>2.12.1</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>io.cloudevents</groupId>

‎invoker/core/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.google.cloud.functions</groupId>
4646
<artifactId>functions-framework-api</artifactId>
47-
<version>1.1.0</version>
47+
<version>1.1.4</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>javax.servlet</groupId>
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>com.google.code.gson</groupId>
7171
<artifactId>gson</artifactId>
72-
<version>2.11.0</version>
72+
<version>2.12.1</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.56.v20240826</version>
101+
<version>9.4.57.v20241219</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>org.eclipse.jetty</groupId>
105105
<artifactId>jetty-server</artifactId>
106-
<version>9.4.56.v20240826</version>
106+
<version>9.4.57.v20241219</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.14.2</version>
125+
<version>5.16.0</version>
126126
<scope>test</scope>
127127
</dependency>
128128
<dependency>
@@ -134,7 +134,7 @@
134134
<dependency>
135135
<groupId>com.google.re2j</groupId>
136136
<artifactId>re2j</artifactId>
137-
<version>1.7</version>
137+
<version>1.8</version>
138138
</dependency>
139139
<dependency>
140140
<groupId>com.google.truth</groupId>
@@ -151,7 +151,7 @@
151151
<dependency>
152152
<groupId>org.eclipse.jetty</groupId>
153153
<artifactId>jetty-client</artifactId>
154-
<version>9.4.56.v20240826</version>
154+
<version>9.4.57.v20241219</version>
155155
<scope>test</scope>
156156
</dependency>
157157
</dependencies>

‎invoker/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.google.cloud.functions</groupId>
4444
<artifactId>functions-framework-api</artifactId>
45-
<version>1.1.0</version>
45+
<version>1.1.4</version>
4646
</dependency>
4747
</dependencies>
4848
</dependencyManagement>
@@ -80,7 +80,7 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-javadoc-plugin</artifactId>
83-
<version>3.11.1</version>
83+
<version>3.11.2</version>
8484
<executions>
8585
<execution>
8686
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)