Skip to content

Commit 5226508

Browse files
Merge remote-tracking branch 'origin/master' into dependabot/github_actions/rudderlabs/github-action-check-pr-title-1.0.11
# Conflicts: # .github/workflows/check-pr-title.yml 🔒 Scanned for secrets using gitleaks 8.28.0
2 parents f15588b + 1400272 commit 5226508

18 files changed

Lines changed: 51 additions & 439 deletions

File tree

.buildscript/bootstrap.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

.buildscript/cli.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

.buildscript/deploy_snapshot.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

.buildscript/e2e.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

.buildscript/settings.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/build-and-quality-checks.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,36 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- name: Harden the runner (Audit all outbound calls)
14+
uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
15+
with:
16+
egress-policy: audit
17+
18+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
1419
with:
1520
fetch-depth: 0
1621

17-
- name: Set up JDK 20
18-
uses: actions/setup-java@v3
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3.14.1
1924
with:
20-
java-version: '20'
21-
distribution: 'temurin'
25+
java-version: 17
26+
distribution: 'zulu' # Alternative distribution options are available.
2227

2328
- name: Set up Maven
24-
uses: stCarolas/setup-maven@v4.5
29+
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
2530
with:
2631
maven-version: 3.8.6
2732

2833
- name: Cache local Maven repository
29-
uses: actions/cache@v3
34+
uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3.5.0
3035
with:
3136
path: ~/.m2/repository
3237
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3338
restore-keys: |
3439
${{ runner.os }}-maven-
3540
3641
- name: Cache SonarCloud packages
37-
uses: actions/cache@v3
42+
uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3.5.0
3843
with:
3944
path: ~/.sonar/cache
4045
key: ${{ runner.os }}-sonar
@@ -59,7 +64,7 @@ jobs:
5964
# add: '*.svg'
6065

6166
- name: Upload coverage report
62-
uses: actions/upload-artifact@v3
67+
uses: actions/upload-artifact@ff15f0306b3f739f7b6fd43fb5d26cd321bd4de5 # v3.2.1
6368
with:
6469
name: Coverage report
6570
path: |
@@ -71,7 +76,7 @@ jobs:
7176
mvn pmd:cpd
7277
7378
- name: Upload PMD lint report
74-
uses: actions/upload-artifact@v3
79+
uses: actions/upload-artifact@ff15f0306b3f739f7b6fd43fb5d26cd321bd4de5 # v3.2.1
7580
with:
7681
name: PMD lint report
7782
path: |
@@ -82,7 +87,7 @@ jobs:
8287
run: mvn checkstyle:checkstyle
8388

8489
- name: Upload Checklist lint report
85-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@ff15f0306b3f739f7b6fd43fb5d26cd321bd4de5 # v3.2.1
8691
with:
8792
name: Checklist lint report
8893
path: |
@@ -91,6 +96,6 @@ jobs:
9196
9297
- name: Sonar analysis
9398
env:
94-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
95100
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
96-
run: mvn sonar:sonar
101+
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=rudderlabs_rudder-sdk-java

.github/workflows/check-pr-title.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@ jobs:
99
name: Check PR title
1010
runs-on: ubuntu-latest
1111
steps:
12+
- name: Harden the runner (Audit all outbound calls)
13+
uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
14+
with:
15+
egress-policy: audit
16+
1217
- name: Checkout source branch
13-
uses: actions/checkout@v3
18+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
1419

1520
- name: Check PR title
16-
uses: rudderlabs/github-action-check-pr-title@v1.0.11
21+
uses: rudderlabs/github-action-check-pr-title@0a83071336f7d6417249629f67a64530fcecda2e # v1.0.11

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Version 3.1.2 (August 1, 2024)
2+
- [New](https://github.com/rudderlabs/rudder-sdk-java/pull/113) Release all Java modules with version 3.1.2
3+
14
# Version 3.1.0 (December 14, 2023)
25
- [New](https://github.com/rudderlabs/rudder-sdk-java/pull/86) Update Java to the latest version
36
- [New](https://github.com/rudderlabs/rudder-sdk-java/pull/83) Improve links in Rudderstack documentation

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[![Build & Code Quality Checks](https://github.com/rudderlabs/rudder-sdk-java/actions/workflows/build-and-quality-checks.yml/badge.svg?branch=ci%2FaddCIFeatures)](https://github.com/rudderlabs/rudder-sdk-java/actions/workflows/build-and-quality-checks.yml)
2+
[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/rudderlabs/rudder-sdk-java)
23

34
# What is RudderStack?
45

@@ -22,15 +23,15 @@ click [here](https://www.rudderstack.com/docs/sources/event-streams/sdks/rudders
2223
<dependency>
2324
<groupId>com.rudderstack.sdk.java.analytics</groupId>
2425
<artifactId>analytics</artifactId>
25-
<version>3.1.0</version>
26+
<version>x.y.z</version>
2627
</dependency>
2728

2829
```
2930

3031
*or if you're using Gradle:*
3132

3233
```bash
33-
implementation 'com.rudderstack.sdk.java.analytics:analytics:3.1.0'
34+
implementation 'com.rudderstack.sdk.java.analytics:analytics:x.y.z'
3435
```
3536

3637
## Initializing ```RudderClient```

analytics-cli/pom.xml

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)