Skip to content

Commit 2ac6c10

Browse files
snicollsnicoll
committed
Merge pull request #9969 from rajadilipkolli:patch-3
* pr/9969: Upgrade to Hibernate Validator 6.0.2.Final
2 parents ac9c2c0 + a4a0eef commit 2ac6c10

File tree

13 files changed

+27
-12
lines changed

13 files changed

+27
-12
lines changed

‎spring-boot-actuator-autoconfigure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
<optional>true</optional>
210210
</dependency>
211211
<dependency>
212-
<groupId>org.hibernate</groupId>
212+
<groupId>org.hibernate.validator</groupId>
213213
<artifactId>hibernate-validator</artifactId>
214214
<optional>true</optional>
215215
</dependency>

‎spring-boot-actuator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<optional>true</optional>
9898
</dependency>
9999
<dependency>
100-
<groupId>org.hibernate</groupId>
100+
<groupId>org.hibernate.validator</groupId>
101101
<artifactId>hibernate-validator</artifactId>
102102
<optional>true</optional>
103103
</dependency>

‎spring-boot-autoconfigure/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,12 @@
149149
<groupId>org.glassfish.jersey.ext</groupId>
150150
<artifactId>jersey-spring4</artifactId>
151151
<optional>true</optional>
152+
<exclusions>
153+
<exclusion>
154+
<groupId>org.hibernate</groupId>
155+
<artifactId>hibernate-validator</artifactId>
156+
</exclusion>
157+
</exclusions>
152158
</dependency>
153159
<dependency>
154160
<groupId>org.glassfish.jersey.media</groupId>
@@ -300,7 +306,7 @@
300306
<optional>true</optional>
301307
</dependency>
302308
<dependency>
303-
<groupId>org.hibernate</groupId>
309+
<groupId>org.hibernate.validator</groupId>
304310
<artifactId>hibernate-validator</artifactId>
305311
<optional>true</optional>
306312
</dependency>

‎spring-boot-dependencies/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<hazelcast.version>3.8.5</hazelcast.version>
8686
<hazelcast-hibernate5.version>1.2.2</hazelcast-hibernate5.version>
8787
<hibernate.version>5.2.11.Final</hibernate.version>
88-
<hibernate-validator.version>5.4.1.Final</hibernate-validator.version>
88+
<hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
8989
<hikaricp.version>2.7.1</hikaricp.version>
9090
<hsqldb.version>2.4.0</hsqldb.version>
9191
<htmlunit.version>2.27</htmlunit.version>
@@ -1847,7 +1847,7 @@
18471847
<version>${hibernate.version}</version>
18481848
</dependency>
18491849
<dependency>
1850-
<groupId>org.hibernate</groupId>
1850+
<groupId>org.hibernate.validator</groupId>
18511851
<artifactId>hibernate-validator</artifactId>
18521852
<version>${hibernate-validator.version}</version>
18531853
</dependency>

‎spring-boot-docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@
503503
<optional>true</optional>
504504
</dependency>
505505
<dependency>
506-
<groupId>org.hibernate</groupId>
506+
<groupId>org.hibernate.validator</groupId>
507507
<artifactId>hibernate-validator</artifactId>
508508
<optional>true</optional>
509509
</dependency>

‎spring-boot-starters/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
<bannedDependencies>
9494
<excludes>
9595
<exclude>commons-logging:*:*</exclude>
96+
<exclude>org.hibernate:hibernate-validator:*</exclude>
9697
</excludes>
9798
<searchTransitive>true</searchTransitive>
9899
</bannedDependencies>

‎spring-boot-starters/spring-boot-starter-jersey/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
<groupId>org.glassfish.hk2.external</groupId>
8080
<artifactId>javax.inject</artifactId>
8181
</exclusion>
82+
<exclusion>
83+
<groupId>org.hibernate</groupId>
84+
<artifactId>hibernate-validator</artifactId>
85+
</exclusion>
8286
</exclusions>
8387
</dependency>
8488
<dependency>
@@ -93,6 +97,10 @@
9397
<groupId>org.glassfish.hk2.external</groupId>
9498
<artifactId>javax.inject</artifactId>
9599
</exclusion>
100+
<exclusion>
101+
<groupId>org.hibernate</groupId>
102+
<artifactId>hibernate-validator</artifactId>
103+
</exclusion>
96104
</exclusions>
97105
</dependency>
98106
<dependency>

‎spring-boot-starters/spring-boot-starter-validation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<artifactId>tomcat-embed-el</artifactId>
2929
</dependency>
3030
<dependency>
31-
<groupId>org.hibernate</groupId>
31+
<groupId>org.hibernate.validator</groupId>
3232
<artifactId>hibernate-validator</artifactId>
3333
</dependency>
3434
</dependencies>

‎spring-boot-starters/spring-boot-starter-web/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<artifactId>spring-boot-starter-tomcat</artifactId>
3333
</dependency>
3434
<dependency>
35-
<groupId>org.hibernate</groupId>
35+
<groupId>org.hibernate.validator</groupId>
3636
<artifactId>hibernate-validator</artifactId>
3737
</dependency>
3838
<dependency>

‎spring-boot-starters/spring-boot-starter-webflux/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<artifactId>spring-boot-starter-reactor-netty</artifactId>
3333
</dependency>
3434
<dependency>
35-
<groupId>org.hibernate</groupId>
35+
<groupId>org.hibernate.validator</groupId>
3636
<artifactId>hibernate-validator</artifactId>
3737
</dependency>
3838
<dependency>

‎spring-boot-test-autoconfigure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<scope>test</scope>
235235
</dependency>
236236
<dependency>
237-
<groupId>org.hibernate</groupId>
237+
<groupId>org.hibernate.validator</groupId>
238238
<artifactId>hibernate-validator</artifactId>
239239
<scope>test</scope>
240240
</dependency>

‎spring-boot-tools/spring-boot-test-support/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</dependency>
102102
<!-- Test -->
103103
<dependency>
104-
<groupId>org.hibernate</groupId>
104+
<groupId>org.hibernate.validator</groupId>
105105
<artifactId>hibernate-validator</artifactId>
106106
<scope>test</scope>
107107
</dependency>

‎spring-boot/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<optional>true</optional>
186186
</dependency>
187187
<dependency>
188-
<groupId>org.hibernate</groupId>
188+
<groupId>org.hibernate.validator</groupId>
189189
<artifactId>hibernate-validator</artifactId>
190190
<optional>true</optional>
191191
</dependency>

0 commit comments

Comments
 (0)