File tree Expand file tree Collapse file tree 2 files changed +8
-0
lines changed Expand file tree Collapse file tree 2 files changed +8
-0
lines changed Original file line number Diff line number Diff line change 33
33
Note: when upgrading the Quarkus version or the DataStax Java driver version, make sure that you
34
34
upgrade them in the quickstart module too.
35
35
-->
36
+ <<<<<<< HEAD
36
37
<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)
37
41
<datastax-java-driver .version>4.15.0</datastax-java-driver .version>
38
42
<assertj .version>3.23.1</assertj .version>
39
43
<maven .compiler.target>11</maven .compiler.target>
Original file line number Diff line number Diff line change 27
27
<inceptionYear >2020</inceptionYear >
28
28
<properties >
29
29
<java .version>11</java .version>
30
+ <<<<<<< HEAD
30
31
<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)
31
35
<datastax-java-driver .version>4.15.0</datastax-java-driver .version>
32
36
<assertj .version>3.23.1</assertj .version>
33
37
<project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
You can’t perform that action at this time.
0 commit comments