Skip to content

Commit 4308d95

Browse files
beikovbeikov
committed
Update Spring, Hibernate and driver versions
1 parent 50656de commit 4308d95

File tree

8 files changed

+39
-52
lines changed

8 files changed

+39
-52
lines changed

‎core/testsuite-hibernate/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
128128
<jdbc.user>root</jdbc.user>
129129
<jdbc.password />
130-
<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
130+
<jdbc.driver>com.mysql.cj.jdbc.Driver</jdbc.driver>
131131
<jdbc.database>core${surefire.forkNumber}</jdbc.database>
132132
<testBasePackage>${testBasePackage}</testBasePackage>
133133
<forkCount>${surefireForkCount}</forkCount>
@@ -147,8 +147,8 @@
147147
</build>
148148
<dependencies>
149149
<dependency>
150-
<groupId>mysql</groupId>
151-
<artifactId>mysql-connector-java</artifactId>
150+
<groupId>com.mysql</groupId>
151+
<artifactId>mysql-connector-j</artifactId>
152152
<scope>test</scope>
153153
</dependency>
154154
</dependencies>

‎core/testsuite/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
<jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
223223
<jdbc.user>root</jdbc.user>
224224
<jdbc.password />
225-
<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
225+
<jdbc.driver>com.mysql.cj.jdbc.Driver</jdbc.driver>
226226
<jdbc.database>core${surefire.forkNumber}</jdbc.database>
227227
<excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
228228
<testBasePackage>${testBasePackage}</testBasePackage>
@@ -243,8 +243,8 @@
243243
</build>
244244
<dependencies>
245245
<dependency>
246-
<groupId>mysql</groupId>
247-
<artifactId>mysql-connector-java</artifactId>
246+
<groupId>com.mysql</groupId>
247+
<artifactId>mysql-connector-j</artifactId>
248248
<scope>test</scope>
249249
</dependency>
250250
</dependencies>

‎entity-view/testsuite/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
<jdbc.url>jdbc:mysql://${dbHost}:3306/information_schema?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
202202
<jdbc.user>root</jdbc.user>
203203
<jdbc.password />
204-
<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
204+
<jdbc.driver>com.mysql.cj.jdbc.Driver</jdbc.driver>
205205
<jdbc.database>entityview${surefire.forkNumber}</jdbc.database>
206206
<excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups}</excludedGroups>
207207
<testBasePackage>${testBasePackage}</testBasePackage>
@@ -221,8 +221,8 @@
221221
</build>
222222
<dependencies>
223223
<dependency>
224-
<groupId>mysql</groupId>
225-
<artifactId>mysql-connector-java</artifactId>
224+
<groupId>com.mysql</groupId>
225+
<artifactId>mysql-connector-j</artifactId>
226226
<scope>test</scope>
227227
</dependency>
228228
</dependencies>

‎examples/quarkus-3/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,19 @@
4040
<version>${version.jpa}</version>
4141
<scope>provided</scope>
4242
</dependency>
43-
<!-- Quarkus 3.20+ depend on CDI 4.1, so let's add it here -->
43+
<!-- Quarkus 3.20+ depend on CDI 4.1 and Activation 2.1, so let's add it here -->
4444
<dependency>
4545
<groupId>jakarta.enterprise</groupId>
4646
<artifactId>jakarta.enterprise.cdi-api</artifactId>
4747
<version>4.1.0</version>
4848
<scope>provided</scope>
4949
</dependency>
50+
<dependency>
51+
<groupId>jakarta.activation</groupId>
52+
<artifactId>jakarta.activation-api</artifactId>
53+
<version>2.1.3</version>
54+
<scope>provided</scope>
55+
</dependency>
5056
</dependencies>
5157
</dependencyManagement>
5258

‎integration/deltaspike-data/testsuite/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<jdbc.url>jdbc:mysql://${dbHost}:3306/test?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
159159
<jdbc.user>root</jdbc.user>
160160
<jdbc.password />
161-
<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
161+
<jdbc.driver>com.mysql.cj.jdbc.Driver</jdbc.driver>
162162
</systemPropertyVariables>
163163
</configuration>
164164
<dependencies>
@@ -173,8 +173,8 @@
173173
</build>
174174
<dependencies>
175175
<dependency>
176-
<groupId>mysql</groupId>
177-
<artifactId>mysql-connector-java</artifactId>
176+
<groupId>com.mysql</groupId>
177+
<artifactId>mysql-connector-j</artifactId>
178178
<scope>test</scope>
179179
</dependency>
180180
</dependencies>

‎integration/querydsl/testsuite/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<jdbc.url>jdbc:mysql://${dbHost}:3306/test?useUnicode=true&amp;characterEncoding=utf8&amp;databaseTerm=schema&amp;nullDatabaseMeansCurrent=true</jdbc.url>
124124
<jdbc.user>root</jdbc.user>
125125
<jdbc.password />
126-
<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
126+
<jdbc.driver>com.mysql.cj.jdbc.Driver</jdbc.driver>
127127
</systemPropertyVariables>
128128
</configuration>
129129
<dependencies>
@@ -138,8 +138,8 @@
138138
</build>
139139
<dependencies>
140140
<dependency>
141-
<groupId>mysql</groupId>
142-
<artifactId>mysql-connector-java</artifactId>
141+
<groupId>com.mysql</groupId>
142+
<artifactId>mysql-connector-j</artifactId>
143143
<scope>test</scope>
144144
</dependency>
145145
</dependencies>

‎parent/pom.xml‎

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454

