Skip to content

Commit 052f3d0

Browse files
Merge branch 'main' into feat/update-copyright-headers
2 parents 2491fcd + 27ec3f9 commit 052f3d0

43 files changed

Lines changed: 5183 additions & 304 deletions

Some content is hidden

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

‎.github/resources/firebase.asc.gpg‎

-3.21 KB
Binary file not shown.
-6 Bytes
Binary file not shown.

‎.github/resources/settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</activation>
2222
<properties>
2323
<gpg.executable>gpg</gpg.executable>
24-
<gpg.keyname>0A05D8FAD4287A36C53BE07714D6B82AEB1DD39C</gpg.keyname>
24+
<gpg.keyname>${env.GPG_KEY_ID}</gpg.keyname>
2525
<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
2626
</properties>
2727
</profile>

‎.github/scripts/publish_preflight_check.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ echo_info "Generating changelog"
122122
echo_info "--------------------------------------------"
123123
echo_info ""
124124

125-
echo_info "---< git fetch origin master --prune --unshallow >---"
126-
git fetch origin master --prune --unshallow
125+
echo_info "---< git fetch origin main --prune --unshallow >---"
126+
git fetch origin main --prune --unshallow
127127
echo ""
128128

129129
echo_info "Generating changelog from history..."

‎.github/workflows/ci.yml‎

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

2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2828

2929
- name: Set up JDK
30-
uses: actions/setup-java@v4
30+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
3131
with:
3232
distribution: 'zulu'
3333
java-version: ${{ matrix.java-version }}

‎.github/workflows/nightly.yml‎

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

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

3636
- name: Set up JDK 8
37-
uses: actions/setup-java@v4
37+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
3838
with:
3939
distribution: 'zulu'
4040
java-version: 8
@@ -48,14 +48,14 @@ jobs:
4848
# Attach the packaged artifacts to the workflow output. These can be manually
4949
# downloaded for later inspection if necessary.
5050
- name: Archive artifacts
51-
uses: actions/upload-artifact@v4
51+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5252
with:
5353
name: dist
5454
path: dist
5555

5656
- name: Send email on failure
5757
if: failure()
58-
uses: firebase/firebase-admin-node/.github/actions/send-email@master
58+
uses: firebase/firebase-admin-node/.github/actions/send-email@2e2b36a84ba28679bcb7aecdacabfec0bded2d48 # Admin Node SDK v13.6.0
5959
with:
6060
api-key: ${{ secrets.OSS_BOT_MAILGUN_KEY }}
6161
domain: ${{ secrets.OSS_BOT_MAILGUN_DOMAIN }}
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: Send email on cancelled
7272
if: cancelled()
73-
uses: firebase/firebase-admin-node/.github/actions/send-email@master
73+
uses: firebase/firebase-admin-node/.github/actions/send-email@2e2b36a84ba28679bcb7aecdacabfec0bded2d48 # Admin Node SDK v13.6.0
7474
with:
7575
api-key: ${{ secrets.OSS_BOT_MAILGUN_KEY }}
7676
domain: ${{ secrets.OSS_BOT_MAILGUN_DOMAIN }}

‎.github/workflows/release.yml‎

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

4747
- name: Set up JDK 8
48-
uses: actions/setup-java@v4
48+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
4949
with:
5050
distribution: 'zulu'
5151
java-version: 8
@@ -59,7 +59,7 @@ jobs:
5959
# Attach the packaged artifacts to the workflow output. These can be manually
6060
# downloaded for later inspection if necessary.
6161
- name: Archive artifacts
62-
uses: actions/upload-artifact@v4
62+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6363
with:
6464
name: dist
6565
path: dist
@@ -69,24 +69,25 @@ jobs:
6969

7070
# Check whether the release should be published. We publish only when the trigger PR is
7171
# 1. merged
72-
# 2. to the master branch
72+
# 2. to the main branch
7373
# 3. with the label 'release:publish', and
7474
# 4. the title prefix '[chore] Release '.
7575
if: github.event.pull_request.merged &&
76-
github.ref == 'refs/heads/master' &&
76+
github.ref == 'refs/heads/main' &&
7777
contains(github.event.pull_request.labels.*.name, 'release:publish') &&
7878
startsWith(github.event.pull_request.title, '[chore] Release ')
7979

8080
runs-on: ubuntu-latest
81+
environment: Release
8182
permissions:
8283
contents: write
8384

8485
steps:
8586
- name: Checkout source for publish
86-
uses: actions/checkout@v4
87+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
8788

8889
- name: Set up JDK 8
89-
uses: actions/setup-java@v4
90+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
9091
with:
9192
distribution: 'zulu'
9293
java-version: 8
@@ -100,6 +101,7 @@ jobs:
100101
env:
101102
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
102103
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
104+
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
103105
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
104106
CENTRAL_TOKEN: ${{ secrets.CENTRAL_TOKEN }}
105107

@@ -111,17 +113,3 @@ jobs:
111113
--title "Firebase Admin Java SDK ${{ steps.preflight.outputs.version }}"
112114
--notes '${{ steps.preflight.outputs.changelog }}'
113115

114-
# Post to Twitter if explicitly opted-in by adding the label 'release:tweet'.
115-
- name: Post to Twitter
116-
if: success() &&
117-
contains(github.event.pull_request.labels.*.name, 'release:tweet')
118-
uses: firebase/firebase-admin-node/.github/actions/send-tweet@master
119-
with:
120-
status: >
121-
${{ steps.preflight.outputs.version }} of @Firebase Admin Java SDK is available.
122-
https://github.com/firebase/firebase-admin-java/releases/tag/${{ steps.preflight.outputs.version }}
123-
consumer-key: ${{ secrets.TWITTER_CONSUMER_KEY }}
124-
consumer-secret: ${{ secrets.TWITTER_CONSUMER_SECRET }}
125-
access-token: ${{ secrets.TWITTER_ACCESS_TOKEN }}
126-
access-token-secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
127-
continue-on-error: true

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Great, we love hearing how we can improve our products! Share you idea through o
4747
## <a name="submit"></a>Want to submit a pull request?
4848

