Skip to content

Commit 70e2860

Browse files
authored
Merge pull request #24 from MoshPe/chore/java17-compat
chore: lower Java requirement from 25 to 17
2 parents 709e35c + 3fc5355 commit 70e2860

16 files changed

Lines changed: 39 additions & 30 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
- name: Checkout
1515
uses: actions/checkout@v4
1616

17-
- name: Set up Java 25
17+
- name: Set up Java 17
1818
uses: actions/setup-java@v4
1919
with:
20-
java-version: '25'
20+
java-version: '17'
2121
distribution: 'temurin'
2222

2323
- name: Build and test

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
- name: Checkout
2222
uses: actions/checkout@v4
2323

24-
- name: Set up Java 25
24+
- name: Set up Java 17
2525
uses: actions/setup-java@v4
2626
with:
27-
java-version: '25'
27+
java-version: '17'
2828
distribution: 'temurin'
2929

3030
- name: Initialize CodeQL

.github/workflows/dependency-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
- name: Checkout
2020
uses: actions/checkout@v4
2121

22-
- name: Set up Java 25
22+
- name: Set up Java 17
2323
uses: actions/setup-java@v4
2424
with:
25-
java-version: '25'
25+
java-version: '17'
2626
distribution: 'temurin'
2727

2828
- name: Run OWASP Dependency Check

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@v4
1919

20-
- name: Set up Java 25
20+
- name: Set up Java 17
2121
uses: actions/setup-java@v4
2222
with:
23-
java-version: '25'
23+
java-version: '17'
2424
distribution: 'temurin'
2525
server-id: central
2626
server-username: OSSRH_USERNAME
@@ -64,13 +64,13 @@ jobs:
6464
git config user.email "github-actions[bot]@users.noreply.github.com"
6565
git fetch origin main
6666
git checkout -b ${BRANCH} origin/main
67-
mvn versions:set -DnewVersion=${NEXT} -DgenerateBackupPoms=false -N
68-
git add pom.xml
67+
mvn versions:set -DnewVersion=${NEXT} -DgenerateBackupPoms=false
68+
git add pom.xml streamfence-core/pom.xml streamfence-demo/pom.xml
6969
git commit -m "chore: bump version to ${NEXT} [skip ci]"
7070
git push origin ${BRANCH}
7171
gh pr create \
7272
--title "chore: bump version to ${NEXT}" \
7373
--body "Automated version bump after release \`${GITHUB_REF_NAME}\`." \
7474
--base main \
7575
--head ${BRANCH} \
76-
--label "dependencies"
76+

.github/workflows/snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
- name: Checkout
1616
uses: actions/checkout@v4
1717

18-
- name: Set up Java 25
18+
- name: Set up Java 17
1919
uses: actions/setup-java@v4
2020
with:
21-
java-version: '25'
21+
java-version: '17'
2222
distribution: 'temurin'
2323
server-id: github
2424
server-username: GITHUB_ACTOR

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<a href="https://codecov.io/gh/MoshPe/StreamFence"><img src="https://codecov.io/gh/MoshPe/StreamFence/branch/main/graph/badge.svg" alt="codecov"></a>
1111
<a href="https://central.sonatype.com/artifact/io.github.moshpe/streamfence-core"><img src="https://img.shields.io/maven-central/v/io.github.moshpe/streamfence-core.svg" alt="Maven Central"></a>
1212
<a href="https://github.com/MoshPe/StreamFence/releases/latest"><img src="https://img.shields.io/github/v/release/MoshPe/StreamFence" alt="GitHub Release"></a>
13-
<a href="https://openjdk.org/projects/jdk/25/"><img src="https://img.shields.io/badge/Java-25-blue?logo=openjdk" alt="Java 25"></a>
13+
<a href="https://openjdk.org/projects/jdk/17/"><img src="https://img.shields.io/badge/Java-17-blue?logo=openjdk" alt="Java 17"></a>
1414
<a href="https://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg" alt="License"></a>
1515
</p>
1616

