Skip to content

Commit 4b3096c

Browse files
committed
1. Quarkus update to 2.16.2.Final
2. Update GRAALVM for JDK 11 to help fix CI error 3. Deprecate adopt-hotspot in favor of temurin
1 parent 15936ff commit 4b3096c

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
Note: when upgrading the Quarkus version or the DataStax Java driver version, make sure that you
3434
upgrade them in the quickstart module too.
3535
-->
36+
<<<<<<< HEAD
3637
<quarkus.version>2.16.2.Final</quarkus.version>
38+
=======
39+
<quarkus.version>2.15.3.Final</quarkus.version>
40+
>>>>>>> 9d897dc (1. Quarkus update to 2.15.3.Final)
3741
<datastax-java-driver.version>4.15.0</datastax-java-driver.version>
3842
<assertj.version>3.23.1</assertj.version>
3943
<maven.compiler.target>11</maven.compiler.target>

quickstart/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
<inceptionYear>2020</inceptionYear>
2828
<properties>
2929
<java.version>11</java.version>
30+
<<<<<<< HEAD
3031
<quarkus.version>2.16.2.Final</quarkus.version>
32+
=======
33+
<quarkus.version>2.15.3.Final</quarkus.version>
34+
>>>>>>> 9d897dc (1. Quarkus update to 2.15.3.Final)
3135
<datastax-java-driver.version>4.15.0</datastax-java-driver.version>
3236
<assertj.version>3.23.1</assertj.version>
3337
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)