Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Quarkus 2.8 #3233

Merged
merged 4 commits into from
May 6, 2022
Merged

Upgrade to Quarkus 2.8 #3233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dde3794
Wait for shutdown of consumer after each test case
sophokles73 May 5, 2022
5f42277
Enforce sequential rebalancing in unit test
sophokles73 May 5, 2022
3868868
Support setting dash-tool options on command line
sophokles73 May 4, 2022
1b64d93
[#3219] Upgrade to Quarkus 2.8.2
sophokles73 Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@

<properties>
<artemis.image.name>quay.io/enmasse/artemis-base:2.13.0</artemis.image.name>
<assertj.version>3.22.0</assertj.version>
<caffeine.version>2.9.3</caffeine.version>
<californium.version>3.4.0</californium.version>
<cryptvault.version>1.0.2</cryptvault.version>
<dispatch-router.image.name>quay.io/interconnectedcloud/qdrouterd:1.17.1</dispatch-router.image.name>
<guava.version>30.1-jre</guava.version>
<infinispan-image.name>quay.io/infinispan/server-native:13.0</infinispan-image.name>
<jaeger.image.name>jaegertracing/all-in-one:1.31</jaeger.image.name>
<jaeger.image.name>jaegertracing/all-in-one:1.33</jaeger.image.name>
<jakarta.jaxrs-api.version>2.1.6</jakarta.jaxrs-api.version>
<!--
We want to allow users to run containers in a rootless Docker environment.
Expand All @@ -51,29 +52,29 @@
See https://github.com/quarkusio/quarkus/issues/22000
-->
<kafka-client.version>2.8.1</kafka-client.version>
<kafka.image.name>confluentinc/cp-kafka:6.2.2</kafka.image.name>
<kafka.image.name>confluentinc/cp-kafka:6.2.4</kafka.image.name>
<logback.version>1.2.9</logback.version>
<mongodb-image.name>mongo:4.4</mongodb-image.name>
<native.image.name>quay.io/quarkus/quarkus-micro-image:1.0</native.image.name>
<!--
The value of this property should always be the Java 17 based variant of the image name defined
in the Quarkus platform definition's POM file of the Quarkus version being used, e.g.
https://github.com/quarkusio/quarkus-platform/blob/2.7.3.Final/generated-platform-project/quarkus/properties/pom.xml
https://github.com/quarkusio/quarkus-platform/blob/2.8.2.Final/generated-platform-project/quarkus/properties/pom.xml
-->
<native.builder-image.name>quay.io/quarkus/ubi-quarkus-native-image:21.3-java17</native.builder-image.name>
<native.builder-image.name>quay.io/quarkus/ubi-quarkus-mandrel:22.0-java17</native.builder-image.name>
<netty.version>4.1.74.Final</netty.version>
<opentelemetry-collector.image.name>otel/opentelemetry-collector:0.48.0</opentelemetry-collector.image.name>
<opentelemetry-collector.image.name>otel/opentelemetry-collector:0.49.0</opentelemetry-collector.image.name>
<postgresql-image.name>postgres:12-alpine</postgresql-image.name>
<protoparser.version>4.0.3</protoparser.version>
<protostream.version>4.4.1.Final</protostream.version>
<proton.version>0.33.10</proton.version>
<qpid-jms.version>1.4.1</qpid-jms.version>
<quarkus.platform.version>2.7.3.Final</quarkus.platform.version>
<slf4j.version>1.7.33</slf4j.version>
<quarkus.platform.version>2.8.2.Final</quarkus.platform.version>
<slf4j.version>1.7.36</slf4j.version>
<spring-security-crypto.version>5.5.5</spring-security-crypto.version>
<truth.version>1.1.3</truth.version>
<vertx.version>4.2.5</vertx.version>
<zookeeper.image.name>confluentinc/cp-zookeeper:6.2.2</zookeeper.image.name>
<vertx.version>4.2.7</vertx.version>
<zookeeper.image.name>confluentinc/cp-zookeeper:6.2.4</zookeeper.image.name>

<!-- The port at which the health check server should expose its resources -->
<health.check.port>8088</health.check.port>
Expand Down Expand Up @@ -611,6 +612,11 @@ quarkus.vertx.resolver.cache-max-time-to-live=0
<version>${vertx.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
Expand Down
16 changes: 14 additions & 2 deletions ...java/org/eclipse/hono/client/kafka/consumer/AsyncHandlingAutoCommitKafkaConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,16 @@ public void setUp(final Vertx vertx, final TestInfo testInfo) {

/**
* Stops the created consumer.
*
* @param ctx The vert.x test context.
*/
@AfterEach
public void stopConsumer() {
public void stopConsumer(final VertxTestContext ctx) {
if (consumer != null) {
consumer.stop();
consumer.stop()
.onComplete(ar -> ctx.completeNow());
} else {
ctx.completeNow();
}
}

Expand Down Expand Up @@ -785,14 +790,21 @@ public void testScenarioWithPartitionRevokedWhileHandlingIncomplete(final VertxT
// do a rebalance with the currently assigned partition not being assigned anymore after it
mockConsumer.updateBeginningOffsets(Map.of(TOPIC2_PARTITION, 0L));
mockConsumer.updateEndOffsets(Map.of(TOPIC2_PARTITION, 0L));
final CountDownLatch rebalanceWithTopic2Done = new CountDownLatch(1);
consumer.setOnPartitionsAssignedHandler(partitions -> {
rebalanceWithTopic2Done.countDown();
});
mockConsumer.rebalance(List.of(TOPIC2_PARTITION));
rebalanceWithTopic2Done.await();

// mark the handling of some records as completed
recordsHandlingPromiseMap.get(0L).complete();
recordsHandlingPromiseMap.get(1L).complete();
recordsHandlingPromiseMap.get(2L).complete();

final Checkpoint commitCheckDone = ctx.checkpoint(1);
consumer.setOnPartitionsAssignedHandler(partitions -> {
LOG.info("rebalancing ...");
final Map<TopicPartition, OffsetAndMetadata> committed = mockConsumer.committed(Set.of(TOPIC_PARTITION));
ctx.verify(() -> {
// the last rebalance where topicPartition got revoked should have just
Expand Down
5 changes: 3 additions & 2 deletions create_dependencies_list.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
#*******************************************************************************

DASH_LICENSE_JAR=$1
shift

if [ ! -f "$DASH_LICENSE_JAR" ]; then
echo "This script can be used to update the DEPENDENCIES"
echo "file with the result of checking the Hono maven"
echo "dependencies using the Dash License Tool."
echo ""
echo "Usage: $0 <org.eclipse.dash.licenses jar path>"
echo "Usage: $0 <org.eclipse.dash.licenses jar path> [<other dash-tool parameters>..]"
exit 1
fi

Expand All @@ -28,5 +29,5 @@ DEPENDENCIES="legal/src/main/resources/legal/DEPENDENCIES"

mvn dependency:list -DexcludeGroupIds=org.eclipse,org.junit -Pmetrics-prometheus,build-docker-image,build-native-image | grep -Poh "\S+:(runtime|compile|provided)" | sed -e 's/^\(.*\)\:.*$/\1/' | sort | uniq > $HONO_MAVEN_DEPS

java -Dorg.eclipse.dash.timeout=60 -jar $DASH_LICENSE_JAR -batch 90 -summary $DEPENDENCIES $HONO_MAVEN_DEPS
java -Dorg.eclipse.dash.timeout=60 -jar $DASH_LICENSE_JAR -batch 90 -summary $DEPENDENCIES $HONO_MAVEN_DEPS $@
sort -o $DEPENDENCIES $DEPENDENCIES
Loading