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

[incubator-kie-issues#1575] Upgrade quarkus to 3.15 #3750

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+197 −93
Open

[incubator-kie-issues#1575] Upgrade quarkus to 3.15 #3750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9cd245d
Upgrade quarkus to 3.15
RishiRajAnand Oct 22, 2024
4a691ac
Fix errors due to flyway 10 upgrade
RishiRajAnand Nov 21, 2024
e926d58
Fix infinispan protostream errors due to upgrade
RishiRajAnand Nov 21, 2024
55756af
Align kubernetes-client version to quarkus supported version 6.13.3
RishiRajAnand Nov 22, 2024
bc42316
Upgrade quarkus to 3.15.2
RishiRajAnand Nov 25, 2024
bf40d01
Updating jandex and quarkus camel
RishiRajAnand Nov 28, 2024
2dbc72b
Upgrading h2 version to 2.3.232 and aligning other library versions
RishiRajAnand Dec 2, 2024
56c1aea
replacing quarkus-smallrye-reactive-messaging-kafka with new name
RishiRajAnand Dec 3, 2024
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
5 changes: 4 additions & 1 deletion addons/common/flyway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>

<dependency>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm, here we are adding a flyway dependency intended for a particular db in a common addon. I do not think thats the way to go. Im afraid this has to be moved somewhere else

<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/common/persistence/infinispan/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependencies>
<!--~~(No version provided)~~>--><dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod-jakarta</artifactId>
<artifactId>infinispan-client-hotrod</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ private FieldDescriptorProto buildFieldDescriptor(FieldDescriptor descriptor) {
}
}
fieldBuilder.setLabel(descriptor.getLabel() == Label.ONE_OF ? FieldDescriptorProto.Label.LABEL_OPTIONAL : FieldDescriptorProto.Label.valueOf("LABEL_" + descriptor.getLabel().name()));
fieldBuilder.setProto3Optional(!descriptor.isRequired());
fieldBuilder.setProto3Optional(descriptor.getLabel() != Label.REQUIRED);
return fieldBuilder.build();
}

Expand Down
2 changes: 1 addition & 1 deletion kogito-build/kogito-build-no-bom-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<version.install.plugin>2.5.2</version.install.plugin>
<version.invoker.plugin>3.2.2</version.invoker.plugin>
<version.jacoco.plugin>0.8.11</version.jacoco.plugin>
<version.jandex.plugin>3.1.6</version.jandex.plugin>
<version.jandex.plugin>3.2.2</version.jandex.plugin>
<version.jar.plugin>3.2.0</version.jar.plugin>
<version.javancss.plugin>2.0</version.javancss.plugin>
<version.jdocbook.plugin>2.3.9</version.jdocbook.plugin>
Expand Down
54 changes: 31 additions & 23 deletions kogito-build/kogito-dependencies-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@

<properties>
<!-- this version property is used in plugins but also in dependencies too -->
<version.io.quarkus>3.8.6</version.io.quarkus>
<version.io.quarkus>3.15.2</version.io.quarkus>
<version.io.quarkus.quarkus-test>${version.io.quarkus}</version.io.quarkus.quarkus-test>
<version.org.springframework.boot>3.2.6</version.org.springframework.boot>
<version.org.apache.kafka>3.7.0</version.org.apache.kafka>
<version.org.apache.kafka>3.7.1</version.org.apache.kafka>

<version.org.bouncycastle.bc.jdk18on>1.78.1</version.org.bouncycastle.bc.jdk18on>

