Skip to content

Commit c4b070c

Browse files
lahirumarambalahirumaramba
authored
Merge branch 'master' into master
2 parents 7682836 + 01dd6cc commit c4b070c

File tree

5 files changed

+40
-41
lines changed

5 files changed

+40
-41
lines changed

‎.github/scripts/publish_preflight_check.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if [[ ! "${RELEASE_VERSION}" =~ ^([0-9]*)\.([0-9]*)\.([0-9]*)$ ]]; then
6969
fi
7070

7171
echo_info "Extracted release version: ${RELEASE_VERSION}"
72-
echo "::set-output name=version::v${RELEASE_VERSION}"
72+
echo "version=v${RELEASE_VERSION}" >> $GITHUB_OUTPUT
7373

7474

7575
echo_info ""
@@ -132,12 +132,13 @@ readonly CHANGELOG=`${CURRENT_DIR}/generate_changelog.sh`
132132
echo "$CHANGELOG"
133133

134134
# Parse and preformat the text to handle multi-line output.
135-
# See https://github.community/t5/GitHub-Actions/set-output-Truncates-Multiline-Strings/td-p/37870
135+
# See https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#example-of-a-multiline-string
136+
# and https://github.com/github/docs/issues/21529#issue-1418590935
136137
FILTERED_CHANGELOG=`echo "$CHANGELOG" | grep -v "\\[INFO\\]"`
137-
FILTERED_CHANGELOG="${FILTERED_CHANGELOG//'%'/'%25'}"
138-
FILTERED_CHANGELOG="${FILTERED_CHANGELOG//$'\n'/'%0A'}"
139-
FILTERED_CHANGELOG="${FILTERED_CHANGELOG//$'\r'/'%0D'}"
140-
echo "::set-output name=changelog::${FILTERED_CHANGELOG}"
138+
FILTERED_CHANGELOG="${FILTERED_CHANGELOG//$'\''/'"'}"
139+
echo "changelog<<CHANGELOGEOF" >> $GITHUB_OUTPUT
140+
echo -e "$FILTERED_CHANGELOG" >> $GITHUB_OUTPUT
141+
echo "CHANGELOGEOF" >> $GITHUB_OUTPUT
141142

142143

143144
echo ""

‎.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ jobs:
2424
java-version: [8, 11, 17]
2525

2626
steps:
27-
- uses: actions/checkout@v1
27+
- uses: actions/checkout@v4
2828

2929
- name: Set up JDK
30-
uses: actions/setup-java@v1
30+
uses: actions/setup-java@v4
3131
with:
32+
distribution: 'zulu'
3233
java-version: ${{ matrix.java-version }}
3334

3435
# Does the following:

‎.github/workflows/nightly.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@ jobs:
2929

3030
steps:
3131
- name: Checkout source for staging
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v4
3333
with:
3434
ref: ${{ github.event.client_payload.ref || github.ref }}
3535

36-
- name: Set up JDK 1.8
37-
uses: actions/setup-java@v1
36+
- name: Set up JDK 8
37+
uses: actions/setup-java@v4
3838
with:
39-
java-version: 1.8
39+
distribution: 'zulu'
40+
java-version: 8
4041

4142
- name: Compile, test and package
4243
run: ./.github/scripts/package_artifacts.sh

‎.github/workflows/release.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ jobs:
4040
# via the 'ref' client parameter.
4141
steps:
4242
- name: Checkout source for staging
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v4
4444
with:
4545
ref: ${{ github.event.client_payload.ref || github.ref }}
4646

47-
- name: Set up JDK 1.8
48-
uses: actions/setup-java@v1
47+
- name: Set up JDK 8
48+
uses: actions/setup-java@v4
4949
with:
50-
java-version: 1.8
50+
distribution: 'zulu'
51+
java-version: 8
5152

5253
- name: Compile, test and package
5354
run: ./.github/scripts/package_artifacts.sh
@@ -80,12 +81,13 @@ jobs:
8081

8182
steps:
8283
- name: Checkout source for publish
83-
uses: actions/checkout@v2
84+
uses: actions/checkout@v4
8485

85-
- name: Set up JDK 1.8
86-
uses: actions/setup-java@v1
86+
- name: Set up JDK 8
87+
uses: actions/setup-java@v4
8788
with:
88-
java-version: 1.8
89+
distribution: 'zulu'
90+
java-version: 8
8991

9092
- name: Publish preflight check
9193
id: preflight
@@ -99,19 +101,13 @@ jobs:
99101
NEXUS_OSSRH_USERNAME: ${{ secrets.NEXUS_OSSRH_USERNAME }}
100102
NEXUS_OSSRH_PASSWORD: ${{ secrets.NEXUS_OSSRH_PASSWORD }}
101103

