This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-connectors-kafka.git
The following commit(s) were added to refs/heads/main by this push:
new 10282b58 build with java 17 (#364)
10282b58 is described below
commit 10282b58c6fe80fc8ffa95163c4c66e778f453ca
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Sep 22 14:50:43 2025 +0100
build with java 17 (#364)
* build with java 17
* Update project-info.conf
* Update plugins.sbt
* build issue
* java instanceof
* Update check-build-test.yml
* Update TestkitSamplesTest.java
* Update link-validator.conf
---
.github/workflows/check-build-test.yml | 29 +++++++++----------
.github/workflows/headers.yml | 4 +--
.github/workflows/link-validator.yml | 4 +--
.github/workflows/nightly-pekko.yml | 6 ++--
.github/workflows/publish-nightly.yml | 4 +--
.../src/test/java/docs/javadsl/ProducerTest.java | 8 ++----
.../test/java/docs/javadsl/TestkitSamplesTest.java | 9 ++----
.../java/docs/javadsl/proto/OrderMessages.java | 33 +++++++++++-----------
project/plugins.sbt | 5 ++--
project/project-info.conf | 2 +-
scripts/link-validator.conf | 1 +
11 files changed, 49 insertions(+), 56 deletions(-)
diff --git a/.github/workflows/check-build-test.yml
b/.github/workflows/check-build-test.yml
index 9837a4ae..c873e2c9 100644
--- a/.github/workflows/check-build-test.yml
+++ b/.github/workflows/check-build-test.yml
@@ -6,6 +6,7 @@ on:
branches:
- main
- 1.0.x
+ - 1.1.x
tags-ignore: [ v.* ]
permissions: {}
@@ -37,11 +38,11 @@ jobs:
git checkout scratch
- - name: Setup Java 11
+ - name: Setup Java 17
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Install sbt
uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
@@ -69,16 +70,16 @@ jobs:
git fetch origin pull/${{ github.event.pull_request.number
}}/merge:scratch
git checkout scratch
- - name: Setup Java 11
+ - name: Setup Java 17
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Cache Coursier cache
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c #
v6.4.7
- - name: Compile all code with fatal warnings for Java 11 and Scala
2.12/2.13/3
+ - name: Compile all code with fatal warnings for Java 17 and Scala 2.13/3
# Run locally with: env CI=true sbt 'clean ; Test/compile'
run: sbt "; +Test/compile"
@@ -98,11 +99,11 @@ jobs:
git fetch origin pull/${{ github.event.pull_request.number
}}/merge:scratch
git checkout scratch
- - name: Setup Java 11
+ - name: Setup Java 17
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Install sbt
uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
@@ -121,10 +122,8 @@ jobs:
fail-fast: false
matrix:
include:
- - { java-version: 8, scala-version: 2.13, sbt-opts: '' }
- - { java-version: 11, scala-version: 2.13, sbt-opts:
'-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
- - { java-version: 8, scala-version: 3.3, sbt-opts: '' }
- - { java-version: 11, scala-version: 3.3, sbt-opts:
'-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 17, scala-version: 2.13, sbt-opts: '' }
+ - { java-version: 17, scala-version: 3.3, sbt-opts: '' }
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
@@ -174,11 +173,11 @@ jobs:
git fetch origin pull/${{ github.event.pull_request.number
}}/merge:scratch
git checkout scratch
- - name: Setup Java 8
+ - name: Setup Java 17
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
with:
distribution: temurin
- java-version: 8
+ java-version: 17
- name: Install sbt
uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
@@ -209,11 +208,11 @@ jobs:
git fetch origin pull/${{ github.event.pull_request.number
}}/merge:scratch
git checkout scratch
- - name: Setup Java 8
+ - name: Setup Java 17
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
with:
distribution: temurin
- java-version: 8
+ java-version: 17
- name: Install sbt
uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
diff --git a/.github/workflows/headers.yml b/.github/workflows/headers.yml
index 830d0f80..1bc0bad2 100644
--- a/.github/workflows/headers.yml
+++ b/.github/workflows/headers.yml
@@ -13,11 +13,11 @@ jobs:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - name: Setup Java 11
+ - name: Setup Java 17
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Install sbt
uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
diff --git a/.github/workflows/link-validator.yml
b/.github/workflows/link-validator.yml
index 96479f71..186f2013 100644
--- a/.github/workflows/link-validator.yml
+++ b/.github/workflows/link-validator.yml
@@ -18,11 +18,11 @@ jobs:
fetch-depth: 0
fetch-tags: true
- - name: Setup Java 8
+ - name: Setup Java 17
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
with:
distribution: temurin
- java-version: 8
+ java-version: 17
- name: Install sbt
uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
diff --git a/.github/workflows/nightly-pekko.yml
b/.github/workflows/nightly-pekko.yml
index e57d94c2..673af9f7 100644
--- a/.github/workflows/nightly-pekko.yml
+++ b/.github/workflows/nightly-pekko.yml
@@ -24,13 +24,14 @@ jobs:
matrix:
SCALA_VERSION: [2.12, 2.13, 3]
JDK: [8]
- PEKKO_VERSION: ['main', '1.0.x']
+ PEKKO_VERSION: ['1.2.x', '1.1.x']
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
with:
fetch-depth: 0
fetch-tags: true
+ ref: 1.1.x
- name: Set up JDK ${{ matrix.JDK }}
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
@@ -65,13 +66,14 @@ jobs:
strategy:
fail-fast: false
matrix:
- PEKKO_VERSION: ['main', '1.0.x']
+ PEKKO_VERSION: ['1.2.x', '1.1.x']
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
with:
fetch-depth: 0
fetch-tags: true
+ ref: 1.1.x
- name: Setup Java 8
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
diff --git a/.github/workflows/publish-nightly.yml
b/.github/workflows/publish-nightly.yml
index de7704d5..b525018d 100644
--- a/.github/workflows/publish-nightly.yml
+++ b/.github/workflows/publish-nightly.yml
@@ -37,11 +37,11 @@ jobs:
fetch-depth: 0
fetch-tags: true
- - name: Setup Java 8
+ - name: Setup Java 17
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #
v4.7.1
with:
distribution: temurin
- java-version: 8
+ java-version: 17
- name: Install sbt
uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
diff --git a/java-tests/src/test/java/docs/javadsl/ProducerTest.java
b/java-tests/src/test/java/docs/javadsl/ProducerTest.java
index 6afacab4..930f7b54 100644
--- a/java-tests/src/test/java/docs/javadsl/ProducerTest.java
+++ b/java-tests/src/test/java/docs/javadsl/ProducerTest.java
@@ -199,9 +199,7 @@ class ProducerTest extends TestcontainersKafkaTest {
.via(Producer.flexiFlow(producerSettings))
.map(
result -> {
- if (result instanceof ProducerMessage.Result) {
- ProducerMessage.Result<String, String, Integer> res =
- (ProducerMessage.Result<String, String, Integer>)
result;
+ if (result instanceof ProducerMessage.Result<String, String,
Integer> res) {
ProducerRecord<String, String> record =
res.message().record();
RecordMetadata meta = res.metadata();
return meta.topic()
@@ -211,9 +209,7 @@ class ProducerTest extends TestcontainersKafkaTest {
+ res.offset()
+ ": "
+ record.value();
- } else if (result instanceof ProducerMessage.MultiResult) {
- ProducerMessage.MultiResult<String, String, Integer> res =
- (ProducerMessage.MultiResult<String, String, Integer>)
result;
+ } else if (result instanceof
ProducerMessage.MultiResult<String, String, Integer> res) {
return res.getParts().stream()
.map(
part -> {
diff --git a/java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java
b/java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java
index dd7a9e0b..56f7d226 100644
--- a/java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java
+++ b/java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java
@@ -99,13 +99,8 @@ public class TestkitSamplesTest {
create()
.map(
msg -> {
- if (msg instanceof ProducerMessage.Message) {
- ProducerMessage.Message<String, String,
ConsumerMessage.CommittableOffset>
- msg2 =
- (ProducerMessage.Message<
- String, String,
ConsumerMessage.CommittableOffset>)
- msg;
- return ProducerResultFactory.result(msg2);
+ if (msg instanceof ProducerMessage.Message<String,
String, ConsumerMessage.CommittableOffset> pmsg) {
+ return ProducerResultFactory.result(pmsg);
} else throw new RuntimeException("unexpected element: "
+ msg);
});
diff --git a/java-tests/src/test/java/docs/javadsl/proto/OrderMessages.java
b/java-tests/src/test/java/docs/javadsl/proto/OrderMessages.java
index e30da642..39e5c520 100644
--- a/java-tests/src/test/java/docs/javadsl/proto/OrderMessages.java
+++ b/java-tests/src/test/java/docs/javadsl/proto/OrderMessages.java
@@ -92,8 +92,8 @@ public final class OrderMessages {
@java.lang.Override
public java.lang.String getId() {
java.lang.Object ref = id_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ if (ref instanceof java.lang.String s) {
+ return s;
} else {
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString)
ref;
java.lang.String s = bs.toStringUtf8();
@@ -109,9 +109,9 @@ public final class OrderMessages {
@java.lang.Override
public com.google.protobuf.ByteString getIdBytes() {
java.lang.Object ref = id_;
- if (ref instanceof java.lang.String) {
+ if (ref instanceof java.lang.String s) {
com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String)
ref);
+ com.google.protobuf.ByteString.copyFromUtf8(s);
id_ = b;
return b;
} else {
@@ -158,14 +158,13 @@ public final class OrderMessages {
if (obj == this) {
return true;
}
- if (!(obj instanceof docs.javadsl.proto.OrderMessages.Order)) {
+ if (obj instanceof docs.javadsl.proto.OrderMessages.Order other) {
+ if (!getId().equals(other.getId())) return false;
+ if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+ return true;
+ } else {
return super.equals(obj);
}
- docs.javadsl.proto.OrderMessages.Order other =
(docs.javadsl.proto.OrderMessages.Order) obj;
-
- if (!getId().equals(other.getId())) return false;
- if (!getUnknownFields().equals(other.getUnknownFields())) return false;
- return true;
}
@java.lang.Override
@@ -386,8 +385,8 @@ public final class OrderMessages {
@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof docs.javadsl.proto.OrderMessages.Order) {
- return mergeFrom((docs.javadsl.proto.OrderMessages.Order) other);
+ if (other instanceof docs.javadsl.proto.OrderMessages.Order order) {
+ return mergeFrom(order);
} else {
super.mergeFrom(other);
return this;
@@ -460,13 +459,13 @@ public final class OrderMessages {
*/
public java.lang.String getId() {
java.lang.Object ref = id_;
- if (!(ref instanceof java.lang.String)) {
+ if (ref instanceof java.lang.String s) {
+ return s;
+ } else {
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString)
ref;
java.lang.String s = bs.toStringUtf8();
id_ = s;
return s;
- } else {
- return (java.lang.String) ref;
}
}
/**
@@ -476,9 +475,9 @@ public final class OrderMessages {
*/
public com.google.protobuf.ByteString getIdBytes() {
java.lang.Object ref = id_;
- if (ref instanceof String) {
+ if (ref instanceof String s) {
com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String)
ref);
+ com.google.protobuf.ByteString.copyFromUtf8(s);
id_ = b;
return b;
} else {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 85fbafe9..e7a0ac41 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -22,7 +22,8 @@ addSbtPlugin("com.github.sbt" % "sbt-java-formatter" %
"0.9.0")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.0")
// Java 11 module names are not added
https://github.com/ThoughtWorksInc/sbt-api-mappings/issues/58
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" %
"3.0.2")
-addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.7.0").excludeAll(
- "com.lightbend.paradox", "sbt-paradox"))
addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.1")
+addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-theme" % "0.10.7")
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
diff --git a/project/project-info.conf b/project/project-info.conf
index 0a3298b2..a8189beb 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -1,7 +1,7 @@
project-info {
version: "current"
shared-info {
- jdk-versions: ["OpenJDK 8", "OpenJDK 11"]
+ jdk-versions: ["OpenJDK 17", "OpenJDK 21"]
snapshots: {
url: "snapshots.html"
text: "Snapshots are available"
diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf
index b4b62ecf..255c5581 100644
--- a/scripts/link-validator.conf
+++ b/scripts/link-validator.conf
@@ -32,6 +32,7 @@ site-link-validator {
# runtime is part of the published Scaladoc
"https://www.scala-lang.org/api/2.13.16/scala/runtime/AbstractFunction2.html";
# Javadoc link that points to wrong file name (should have $ at end of
file name)
+
"https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration$.html";
"https://pekko.apache.org/api/pekko/current/org/apache/pekko/stream/testkit/javadsl/StreamTestKit.html";
# GitHub will block with "429 Too Many Requests"
"https://github.com/";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