Expand All @@ -50,20 +50,20 @@
<version.net.minidev.jsonsmart>2.4.10</version.net.minidev.jsonsmart>
<version.net.thisptr.jackson-jq>1.0.0-preview.20240207</version.net.thisptr.jackson-jq>
<version.io.quarkiverse.jackson-jq>2.0.2</version.io.quarkiverse.jackson-jq>
<version.io.quarkiverse.openapi.generator>2.4.1</version.io.quarkiverse.openapi.generator>
<version.io.quarkiverse.openapi.generator>2.5.0</version.io.quarkiverse.openapi.generator>
<version.io.quarkiverse.asyncapi>0.3.0</version.io.quarkiverse.asyncapi>
<version.io.quarkiverse.reactivemessaging.http>2.4.1</version.io.quarkiverse.reactivemessaging.http>
<version.io.quarkiverse.embedded.postgresql>0.2.3</version.io.quarkiverse.embedded.postgresql>
<version.com.github.haifengl.smile>1.5.2</version.com.github.haifengl.smile>
<version.com.github.javaparser>3.25.8</version.com.github.javaparser>
<version.com.github.javaparser>3.26.1</version.com.github.javaparser>
<version.com.fasterxml.jackson.datatype>2.17.2</version.com.fasterxml.jackson.datatype>
<version.com.github.victools>4.31.0</version.com.github.victools>
<version.com.github.tomakehurst.wiremock>2.35.1</version.com.github.tomakehurst.wiremock>
<version.com.google.protobuf>3.25.5</version.com.google.protobuf>
<!-- We don't use gson directly. This is just to align versions of transitive dependencies -->
<version.com.google.gson>2.10.1</version.com.google.gson>
<!-- currently required for integration test only -->
<version.com.sun.xml.bind.core>4.0.4</version.com.sun.xml.bind.core>
<version.com.sun.xml.bind.core>4.0.5</version.com.sun.xml.bind.core>
<version.com.sun.activation>2.0.1</version.com.sun.activation>
<version.javax.inject>2.0.1</version.javax.inject>
<version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi>
Expand All @@ -78,22 +78,22 @@
Don't add as a management dependency because it will break SpringBoot and Quarkus
Kubernetes addons since they use a different version.
-->
<version.io.fabric8.kubernetes-client>6.10.0</version.io.fabric8.kubernetes-client>
<version.io.fabric8.kubernetes-client>6.13.3</version.io.fabric8.kubernetes-client>
<version.io.micrometer>1.12.2</version.io.micrometer>
<version.org.flywaydb>9.22.3</version.org.flywaydb>
<version.org.postgresql>42.7.2</version.org.postgresql>
<version.com.h2>2.2.220</version.com.h2>
<version.org.flywaydb>10.17.3</version.org.flywaydb>
<version.org.postgresql>42.7.4</version.org.postgresql>
<version.com.h2>2.3.232</version.com.h2> <!-- Overriding version 2.3.230 to fix https://github.com/h2database/h2database/issues/4079 -->
<version.io.serverlessworkflow>4.0.5.Final</version.io.serverlessworkflow>
<!-- Aligned with Quarkus 2.7 (LTS) - see https://issues.redhat.com/browse/KOGITO-7971 -->
<version.io.smallrye-open-api>3.10.0</version.io.smallrye-open-api>
<version.org.awaitility>4.2.0</version.org.awaitility>

<version.io.smallrye.reactive.mutiny-vertx-web-client>3.11.0</version.io.smallrye.reactive.mutiny-vertx-web-client>

<version.io.vertx>4.5.7</version.io.vertx>
<version.io.vertx>4.5.10</version.io.vertx>
<version.io.grpc>1.59.1</version.io.grpc>

<version.io.quarkus.camel>3.9.0</version.io.quarkus.camel> <!-- TODO: quarkus version mismatch -->
<version.io.quarkus.camel>3.15.1</version.io.quarkus.camel> <!-- TODO: quarkus version mismatch -->

<version.io.swagger.parser.v3>2.1.19</version.io.swagger.parser.v3>
<version.io.swagger.core.v3>2.2.19</version.io.swagger.core.v3>
Expand All @@ -102,25 +102,25 @@

<version.org.graalvm.nativeimage>23.1.2</version.org.graalvm.nativeimage>

<version.org.infinispan>14.0.27.Final</version.org.infinispan>
<version.org.infinispan.protostream>4.6.5.Final</version.org.infinispan.protostream>
<version.org.infinispan>15.0.8.Final</version.org.infinispan>
<version.org.infinispan.protostream>5.0.8.Final</version.org.infinispan.protostream>

<version.org.rocksdb>7.10.2</version.org.rocksdb>
<!-- consider migrating to 3.x JDK 9: https://jakarta.ee/specifications/restful-ws/ -->
<version.jakarta.ws.rs>3.1.0</version.jakarta.ws.rs>
<version.jakarta.persistence-api>3.1.0</version.jakarta.persistence-api>

