Skip to content

Commit 8f8e614

Browse files
Updated dependencies to Jakarta Bean Validation 3.x
1 parent 020045c commit 8f8e614

File tree

88 files changed

+190
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+190
-188
lines changed

pom.xml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<modules>
1414
<module>validator-core</module>
1515
<module>validator-hv</module>
16+
<!--
1617
<module>validator-bval</module>
18+
-->
1719
</modules>
1820

1921
<name>Conditional Validator</name>
@@ -57,14 +59,14 @@
5759
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
5860

5961
<!-- Java EE Specs -->
60-
<cdi.version>2.0</cdi.version>
61-
<bean-validation.version>2.0.1.Final</bean-validation.version>
62-
<el.version>3.0.0</el.version>
62+
<cdi.version>4.0.1</cdi.version>
63+
<bean-validation.version>3.0.2</bean-validation.version>
64+
<el.version>5.0.1</el.version>
6365

6466
<!-- Java EE Specs Implementations -->
65-
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
67+
<hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
6668
<bval.version>2.0.6</bval.version>
67-
<glassfish-el.version>3.0.0</glassfish-el.version>
69+
<glassfish-el.version>5.0.0-M1</glassfish-el.version>
6870

6971
<!-- Libraries -->
7072
<lombok.version>1.18.26</lombok.version>
@@ -123,22 +125,22 @@
123125
</dependency>
124126

125127
<dependency>
126-
<groupId>javax.enterprise</groupId>
127-
<artifactId>cdi-api</artifactId>
128+
<groupId>jakarta.enterprise</groupId>
129+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
128130
<version>${cdi.version}</version>
129131
<scope>provided</scope>
130132
</dependency>
131133

132134
<dependency>
133-
<groupId>javax.validation</groupId>
134-
<artifactId>validation-api</artifactId>
135+
<groupId>jakarta.validation</groupId>
136+
<artifactId>jakarta.validation-api</artifactId>
135137
<version>${bean-validation.version}</version>
136138
<scope>provided</scope>
137139
</dependency>
138140

139141
<dependency>
140-
<groupId>javax.el</groupId>
141-
<artifactId>javax.el-api</artifactId>
142+
<groupId>jakarta.el</groupId>
143+
<artifactId>jakarta.el-api</artifactId>
142144
<version>${el.version}</version>
143145
<scope>provided</scope>
144146
</dependency>
@@ -204,7 +206,7 @@
204206

205207
<dependency>
206208
<groupId>org.glassfish</groupId>
207-
<artifactId>javax.el</artifactId>
209+
<artifactId>jakarta.el</artifactId>
208210
<version>${glassfish-el.version}</version>
209211
<scope>test</scope>
210212
</dependency>

validator-bval/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
</dependency>
3737

3838
<dependency>
39-
<groupId>javax.validation</groupId>
40-
<artifactId>validation-api</artifactId>
39+
<groupId>jakarta.validation</groupId>
40+
<artifactId>jakarta.validation-api</artifactId>
4141
</dependency>
4242

4343
<dependency>
@@ -52,7 +52,7 @@
5252

5353
<dependency>
5454
<groupId>org.glassfish</groupId>
55-
<artifactId>javax.el</artifactId>
55+
<artifactId>jakarta.el</artifactId>
5656
</dependency>
5757

5858
<dependency>

validator-bval/src/main/java/com/github/microtweak/conditionalvalidator/bval/constraint/checkdigit/ABANumberWhen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.microtweak.conditionalvalidator.ValidateAs;
44
import org.apache.bval.extras.constraints.checkdigit.ABANumber;
55

6-
import javax.validation.Payload;
6+
import jakarta.validation.Payload;
77
import java.lang.annotation.Documented;
88
import java.lang.annotation.Retention;
99
import java.lang.annotation.Target;

validator-bval/src/main/java/com/github/microtweak/conditionalvalidator/bval/constraint/checkdigit/CUSIPWhen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.microtweak.conditionalvalidator.ValidateAs;
44
import org.apache.bval.extras.constraints.checkdigit.CUSIP;
55

6-
import javax.validation.Payload;
6+
import jakarta.validation.Payload;
77
import java.lang.annotation.Documented;
88
import java.lang.annotation.Retention;
99
import java.lang.annotation.Target;

validator-bval/src/main/java/com/github/microtweak/conditionalvalidator/bval/constraint/checkdigit/EAN13When.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.microtweak.conditionalvalidator.ValidateAs;
44
import org.apache.bval.extras.constraints.checkdigit.EAN13;
55

6-
import javax.validation.Payload;
6+
import jakarta.validation.Payload;
77
import java.lang.annotation.Documented;
88
import java.lang.annotation.Retention;
99
import java.lang.annotation.Target;

validator-bval/src/main/java/com/github/microtweak/conditionalvalidator/bval/constraint/checkdigit/IBANWhen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.microtweak.conditionalvalidator.ValidateAs;
44
import org.apache.bval.extras.constraints.checkdigit.IBAN;
55

6-
import javax.validation.Payload;
6+
import jakarta.validation.Payload;
77
import java.lang.annotation.Documented;
88
import java.lang.annotation.Retention;
99
import java.lang.annotation.Target;

validator-bval/src/main/java/com/github/microtweak/conditionalvalidator/bval/constraint/checkdigit/ISBN10When.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.microtweak.conditionalvalidator.ValidateAs;
44
import org.apache.bval.extras.constraints.checkdigit.ISBN10;
55

6-
import javax.validation.Payload;
6+
import jakarta.validation.Payload;
77
import java.lang.annotation.Documented;
88
import java.lang.annotation.Retention;
99
import java.lang.annotation.Target;

validator-bval/src/main/java/com/github/microtweak/conditionalvalidator/bval/constraint/checkdigit/LuhnWhen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.microtweak.conditionalvalidator.ValidateAs;
44
import org.apache.bval.extras.constraints.checkdigit.Luhn;
55

6-
import javax.validation.Payload;
6+
import jakarta.validation.Payload;
77
import java.lang.annotation.Documented;
88
import java.lang.annotation.Retention;
99
import java.lang.annotation.Target;

validator-bval/src/main/java/com/github/microtweak/conditionalvalidator/bval/constraint/checkdigit/SedolWhen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.microtweak.conditionalvalidator.ValidateAs;
44
import org.apache.bval.extras.constraints.checkdigit.Sedol;
55

6-
import javax.validation.Payload;
6+
import jakarta.validation.Payload;
77
import java.lang.annotation.Documented;
88
import java.lang.annotation.Retention;
99
import java.lang.annotation.Target;

validator-bval/src/main/java/com/github/microtweak/conditionalvalidator/bval/constraint/checkdigit/VerhoeffWhen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.microtweak.conditionalvalidator.ValidateAs;
44
import org.apache.bval.extras.constraints.checkdigit.Verhoeff;
55

6-
import javax.validation.Payload;
6+
import jakarta.validation.Payload;
77
import java.lang.annotation.Documented;
88
import java.lang.annotation.Retention;
99
import java.lang.annotation.Target;

0 commit comments

Comments
 (0)