@@ -81,11 +81,11 @@ Add `streamfence-core` to your Maven project:
8181
<dependency>
8282
<groupId>io.github.moshpe</groupId>
8383
<artifactId>streamfence-core</artifactId>
84-
<version>1.0.1</version>
84+
<version>1.0.7</version>
8585
</dependency>
8686
```
8787

88-
Requires Java 25.
88+
Requires Java 17.
8989

9090
---
9191

pom.xml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.moshpe</groupId>
88
<artifactId>streamfence</artifactId>
9-
<version>1.0.8-SNAPSHOT</version>
9+
<version>1.0.8</version>
1010
<packaging>pom</packaging>
1111

1212
<name>streamfence-parent</name>
@@ -36,11 +36,12 @@
3636
</modules>
3737

3838
<properties>
39-
<maven.compiler.release>25</maven.compiler.release>
39+
<maven.compiler.release>17</maven.compiler.release>
4040
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4343
<netty-socketio.version>2.0.14</netty-socketio.version>
44+
<netty.version>4.1.132.Final</netty.version>
4445
<jackson.version>2.21.2</jackson.version>
4546
<bouncycastle.version>1.84</bouncycastle.version>
4647
<slf4j.version>2.0.9</slf4j.version>
@@ -67,6 +68,14 @@
6768

6869
<dependencyManagement>
6970
<dependencies>
71+
<!-- Pin Netty to satisfy CVE fixes; overrides the version pulled in by netty-socketio -->
72+
<dependency>
73+
<groupId>io.netty</groupId>
74+
<artifactId>netty-bom</artifactId>
75+
<version>${netty.version}</version>
76+
<type>pom</type>
77+
<scope>import</scope>
78+
</dependency>
7079
<dependency>
7180
<groupId>com.corundumstudio.socketio</groupId>
7281
<artifactId>netty-socketio</artifactId>

streamfence-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.github.moshpe</groupId>
99
<artifactId>streamfence</artifactId>
10-
<version>1.0.1</version>
10+
<version>1.0.8</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

streamfence-core/src/test/java/io/streamfence/internal/config/ServerConfigLoaderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void loadsValidYamlConfiguration() throws IOException {
8282
assertThat(config.origin()).isEqualTo("https://app.example.com");
8383
assertThat(config.namespaces()).containsKeys("/non-reliable", "/reliable", "/bulk");
8484
assertThat(config.topicPolicies()).hasSize(2);
85-
assertThat(config.topicPolicies().getFirst().deliveryMode()).isEqualTo(DeliveryMode.BEST_EFFORT);
85+
assertThat(config.topicPolicies().get(0).deliveryMode()).isEqualTo(DeliveryMode.BEST_EFFORT);
8686
} finally {
8787
deleteRecursively(tempDir);
8888
}

streamfence-core/src/test/java/io/streamfence/internal/delivery/AckTrackerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ void expiredMessageProducesRetryDecision() {
3737
var decisions = ackTracker.collectExpired(now.plusSeconds(3));
3838

3939
assertThat(decisions).hasSize(1);
40-
assertThat(decisions.getFirst().action()).isEqualTo(RetryAction.RETRY);
41-
assertThat(decisions.getFirst().pendingMessage().retryCount()).isEqualTo(1);
40+
assertThat(decisions.get(0).action()).isEqualTo(RetryAction.RETRY);
41+
assertThat(decisions.get(0).pendingMessage().retryCount()).isEqualTo(1);
4242
assertThat(ackTracker.pendingCount()).isEqualTo(1);
4343
}
4444

@@ -54,7 +54,7 @@ void exhaustedMessageIsReportedAndRemoved() {
5454
var decisions = ackTracker.collectExpired(now.plusSeconds(6));
5555

5656
assertThat(decisions).hasSize(1);
57-
assertThat(decisions.getFirst().action()).isEqualTo(RetryAction.EXHAUSTED);
57+
assertThat(decisions.get(0).action()).isEqualTo(RetryAction.EXHAUSTED);
5858
assertThat(ackTracker.pendingCount()).isZero();
5959
}
6060

0 commit comments

Comments
 (0)