<version.org.jboss.resteasy>6.2.7.Final</version.org.jboss.resteasy>
<version.org.keycloak>24.0.4</version.org.keycloak>
<version.org.keycloak>25.0.6</version.org.keycloak>
<!-- It seems that the confluent kafka cannot replace wurstmeister/kafka so easily. See FAI-729 -->
<version.wurstmeister.kafka>2.12-2.2.1</version.wurstmeister.kafka>
<version.org.mongo>4.11.1</version.org.mongo>
<version.org.mongo>5.1.4</version.org.mongo>
<version.org.mongo-image>4.4.14</version.org.mongo-image>
<version.org.mozilla.rhino>1.7.13</version.org.mozilla.rhino>
<version.org.redis>2.0.4</version.org.redis>
<version.org.postgres>13.4-alpine3.14</version.org.postgres>
<!-- we align to version used by quarkus -->
<version.org.apache.avro>1.11.4</version.org.apache.avro>
<version.org.apache.avro>1.12.0</version.org.apache.avro>
<version.org.assertj>3.24.2</version.org.assertj>
<version.org.glassfish.jaxb>4.0.4</version.org.glassfish.jaxb>
<version.org.json-unit-assertj>2.9.0</version.org.json-unit-assertj>
Expand All @@ -130,11 +130,11 @@
<version.org.junit.vintage>5.10.2</version.org.junit.vintage>
<version.org.junit.platform>1.10.2</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
<version.org.mockito>5.8.0</version.org.mockito>
<version.org.testcontainers>1.19.6</version.org.testcontainers>
<version.org.testcontainers>1.20.1</version.org.testcontainers>
<version.org.xmlunit-core>2.10.0</version.org.xmlunit-core>
<version.io.rest-assured>5.4.0</version.io.rest-assured>
<version.io.rest-assured>5.5.0</version.io.rest-assured>

<version.net.byte-buddy>1.14.11</version.net.byte-buddy>
<version.net.byte-buddy>1.14.18</version.net.byte-buddy>

<version.org.mvel>2.5.0.Final</version.org.mvel>
<version.org.reactivestreams>1.0.4</version.org.reactivestreams>
Expand All @@ -143,7 +143,7 @@

<version.maven>3.9.6</version.maven>
<version.maven.project>2.2.1</version.maven.project>
<version.maven.plugin>3.7.1</version.maven.plugin>
<version.maven.plugin>3.13.0</version.maven.plugin>
<version.maven.invoker>3.2.0</version.maven.invoker>
<version.maven.plugin.testing.harness>4.0.0-alpha-2</version.maven.plugin.testing.harness>
<version.plexus>2.1.0</version.plexus>
Expand Down Expand Up @@ -731,7 +731,11 @@
<artifactId>flyway-core</artifactId>
<version>${version.org.flywaydb}</version>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
<version>${version.org.flywaydb}</version>
</dependency>
<!-- infinispan -->
<dependency>
<groupId>org.infinispan</groupId>
Expand All @@ -740,7 +744,7 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod-jakarta</artifactId>
<artifactId>infinispan-client-hotrod</artifactId>
<version>${version.org.infinispan}</version>
</dependency>
<dependency>
Expand All @@ -758,7 +762,11 @@
<artifactId>protostream</artifactId>
<version>${version.org.infinispan.protostream}</version>
</dependency>

<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream-processor</artifactId>
<version>${version.org.infinispan.protostream}</version>
</dependency>
<!--rockdb-->
<dependency>
<groupId>org.rocksdb</groupId>
Expand Down
4 changes: 4 additions & 0 deletions kogito-codegen-modules/kogito-codegen-processes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream</artifactId>
</dependency>
<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream-processor</artifactId>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-symbol-solver-core</artifactId>
Expand Down
43 changes: 10 additions & 33 deletions ...va/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,8 @@

import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.UUID;
import java.util.function.Predicate;
import java.util.stream.Collectors;