5555
<version.hibernate-6.2>6.2.48.Final</version.hibernate-6.2>
5656
<version.hibernate-6.4>6.4.10.Final</version.hibernate-6.4>
57-
<version.hibernate-6.6>6.6.35.Final</version.hibernate-6.6>
58-
<version.hibernate-7.1>7.1.7.Final</version.hibernate-7.1>
59-
<version.hibernate-7.2>7.2.0.CR2</version.hibernate-7.2>
57+
<version.hibernate-6.6>6.6.37.Final</version.hibernate-6.6>
58+
<version.hibernate-7.1>7.1.10.Final</version.hibernate-7.1>
59+
<version.hibernate-7.2>7.2.0.CR3</version.hibernate-7.2>
6060
<version.hibernate-apt>${version.hibernate-6.6}</version.hibernate-apt>
6161

6262
<version.eclipselink>4.0.4</version.eclipselink>
@@ -73,14 +73,14 @@
7373
<version.spring-data-3.3-spring>6.1.14</version.spring-data-3.3-spring>
7474
<version.spring-data-3.3-spring-boot>3.3.5</version.spring-data-3.3-spring-boot>
7575
<version.spring-data-3.4>3.4.12</version.spring-data-3.4>
76-
<version.spring-data-3.4-spring>6.2.13</version.spring-data-3.4-spring>
77-
<version.spring-data-3.4-spring-boot>3.4.11</version.spring-data-3.4-spring-boot>
76+
<version.spring-data-3.4-spring>6.2.14</version.spring-data-3.4-spring>
77+
<version.spring-data-3.4-spring-boot>3.4.12</version.spring-data-3.4-spring-boot>
7878
<version.spring-data-3.5>3.5.6</version.spring-data-3.5>
79-
<version.spring-data-3.5-spring>6.2.13</version.spring-data-3.5-spring>
80-
<version.spring-data-3.5-spring-boot>3.5.7</version.spring-data-3.5-spring-boot>
79+
<version.spring-data-3.5-spring>6.2.14</version.spring-data-3.5-spring>
80+
<version.spring-data-3.5-spring-boot>3.5.8</version.spring-data-3.5-spring-boot>
8181
<version.spring-data-4.0>4.0.0</version.spring-data-4.0>
82-
<version.spring-data-4.0-spring>7.0.0</version.spring-data-4.0-spring>
83-
<version.spring-data-4.0-spring-boot>4.0.0-RC2</version.spring-data-4.0-spring-boot>
82+
<version.spring-data-4.0-spring>7.0.1</version.spring-data-4.0-spring>
83+
<version.spring-data-4.0-spring-boot>4.0.0</version.spring-data-4.0-spring-boot>
8484
<version.spring-data-latest>${version.spring-data-3.5}</version.spring-data-latest>
8585
<version.spring-data-latest-spring>${version.spring-data-3.5-spring}</version.spring-data-latest-spring>
8686
<version.spring-data-latest-spring-boot>${version.spring-data-3.5-spring-boot}</version.spring-data-latest-spring-boot>
@@ -100,7 +100,7 @@
100100
<asmVersion>9.9</asmVersion>
101101

102102
<h2.version>2.4.240</h2.version>
103-
<mssql.version>12.4.1.jre8</mssql.version>
103+
<mssql.version>13.2.1.jre11</mssql.version>
104104

105105
<!-- JVM values for surefire plugin -->
106106
<surefire.jvm.params>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.jvm.params>
@@ -569,13 +569,6 @@
569569
<version>${version.mockito}</version>
570570
</dependency>
571571

572-
<dependency>
573-
<groupId>org.apache.openejb</groupId>
574-
<artifactId>openejb-core</artifactId>
575-
<version>${version.openejb}</version>
576-
<scope>test</scope>
577-
</dependency>
578-
579572
<!-- RDBMS driver versions -->
580573
<dependency>
581574
<groupId>com.h2database</groupId>
@@ -584,33 +577,21 @@
584577
<scope>test</scope>
585578
</dependency>
586579
<dependency>
587-
<groupId>mysql</groupId>
588-
<artifactId>mysql-connector-java</artifactId>
589-
<version>8.0.33</version>
580+
<groupId>com.mysql</groupId>
581+
<artifactId>mysql-connector-j</artifactId>
582+
<version>9.5.0</version>
590583
<scope>test</scope>
591584
</dependency>
592585
<dependency>
593586
<groupId>org.postgresql</groupId>
594587
<artifactId>postgresql</artifactId>
595-
<version>42.6.0</version>
596-
<scope>test</scope>
597-
</dependency>
598-
<dependency>
599-
<groupId>org.xerial</groupId>
600-
<artifactId>sqlite-jdbc</artifactId>
601-
<version>3.8.11.2</version>
602-
<scope>test</scope>
603-
</dependency>
604-
<dependency>
605-
<groupId>org.firebirdsql.jdbc</groupId>
606-
<artifactId>jaybird-jdk16</artifactId>
607-
<version>2.2.8</version>
588+
<version>42.7.8</version>
608589
<scope>test</scope>
609590
</dependency>
610591
<dependency>
611592
<groupId>com.oracle.database.jdbc</groupId>
612-
<artifactId>ojdbc8</artifactId>
613-
<version>23.2.0.0</version>
593+
<artifactId>ojdbc11</artifactId>
594+
<version>23.26.0.0.0</version>
614595
<scope>test</scope>
615596
</dependency>
616597
<dependency>

‎testsuite-base/assertion/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.github.jsqlparser</groupId>
3434
<artifactId>jsqlparser</artifactId>
35-
<version>4.9</version>
35+
<version>5.3</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>junit</groupId>

0 commit comments

Comments
 (0)