Skip to content

Commit 27ddbed

Browse files
msmygitMadhavan
andauthored
chore: Upgrade OSS 3.x C* & GHA versions (#219)
* Upgrade OSS C* & DSE versions * Update action version, add JDK11 * com.github.johnrengelman:shadow update to 8.1.1 * temp fixes * Revert "temp fixes" This reverts commit 89ec7dd. * Revert "com.github.johnrengelman:shadow update to 8.1.1" This reverts commit 7ca7d4d. * Revert "Update action version, add JDK11" This reverts commit b1c8241. * Update GHA versions and jupiter * update other GHA versions * Add dependabot to keep up with version upgrades --------- Co-authored-by: Madhavan <[email protected]>
1 parent 5ade2b1 commit 27ddbed

File tree

9 files changed

+44
-21
lines changed

9 files changed

+44
-21
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
groups:
8+
github-actions:
9+
patterns:
10+
- "*"

.github/workflows/backfill-ci.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ on:
1414
- 'grafana/**'
1515
- 'prometheus/**'
1616

17+
# cancel same workflows in progress for pull request branches
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
21+
1722
jobs:
1823
build:
1924
runs-on: ubuntu-latest
2025
timeout-minutes: 90
2126
name: Build
2227
steps:
23-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v6
2429
- name: Build project
2530
env:
2631
DSE_REPO_USERNAME: ${{ secrets.DSE_REPO_USERNAME }}
@@ -41,22 +46,22 @@ jobs:
4146
pulsarImage: ['datastax/lunastreaming:2.10_3.4', 'apachepulsar/pulsar:2.10.3', 'apachepulsar/pulsar:2.11.0']
4247
cassandraFamily: ['c3', 'c4', 'dse4']
4348
steps:
44-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v6
4550
- name: Set up JDK ${{ matrix.jdk }}
46-
uses: actions/setup-java@v3
51+
uses: actions/setup-java@v5
4752
with:
4853
java-version: ${{ matrix.jdk }}
4954
distribution: 'adopt'
5055

5156
- name: Get project version
52-
uses: HardNorth/github-version-generate@v1.3.0
57+
uses: HardNorth/github-version-generate@v1.4.0
5358
with:
5459
version-source: file
5560
version-file: gradle.properties
5661
version-file-extraction-pattern: '(?<=version=).+'
5762

5863
- name: Cache Docker layers
59-
uses: actions/cache@v3
64+
uses: actions/cache@v5
6065
with:
6166
path: /tmp/.buildx-cache
6267
key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/ci.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ on:
1414
- 'grafana/**'
1515
- 'prometheus/**'
1616

17+
# cancel same workflows in progress for pull request branches
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
21+
1722
jobs:
1823
build:
1924
runs-on: ubuntu-latest
2025
timeout-minutes: 90
2126
name: Build
2227
steps:
23-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v6
2429
- name: Build project
2530
env:
2631
DSE_REPO_USERNAME: ${{ secrets.DSE_REPO_USERNAME }}
@@ -41,22 +46,22 @@ jobs:
4146
jdk: ['11', '17']
4247
pulsarImage: ['datastax/lunastreaming:2.10_3.4', 'apachepulsar/pulsar:2.10.3', 'apachepulsar/pulsar:2.11.0']
4348
steps:
44-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v6
4550
- name: Set up JDK ${{ matrix.jdk }}
46-
uses: actions/setup-java@v3
51+
uses: actions/setup-java@v5
4752
with:
4853
java-version: ${{ matrix.jdk }}
4954
distribution: 'adopt'
5055

5156
- name: Get project version
52-
uses: HardNorth/github-version-generate@v1.3.0
57+
uses: HardNorth/github-version-generate@v1.4.0
5358
with:
5459
version-source: file
5560
version-file: gradle.properties
5661
version-file-extraction-pattern: '(?<=version=).+'
5762

5863
- name: Cache Docker layers
59-
uses: actions/cache@v3
64+
uses: actions/cache@v5
6065
with:
6166
path: /tmp/.buildx-cache
6267
key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout repository
1414
uses: actions/checkout@v3
1515
- name: Set up JDK 11
16-
uses: actions/setup-java@v3
16+
uses: actions/setup-java@v5
1717
with:
1818
java-version: '11'
1919
distribution: 'adopt'

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v6
1313
- name: Set up JDK 11
14-
uses: actions/setup-java@v3
14+
uses: actions/setup-java@v5
1515
with:
1616
java-version: '11'
1717
distribution: 'adopt'
1818

1919
- name: Get project version
20-
uses: HardNorth/github-version-generate@v1.3.0
20+
uses: HardNorth/github-version-generate@v1.4.0
2121
with:
2222
version-source: file
2323
version-file: gradle.properties

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ allprojects {
6262
testImplementation "org.projectlombok:lombok:${lombokVersion}"
6363
testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
6464

65-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.1'
66-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.1'
65+
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
66+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
6767
}
6868

6969
// use JUnit 5 platform

connector/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ dependencies {
7575

7676
testImplementation("com.datastax.oss:dsbulk-tests:${dsbulkVersion}")
7777
testImplementation("org.reactivestreams:reactive-streams:1.0.3")
78-
testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.2")
79-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
80-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
78+
testImplementation("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
79+
testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
80+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
8181

8282

8383
testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"

gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ releasesRepoUrl=https://repo.datastax.com/artifactory/datastax-public-releases-l
1010
avroVersion=1.11.4
1111
lombokVersion=1.18.20
1212
ossDriverVersion=4.19.2
13-
cassandra3Version=3.11.10
13+
cassandra3Version=3.11.19
1414
cassandra4Version=4.0.4
1515
dse4Version=6.8.23
1616

@@ -46,3 +46,6 @@ dockerRepo=myrepo/
4646

4747
# CDC backfilling Client
4848
dsbulkVersion=1.11.0
49+
50+
# test
51+
junitJupiterVersion=5.7.2

testcontainers/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
implementation "org.projectlombok:lombok:${lombokVersion}"
3030
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
3131

32-
implementation 'org.junit.jupiter:junit-jupiter-api:5.1.1'
32+
implementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
3333

3434
implementation "org.testcontainers:testcontainers:${testContainersVersion}"
3535
implementation "org.testcontainers:database-commons:${testContainersVersion}"

0 commit comments

Comments
 (0)