Expand All @@ -36,11 +30,7 @@
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.SerializationContext;
import org.infinispan.protostream.config.Configuration;
import org.infinispan.protostream.descriptors.Descriptor;
import org.infinispan.protostream.descriptors.EnumDescriptor;
import org.infinispan.protostream.descriptors.FieldDescriptor;
import org.infinispan.protostream.descriptors.FileDescriptor;
import org.infinispan.protostream.descriptors.Option;
import org.infinispan.protostream.descriptors.*;
import org.infinispan.protostream.impl.SerializationContextImpl;
import org.kie.kogito.codegen.api.context.KogitoBuildContext;
import org.kie.kogito.codegen.api.context.impl.JavaKogitoBuildContext;
Expand All @@ -54,25 +44,8 @@
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.body.VariableDeclarator;
import com.github.javaparser.ast.expr.BinaryExpr;
import com.github.javaparser.ast.expr.CastExpr;
import com.github.javaparser.ast.expr.ClassExpr;
import com.github.javaparser.ast.expr.EnclosedExpr;
import com.github.javaparser.ast.expr.Expression;
import com.github.javaparser.ast.expr.IntegerLiteralExpr;
import com.github.javaparser.ast.expr.MethodCallExpr;
import com.github.javaparser.ast.expr.NameExpr;
import com.github.javaparser.ast.expr.NullLiteralExpr;
import com.github.javaparser.ast.expr.ObjectCreationExpr;
import com.github.javaparser.ast.expr.SimpleName;
import com.github.javaparser.ast.expr.StringLiteralExpr;
import com.github.javaparser.ast.expr.VariableDeclarationExpr;
import com.github.javaparser.ast.stmt.BlockStmt;
import com.github.javaparser.ast.stmt.IfStmt;
import com.github.javaparser.ast.stmt.ReturnStmt;
import com.github.javaparser.ast.stmt.SwitchEntry;
import com.github.javaparser.ast.stmt.SwitchStmt;
import com.github.javaparser.ast.stmt.ThrowStmt;
import com.github.javaparser.ast.expr.*;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please reorganize that imports, in general we are trying to avoid * in the imports

import com.github.javaparser.ast.stmt.*;
import com.github.javaparser.ast.type.ClassOrInterfaceType;

import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC;
Expand Down Expand Up @@ -228,7 +201,7 @@ public List<CompilationUnit> generate(FileDescriptorSource proto) throws IOExcep
}

if (customTypeName.equals(Serializable.class.getName())) {
String fieldClazz = (String) field.getOptionByName(KOGITO_JAVA_CLASS_OPTION);
String fieldClazz = (String) field.getOptionByName(KOGITO_JAVA_CLASS_OPTION).getValue();
if (fieldClazz == null) {
throw new IllegalArgumentException(format("Serializable proto field '%s' is missing value for option %s", field.getName(), KOGITO_JAVA_CLASS_OPTION));
} else {
Expand Down Expand Up @@ -317,7 +290,11 @@ public List<CompilationUnit> generate(FileDescriptorSource proto) throws IOExcep
}

protected String packageFromOption(FileDescriptor d, Descriptor msg) {
return packageFromOption(d, msg.getOption(JAVA_PACKAGE_OPTION));
Option option = msg.getOptions().stream()
.filter(o -> JAVA_PACKAGE_OPTION.equals(o.getName()))
.findAny()
.orElse(null);
return packageFromOption(d, option);
}

protected String packageFromOption(FileDescriptor d, EnumDescriptor msg) {
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/kie/kogito/codegen/process/persistence/proto/ReflectionProtoGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ protected ProtoMessage messageFromClass(Proto proto, Set<String> alreadyGenerate
ProtoField protoField = message.addField(computeCardinalityModifier(fieldTypeString), protoType, pd.getName());
protoField.setComment(completeFieldComment);
if (KOGITO_SERIALIZABLE.equals(protoType)) {
protoField.setOption(format("[(%s) = \"%s\"]", KOGITO_JAVA_CLASS_OPTION, pd.getPropertyType().getCanonicalName()));
protoField.setOption(format("[%s = \"%s\"]", KOGITO_JAVA_CLASS_OPTION, pd.getPropertyType().getCanonicalName()));
}
}
message.setComment(messageComment);
Expand Down
1 change: 0 additions & 1 deletion ...rg/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ void testPersonMarshallers() throws Exception {
assertThat(proto.getMessages()).hasSize(1);

MarshallerGenerator marshallerGenerator = withGenerator(Person.class);

List<CompilationUnit> classes = marshallerGenerator.generate(proto.serialize());
assertThat(classes).isNotNull().hasSize(1);

Expand Down
Loading
Loading