Skip to content

Commit c69a077

Browse files
JinwooHwangJinwooHwang
committed
Backport develop commits to support/2.0 for the 2.0.3 release
1 parent 1685bb4 commit c69a077

17 files changed

Lines changed: 330 additions & 220 deletions

File tree

‎.github/workflows/gradle.yml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
env:
3333
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3636
- name: Set up JDK 17
37-
uses: actions/setup-java@v3
37+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
3838
with:
3939
java-version: '17'
4040
distribution: 'liberica'
4141
- name: Setup Gradle
42-
uses: gradle/actions/setup-gradle@v5
42+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
4343
with:
4444
gradle-version: wrapper
4545
- name: Run 'build install javadoc spotlessCheck rat checkPom resolveDependencies pmdMain' with Gradle
@@ -57,9 +57,9 @@ jobs:
5757
env:
5858
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5959
steps:
60-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6161
- name: Set up JDK
62-
uses: actions/setup-java@v3
62+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
6363
with:
6464
distribution: ${{ matrix.distribution }}
6565
java-version: |
@@ -96,15 +96,15 @@ jobs:
9696
env:
9797
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
9898
steps:
99-
- uses: actions/checkout@v3
99+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
100100
- name: Set up JDK (include all 3 JDKs in env)
101-
uses: actions/setup-java@v3
101+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
102102
with:
103103
distribution: ${{ matrix.distribution }}
104104
java-version: |
105105
17
106106
- name: Setup Gradle
107-
uses: gradle/actions/setup-gradle@v5
107+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
108108
with:
109109
gradle-version: wrapper
110110
- name: Set JAVA_TEST_PATH to 17
@@ -127,7 +127,7 @@ jobs:
127127
-PtestJVMVer=${JAVA_TEST_VERSION} \
128128
-PtestJava17Home=${JAVA_HOME_17_X64} \
129129
test --console=plain --no-daemon
130-
- uses: actions/upload-artifact@v4
130+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
131131
if: failure()
132132
with:
133133
name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }}
@@ -145,15 +145,15 @@ jobs:
145145
env:
146146
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
147147
steps:
148-
- uses: actions/checkout@v3
148+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
149149
- name: Set up JDK
150-
uses: actions/setup-java@v3
150+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
151151
with:
152152
distribution: ${{ matrix.distribution }}
153153
java-version: |
154154
17
155155
- name: Setup Gradle
156-
uses: gradle/actions/setup-gradle@v5
156+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
157157
with:
158158
gradle-version: wrapper
159159
- name: Run integration tests
@@ -174,7 +174,7 @@ jobs:
174174
-PtestJVMVer=${JAVA_TEST_VERSION} \
175175
-PtestJava17Home=${JAVA_HOME_17_X64} \
176176
integrationTest --console=plain --no-daemon
177-
- uses: actions/upload-artifact@v4
177+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
178178
if: failure()
179179
with:
180180
name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }}
@@ -192,14 +192,14 @@ jobs:
192192
env:
193193
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
194194
steps:
195-
- uses: actions/checkout@v3
195+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
196196
- name: Set up JDK
197-
uses: actions/setup-java@v3
197+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
198198
with:
199199
distribution: ${{ matrix.distribution }}
200200
java-version: ${{ matrix.java }}
201201
- name: Setup Gradle
202-
uses: gradle/actions/setup-gradle@v5
202+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
203203
with:
204204
gradle-version: wrapper
205205
- name: Run acceptance tests
@@ -218,7 +218,7 @@ jobs:
218218
-PtestJVMVer=${JAVA_TEST_VERSION} \
219219
-PtestJava17Home=${JAVA_HOME_17_X64} \
220220
acceptanceTest --console=plain --no-daemon
221-
- uses: actions/upload-artifact@v4
221+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
222222
if: failure()
223223
with:
224224
name: acceptance-test-reports-${{ matrix.os }}-${{ matrix.java }}
@@ -236,14 +236,14 @@ jobs:
236236
env:
237237
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
238238
steps:
239-
- uses: actions/checkout@v3
239+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
240240
- name: Set up JDK
241-
uses: actions/setup-java@v3
241+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
242242
with:
243243
distribution: ${{ matrix.distribution }}
244244
java-version: ${{ matrix.java }}
245245
- name: Setup Gradle
246-
uses: gradle/actions/setup-gradle@v5
246+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
247247
with:
248248
gradle-version: wrapper
249249
- name: Run wan distributed tests
@@ -264,7 +264,7 @@ jobs:
264264
-PtestJVMVer=${JAVA_TEST_VERSION} \
265265
-PtestJava17Home=${JAVA_HOME_17_X64} \
266266
geode-wan:distributedTest --console=plain --no-daemon
267-
- uses: actions/upload-artifact@v4
267+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
268268
if: failure()
269269
with:
270270
name: wan-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }}
@@ -282,14 +282,14 @@ jobs:
282282
env:
283283
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
284284
steps:
285-
- uses: actions/checkout@v3
285+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
286286
- name: Set up JDK
287-
uses: actions/setup-java@v3
287+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
288288
with:
289289
distribution: ${{ matrix.distribution }}
290290
java-version: ${{ matrix.java }}
291291
- name: Setup Gradle
292-
uses: gradle/actions/setup-gradle@v5
292+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
293293
with:
294294
gradle-version: wrapper
295295
- name: Run cq distributed tests
@@ -308,7 +308,7 @@ jobs:
308308
-PtestJVMVer=${JAVA_TEST_VERSION} \
309309
-PtestJava17Home=${JAVA_HOME_17_X64} \
310310
geode-cq:distributedTest --console=plain --no-daemon
311-
- uses: actions/upload-artifact@v4
311+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
312312
if: failure()
313313
with:
314314
name: cq-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }}
@@ -326,14 +326,14 @@ jobs:
326326
env:
327327
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
328328
steps:
329-
- uses: actions/checkout@v3
329+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
330330
- name: Set up JDK
331-
uses: actions/setup-java@v3
331+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
332332
with:
333333
distribution: ${{ matrix.distribution }}
334334
java-version: ${{ matrix.java }}
335335
- name: Setup Gradle
336-
uses: gradle/actions/setup-gradle@v5
336+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
337337
with:
338338
gradle-version: wrapper
339339
- name: Run lucene distributed tests
@@ -354,7 +354,7 @@ jobs:
354354
-PtestJVMVer=${JAVA_TEST_VERSION} \
355355
-PtestJava17Home=${JAVA_HOME_17_X64} \
356356
geode-lucene:distributedTest --console=plain --no-daemon
357-
- uses: actions/upload-artifact@v4
357+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
358358
if: failure()
359359
with:
360360
name: lucene-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }}
@@ -372,14 +372,14 @@ jobs:
372372
env:
373373
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
374374
steps:
375-
- uses: actions/checkout@v3
375+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
376376
- name: Set up JDK
377-
uses: actions/setup-java@v3
377+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
378378
with:
379379
distribution: ${{ matrix.distribution }}
380380
java-version: ${{ matrix.java }}
381381
- name: Setup Gradle
382-
uses: gradle/actions/setup-gradle@v5
382+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
383383
with:
384384
gradle-version: wrapper
385385
- name: Run gfsh, web-mgmt, web distributed tests
@@ -401,7 +401,7 @@ jobs:
401401
geode-gfsh:distributedTest \
402402
geode-web:distributedTest \
403403
geode-web-management:distributedTest --console=plain --no-daemon
404-
- uses: actions/upload-artifact@v4
404+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
405405
if: failure()
406406
with:
407407
name: mgmt-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }}
@@ -420,14 +420,14 @@ jobs:
420420
env:
421421
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
422422
steps:
423-
- uses: actions/checkout@v3
423+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
424424
- name: Set up JDK
425-
uses: actions/setup-java@v3
425+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
426426
with:
427427
distribution: ${{ matrix.distribution }}
428428
java-version: ${{ matrix.java }}
429429
- name: Setup Gradle
430-
uses: gradle/actions/setup-gradle@v5
430+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
431431
with:
432432
gradle-version: wrapper
433433
- name: Run assembly, connectors, old-client, extensions distributed tests
@@ -452,7 +452,7 @@ jobs:
452452
geode-old-client:distributedTest \
453453
extensions:geode-modules:distributedTest \
454454
extensions:geode-modules-tomcat10:distributedTest --console=plain --no-daemon
455-
- uses: actions/upload-artifact@v4
455+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
456456
if: failure()
457457
with:
458458
name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }}

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
[![Apache Geode logo](https://geode.apache.org/img/Apache_Geode_logo.png)](http://geode.apache.org)
44

55
[![Build Status](https://concourse.apachegeode-ci.info/api/v1/teams/main/pipelines/apache-develop-main/badge)](https://concourse.apachegeode-ci.info/teams/main/pipelines/apache-develop-main) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.geode/geode-core/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.geode%22) [![homebrew](https://img.shields.io/homebrew/v/apache-geode.svg)](https://formulae.brew.sh/formula/apache-geode) [![Docker Pulls](https://img.shields.io/docker/pulls/apachegeode/geode.svg)](https://hub.docker.com/r/apachegeode/geode/) [![Total alerts](https://img.shields.io/lgtm/alerts/g/apache/geode.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/geode/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/apache/geode.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/geode/context:java) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/apache/geode.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/geode/context:javascript) [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/apache/geode.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/geode/context:python)
6-
76
</div>
87

98
## Contents

‎boms/geode-all-bom/src/test/resources/expected-pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<dependency>
196196
<groupId>io.micrometer</groupId>
197197
<artifactId>micrometer-core</artifactId>
198-
<version>1.14.0</version>
198+
<version>1.15.12</version>
199199
</dependency>
200200
<dependency>
201201
<groupId>io.swagger.core.v3</groupId>
@@ -415,7 +415,7 @@
415415
<dependency>
416416
<groupId>org.slf4j</groupId>
417417
<artifactId>slf4j-api</artifactId>
418-
<version>2.0.17</version>
418+
<version>2.0.18</version>
419419
</dependency>
420420
<dependency>
421421
<groupId>org.springframework.hateoas</groupId>
@@ -475,22 +475,22 @@
475475
<dependency>
476476
<groupId>com.fasterxml.jackson.core</groupId>
477477
<artifactId>jackson-core</artifactId>
478-
<version>2.21.2</version>
478+
<version>2.21.5</version>
479479
</dependency>
480480
<dependency>
481481
<groupId>com.fasterxml.jackson.core</groupId>
482482
<artifactId>jackson-databind</artifactId>
483-
<version>2.21.2</version>
483+
<version>2.21.5</version>
484484
</dependency>
485485
<dependency>
486486
<groupId>com.fasterxml.jackson.datatype</groupId>
487487
<artifactId>jackson-datatype-joda</artifactId>
488-
<version>2.21.2</version>
488+
<version>2.21.5</version>
489489
</dependency>
490490
<dependency>
491491
<groupId>com.fasterxml.jackson.datatype</groupId>
492492
<artifactId>jackson-datatype-jsr310</artifactId>
493-
<version>2.21.2</version>
493+
<version>2.21.5</version>
494494
</dependency>
495495
<dependency>
496496
<groupId>com.jayway.jsonpath</groupId>
@@ -530,27 +530,27 @@
530530
<dependency>
531531
<groupId>org.apache.logging.log4j</groupId>
532532
<artifactId>log4j-api</artifactId>
533-
<version>2.25.4</version>
533+
<version>2.25.5</version>
534534
</dependency>
535535
<dependency>
536536
<groupId>org.apache.logging.log4j</groupId>
537537
<artifactId>log4j-core</artifactId>
538-
<version>2.25.4</version>
538+
<version>2.25.5</version>
539539
</dependency>
540540
<dependency>
541541
<groupId>org.apache.logging.log4j</groupId>
542542
<artifactId>log4j-jcl</artifactId>
543-
<version>2.25.4</version>
543+
<version>2.25.5</version>
544544
</dependency>
545545
<dependency>
546546
<groupId>org.apache.logging.log4j</groupId>
547547
<artifactId>log4j-jul</artifactId>
548-
<version>2.25.4</version>
548+
<version>2.25.5</version>
549549
</dependency>
550550
<dependency>
551551
<groupId>org.apache.logging.log4j</groupId>
552552
<artifactId>log4j-slf4j-impl</artifactId>
553-
<version>2.25.4</version>
553+
<version>2.25.5</version>
554554
</dependency>
555555
<dependency>
556556
<groupId>org.apache.lucene</groupId>

‎build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ class DependencyConstraints {
4646
deps.put("jakarta.annotation.version", "2.1.1")
4747
deps.put("jakarta.ejb.version", "4.0.1")
4848
deps.put("jgroups.version", "3.6.20.Final")
49-
deps.put("log4j.version", "2.25.4")
49+
deps.put("log4j.version", "2.25.5")
5050
deps.put("log4j-slf4j2-impl.version", "2.23.1")
51-
deps.put("micrometer.version", "1.14.0")
52-
deps.put("shiro.version", "2.1.0")
51+
deps.put("micrometer.version", "1.15.12")
52+
deps.put("shiro.version", "3.0.0")
5353
// GEODE-10583: Pin Bouncy Castle (transitive via shiro-crypto-hash) to a fixed version
54-
deps.put("bouncycastle.version", "1.84")
55-
deps.put("slf4j-api.version", "2.0.17")
54+
deps.put("bouncycastle.version", "1.85")
55+
deps.put("slf4j-api.version", "2.0.18")
5656
deps.put("jakarta.transaction-api.version", "2.0.1")
5757
deps.put("jboss-modules.version", "1.11.0.Final")
58-
deps.put("jackson.version", "2.21.2")
58+
deps.put("jackson.version", "2.21.5")
5959
deps.put("jackson.annotations.version", "2.21")
60-
deps.put("jackson.databind.version", "2.21.2")
60+
deps.put("jackson.databind.version", "2.21.5")
6161
// Spring Framework 6.x Migration
6262
deps.put("springshell.version", "3.3.3")
6363
deps.put("springframework.version", "6.1.21")
@@ -85,7 +85,7 @@ class DependencyConstraints {
8585
// at o.a.g.sessions.tests.GenericAppServerInstall.java
8686
// Jetty 12.0.x for Jakarta EE 10 (Servlet 6.0) compatibility
8787
// Jetty 12 reorganized modules under ee10, ee9, ee8 packages
88-
deps.put("jetty.version", "12.0.33")
88+
deps.put("jetty.version", "12.0.37")
8989

9090
// These versions are referenced in test.gradle, which is aggressively injected into all projects.
9191
deps.put("junit.version", "4.13.2")
@@ -108,6 +108,8 @@ class DependencyConstraints {
108108

109109
project.dependencies {
110110
constraints {
111+
api('org.jline:jline-terminal-jni:3.26.3')
112+
api('org.jline:jline-terminal-ffm:3.26.3')
111113
// informal, inter-group dependencySet
112114
api(group: 'antlr', name: 'antlr', version: get('antlr.version'))
113115
api(group: 'cglib', name: 'cglib', version: get('cglib.version'))
@@ -175,8 +177,8 @@ class DependencyConstraints {
175177
api(group: 'org.apache.derby', name: 'derby', version: '10.14.2.0')
176178
// Apache HttpComponents 5.x - Modern HTTP client with HTTP/2 support
177179
api(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.4.4')
178-
api(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.3.6')
179-
api(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '5.3.6')
180+
api(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.4.3')
181+
api(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '5.4.3')
180182
// Legacy HttpComponents 4.x (keep temporarily during migration, remove after complete)
181183
api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13')
182184
api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.15')

‎geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repositories {
2525

2626
dependencies {
2727
implementation("${project.group}:geode-core:${project.version}")
28-
runtimeOnly('org.apache.logging.log4j:log4j-slf4j-impl:2.25.4')
28+
runtimeOnly('org.apache.logging.log4j:log4j-slf4j-impl:2.25.5')
2929
}
3030

3131
application {

0 commit comments

Comments
 (0)