4949
Sweet, we'd love to accept your contribution!
50-
[Open a new pull request](https://github.com/firebase/firebase-admin-java/pull/new/master) and fill
50+
[Open a new pull request](https://github.com/firebase/firebase-admin-java/pull/new) and fill
5151
out the provided template.
5252

5353
**If you want to implement a new feature, please open an issue with a proposal first so that we can

‎pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<groupId>com.google.firebase</groupId>
2121
<artifactId>firebase-admin</artifactId>
22-
<version>9.6.0</version>
22+
<version>9.7.0</version>
2323
<packaging>jar</packaging>
2424

2525
<name>firebase-admin</name>
@@ -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.2.5.Final</netty.version>
62+
<netty.version>4.2.9.Final</netty.version>
6363
</properties>
6464

6565
<scm>
@@ -82,7 +82,7 @@
8282
<plugin>
8383
<!-- Generate API docs using Doclava for the developer site -->
8484
<artifactId>maven-javadoc-plugin</artifactId>
85-
<version>3.11.3</version>
85+
<version>3.12.0</version>
8686
<executions>
8787
<execution>
8888
<phase>site</phase>
@@ -124,7 +124,7 @@
124124
<plugin>
125125
<!-- Update relative paths in generated API docs -->
126126
<artifactId>maven-antrun-plugin</artifactId>
127-
<version>3.1.0</version>
127+
<version>3.2.0</version>
128128
<executions>
129129
<execution>
130130
<phase>site</phase>
@@ -182,7 +182,7 @@
182182
<plugin>
183183
<groupId>org.jacoco</groupId>
184184
<artifactId>jacoco-maven-plugin</artifactId>
185-
<version>0.8.13</version>
185+
<version>0.8.14</version>
186186
<executions>
187187
<execution>
188188
<id>pre-unit-test</id>
@@ -208,7 +208,7 @@
208208
<plugin>
209209
<groupId>org.codehaus.mojo</groupId>
210210
<artifactId>exec-maven-plugin</artifactId>
211-
<version>3.5.1</version>
211+
<version>3.6.3</version>
212212
<executions>
213213
<execution>
214214
<phase>test</phase>
@@ -263,7 +263,7 @@
263263
<!-- Compile Phase -->
264264
<plugin>
265265
<artifactId>maven-compiler-plugin</artifactId>
266-
<version>3.14.0</version>
266+
<version>3.14.1</version>
267267
<configuration>
268268
<source>1.8</source>
269269
<target>1.8</target>
@@ -273,7 +273,7 @@
273273
<!-- Test Phase -->
274274
<plugin>
275275
<artifactId>maven-surefire-plugin</artifactId>
276-
<version>3.5.3</version>
276+
<version>3.5.4</version>
277277
<configuration>
278278
<skipTests>${skipUTs}</skipTests>
279279
</configuration>
@@ -282,7 +282,7 @@
282282
<!-- Package Phase -->
283283
<plugin>
284284
<artifactId>maven-source-plugin</artifactId>
285-
<version>3.3.1</version>
285+
<version>3.4.0</version>
286286
<executions>
287287
<execution>
288288
<id>attach-sources</id>
@@ -294,7 +294,7 @@
294294
</plugin>
295295
<plugin>
296296
<artifactId>maven-javadoc-plugin</artifactId>
297-
<version>3.11.3</version>
297+
<version>3.12.0</version>
298298
<executions>
299299
<execution>
300300
<id>attach-javadocs</id>
@@ -330,7 +330,7 @@
330330
<!-- Verify Phase -->
331331
<plugin>
332332
<artifactId>maven-failsafe-plugin</artifactId>
333-
<version>3.5.3</version>
333+
<version>3.5.4</version>
334334
<executions>
335335
<execution>
336336
<goals>
@@ -345,7 +345,7 @@
345345
<plugin>
346346
<groupId>org.sonatype.central</groupId>
347347
<artifactId>central-publishing-maven-plugin</artifactId>
348-
<version>0.8.0</version>
348+
<version>0.10.0</version>
349349
<extensions>true</extensions>
350350
<configuration>
351351
<publishingServerId>central</publishingServerId>
@@ -378,7 +378,7 @@
378378
<dependency>
379379
<groupId>com.google.cloud</groupId>
380380
<artifactId>libraries-bom</artifactId>
381-
<version>26.67.0</version>
381+
<version>26.74.0</version>
382382
<type>pom</type>
383383
<scope>import</scope>
384384
</dependency>

‎prepare_release.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,13 @@ if [[ $(git status --porcelain) ]]; then
6666
#exit 1
6767
fi
6868

69-
echo "[INFO] Updating the master branch"
70-
git checkout master
71-
git pull origin master
69+
echo "[INFO] Updating the main branch"
70+
git fetch origin main
7271

7372
TIMESTAMP=$(date +%s)
7473
RELEASE_BRANCH="release-${TIMESTAMP}"
7574
echo "[INFO] Creating new release branch: ${RELEASE_BRANCH}"
76-
git checkout -b ${RELEASE_BRANCH} master
75+
git checkout -b ${RELEASE_BRANCH} origin/main
7776

7877

7978
#################################

0 commit comments

Comments
 (0)