Skip to content

Commit 15ca0dc

Browse files
chore: update libraries-bom in 3.x (#3425)
* chore: update libraries-bom in 3.x * rm method * update workflow * disable test * Update DefaultSubscriberFactoryTests.java --------- Co-authored-by: Diego Marquez <diegomarquezp@google.com>
1 parent a8ff495 commit 15ca0dc

File tree

4 files changed

+15
-28
lines changed

4 files changed

+15
-28
lines changed

.github/workflows/unitTests.yaml

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
unitTests:
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1717
strategy:
1818
fail-fast: false
1919
matrix:
@@ -22,19 +22,16 @@ jobs:
2222
- name: Get current date
2323
id: date
2424
run: echo "::set-output name=date::$(date +'%Y-%m-%d' --utc)"
25-
26-
- uses: actions/checkout@v2
27-
28-
- uses: actions/setup-java@v1
25+
- uses: actions/checkout@v4
26+
- uses: actions/setup-java@v4
2927
with:
3028
java-version: ${{ matrix.java }}
31-
32-
- uses: actions/cache@v2
29+
distribution: temurin
30+
- uses: actions/cache@v4
3331
id: mvn-cache
3432
with:
3533
path: ~/.m2/repository
3634
key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.date }}
37-
3835
- name: Mvn install # Need this when the directory/pom structure changes
3936
id: install1
4037
continue-on-error: true
@@ -46,7 +43,6 @@ jobs:
4643
--define maven.test.skip=true \
4744
--define maven.javadoc.skip=true \
4845
install
49-
5046
- name: Retry install on failure
5147
id: install2
5248
if: steps.install1.outcome == 'failure'
@@ -58,22 +54,19 @@ jobs:
5854
--define maven.test.skip=true \
5955
--define maven.javadoc.skip=true \
6056
install
61-
6257
- name: Unit Tests
6358
run: |
6459
./mvnw \
6560
--batch-mode \
6661
--fail-at-end \
6762
--threads 1.5C \
6863
test
69-
7064
- name: Aggregate Report
7165
run: |
7266
./mvnw \
7367
--batch-mode \
7468
--define aggregate=true \
7569
surefire-report:report-only
76-
7770
- name: Archive logs
7871
if: always()
7972
continue-on-error: true
@@ -84,28 +77,24 @@ jobs:
8477
**/target/surefire-reports/*
8578
**/target/site
8679
87-
8880
releaseCheck:
89-
runs-on: ubuntu-20.04
81+
runs-on: ubuntu-22.04
9082
strategy:
9183
fail-fast: false
9284
steps:
9385
- name: Get current date
9486
id: date
9587
run: echo "::set-output name=date::$(date +'%Y-%m-%d' --utc)"
96-
97-
- uses: actions/checkout@v2
98-
99-
- uses: actions/setup-java@v1
88+
- uses: actions/checkout@v4
89+
- uses: actions/setup-java@v4
10090
with:
10191
java-version: 11
102-
103-
- uses: actions/cache@v2
92+
distribution: temurin
93+
- uses: actions/cache@v4
10494
id: mvn-cache
10595
with:
10696
path: ~/.m2/repository
10797
key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.date }}
108-
10998
- name: releaseCheck
11099
run: |
111100
./mvnw \
@@ -116,7 +105,6 @@ jobs:
116105
-Dcheckstyle.skip \
117106
clean \
118107
package
119-
120108
- name: docsCheck
121109
run: |
122110
./mvnw \
@@ -128,7 +116,6 @@ jobs:
128116
--projects docs \
129117
clean \
130118
package
131-
132119
- name: Archive Artifacts
133120
if: always()
134121
continue-on-error: true

spring-cloud-gcp-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</distributionManagement>
3030

3131
<properties>
32-
<gcp-libraries-bom.version>26.51.0</gcp-libraries-bom.version>
32+
<gcp-libraries-bom.version>26.52.0</gcp-libraries-bom.version>
3333
<cloud-sql-socket-factory.version>1.20.1</cloud-sql-socket-factory.version>
3434
<r2dbc-mysql-driver.version>0.9.7</r2dbc-mysql-driver.version>
3535
<r2dbc-postgres-driver.version>0.8.13.RELEASE</r2dbc-postgres-driver.version>

spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public void setUp() throws IOException {
4747
factory.setCredentialsProvider(NoCredentialsProvider.create());
4848
TransportChannelProvider mockChannelProvider = mock(TransportChannelProvider.class);
4949
TransportChannel mockTransportChannel = mock(TransportChannel.class);
50-
when(mockChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockChannelProvider);
5150
when(mockChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel);
5251
ApiCallContext mockContext = mock(ApiCallContext.class);
5352
when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext);

spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.util.concurrent.ConcurrentHashMap;
4949
import org.apache.commons.lang3.reflect.FieldUtils;
5050
import org.junit.jupiter.api.BeforeEach;
51+
import org.junit.jupiter.api.Disabled;
5152
import org.junit.jupiter.api.Test;
5253
import org.junit.jupiter.api.extension.ExtendWith;
5354
import org.mockito.Mock;
@@ -381,9 +382,9 @@ void testCreateSubscriber_validateSetProperties() {
381382
assertThat(expectedSubscriber.getFlowControlSettings().getLimitExceededBehavior())
382383
.isEqualTo(FlowController.LimitExceededBehavior.Ignore);
383384
assertThat(expectedSubscriber)
384-
.hasFieldOrPropertyWithValue("maxAckExtensionPeriod", Duration.ofSeconds(2L))
385-
.hasFieldOrPropertyWithValue("minDurationPerAckExtension", Duration.ofSeconds(3L))
386-
.hasFieldOrPropertyWithValue("maxDurationPerAckExtension", Duration.ofSeconds(4L))
385+
.hasFieldOrPropertyWithValue("maxAckExtensionPeriod", java.time.Duration.ofSeconds(2L))
386+
.hasFieldOrPropertyWithValue("minDurationPerAckExtension", java.time.Duration.ofSeconds(3L))
387+
.hasFieldOrPropertyWithValue("maxDurationPerAckExtension", java.time.Duration.ofSeconds(4L))
387388
.hasFieldOrPropertyWithValue("numPullers", 2)
388389
.hasFieldOrPropertyWithValue("subStubSettings.endpoint", "test.endpoint");
389390
}

0 commit comments

Comments
 (0)