102-
# We pull this action from a custom fork of a contributor until
103-
# https://github.com/actions/create-release/pull/32 is merged. Also note that v1 of
104-
# this action does not support the "body" parameter.
104+
# See: https://cli.github.com/manual/gh_release_create
105105
- name: Create release tag
106-
uses: fleskesvor/create-release@1a72e235c178bf2ae6c51a8ae36febc24568c5fe
107106
env:
108107
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
109-
with:
110-
tag_name: ${{ steps.preflight.outputs.version }}
111-
release_name: Firebase Admin Java SDK ${{ steps.preflight.outputs.version }}
112-
body: ${{ steps.preflight.outputs.changelog }}
113-
draft: false
114-
prerelease: false
108+
run: gh release create ${{ steps.preflight.outputs.version }}
109+
--title "Firebase Admin Java SDK ${{ steps.preflight.outputs.version }}"
110+
--notes '${{ steps.preflight.outputs.changelog }}'
115111

116112
# Post to Twitter if explicitly opted-in by adding the label 'release:tweet'.
117113
- name: Post to Twitter

‎pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6060
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6161
<skipUTs>${skipTests}</skipUTs>
62-
<netty.version>4.1.101.Final</netty.version>
62+
<netty.version>4.1.109.Final</netty.version>
6363
</properties>
6464

6565
<scm>
@@ -157,7 +157,7 @@
157157
<plugins>
158158
<plugin>
159159
<artifactId>maven-gpg-plugin</artifactId>
160-
<version>3.1.0</version>
160+
<version>3.2.4</version>
161161
<executions>
162162
<execution>
163163
<id>sign-artifacts</id>
@@ -189,7 +189,7 @@
189189
<plugin>
190190
<groupId>org.jacoco</groupId>
191191
<artifactId>jacoco-maven-plugin</artifactId>
192-
<version>0.8.11</version>
192+
<version>0.8.12</version>
193193
<executions>
194194
<execution>
195195
<id>pre-unit-test</id>
@@ -215,7 +215,7 @@
215215
<plugin>
216216
<groupId>org.codehaus.mojo</groupId>
217217
<artifactId>exec-maven-plugin</artifactId>
218-
<version>3.1.1</version>
218+
<version>3.2.0</version>
219219
<executions>
220220
<execution>
221221
<phase>test</phase>
@@ -270,7 +270,7 @@
270270
<!-- Compile Phase -->
271271
<plugin>
272272
<artifactId>maven-compiler-plugin</artifactId>
273-
<version>3.11.0</version>
273+
<version>3.13.0</version>
274274
<configuration>
275275
<source>1.8</source>
276276
<target>1.8</target>
@@ -280,7 +280,7 @@
280280
<!-- Test Phase -->
281281
<plugin>
282282
<artifactId>maven-surefire-plugin</artifactId>
283-
<version>3.2.2</version>
283+
<version>3.2.5</version>
284284
<configuration>
285285
<skipTests>${skipUTs}</skipTests>
286286
</configuration>
@@ -289,7 +289,7 @@
289289
<!-- Package Phase -->
290290
<plugin>
291291
<artifactId>maven-source-plugin</artifactId>
292-
<version>3.3.0</version>
292+
<version>3.3.1</version>
293293
<executions>
294294
<execution>
295295
<id>attach-sources</id>
@@ -337,7 +337,7 @@
337337
<!-- Verify Phase -->
338338
<plugin>
339339
<artifactId>maven-failsafe-plugin</artifactId>
340-
<version>3.2.3</version>
340+
<version>3.2.5</version>
341341
<executions>
342342
<execution>
343343
<goals>
@@ -385,14 +385,14 @@
385385
<dependency>
386386
<groupId>com.google.cloud</groupId>
387387
<artifactId>libraries-bom</artifactId>
388-
<version>26.28.0</version>
388+
<version>26.39.0</version>
389389
<type>pom</type>
390390
<scope>import</scope>
391391
</dependency>
392392
<dependency>
393393
<groupId>com.google.api-client</groupId>
394394
<artifactId>google-api-client-bom</artifactId>
395-
<version>2.2.0</version>
395+
<version>2.5.0</version>
396396
<type>pom</type>
397397
<scope>import</scope>
398398
</dependency>
@@ -438,7 +438,7 @@
438438
<dependency>
439439
<groupId>org.slf4j</groupId>
440440
<artifactId>slf4j-api</artifactId>
441-
<version>2.0.9</version>
441+
<version>2.0.13</version>
442442
</dependency>
443443
<dependency>
444444
<groupId>io.netty</groupId>

0 commit comments

Comments
 (0)