Skip to content

Commit 26bba6c

Browse files
authored
Merge pull request #255 from rosette-api/COMN-325-migrate-javax-to-jakarta
COMN-325: Migrate javax.validation to jakarta.validation
2 parents 666e848 + 7284ad1 commit 26bba6c

23 files changed

+40
-35
lines changed

json/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
<groupId>com.fasterxml.jackson.core</groupId>
3535
<artifactId>jackson-databind</artifactId>
3636
</dependency>
37+
<dependency>
38+
<groupId>jakarta.validation</groupId>
39+
<artifactId>jakarta.validation-api</artifactId>
40+
<version>${jakarta-validation-api.version}</version>
41+
</dependency>
3742
<dependency>
3843
<groupId>com.basistech.rosette</groupId>
3944
<artifactId>rosette-api-model</artifactId>

json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityDeserializerUtilities.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import com.fasterxml.jackson.core.JsonParser;
3232
import com.fasterxml.jackson.databind.JsonNode;
3333

34-
import javax.validation.Valid;
35-
import javax.validation.constraints.NotNull;
34+
import jakarta.validation.Valid;
35+
import jakarta.validation.constraints.NotNull;
3636

3737
import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityFieldInfo;
3838
import com.basistech.rosette.apimodel.recordsimilarity.records.AddressField;

model/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
<artifactId>common-api</artifactId>
4040
</dependency>
4141
<dependency>
42-
<groupId>javax.validation</groupId>
43-
<artifactId>validation-api</artifactId>
44-
<version>${javax-validation-api.version}</version>
42+
<groupId>jakarta.validation</groupId>
43+
<artifactId>jakarta.validation-api</artifactId>
44+
<version>${jakarta-validation-api.version}</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.basistech</groupId>

model/src/main/java/com/basistech/rosette/apimodel/AddressSimilarityRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.util.Map;
2121

22-
import javax.validation.constraints.NotNull;
22+
import jakarta.validation.constraints.NotNull;
2323
import lombok.Builder;
2424
import lombok.Value;
2525

model/src/main/java/com/basistech/rosette/apimodel/CategoriesOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.basistech.rosette.apimodel;
1818

1919
import com.basistech.rosette.annotations.JacksonMixin;
20-
import javax.validation.constraints.Min;
20+
import jakarta.validation.constraints.Min;
2121
import lombok.Builder;
2222
import lombok.Value;
2323

model/src/main/java/com/basistech/rosette/apimodel/Entity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import lombok.Builder;
2121
import lombok.Value;
2222

23-
import javax.validation.Valid;
23+
import jakarta.validation.Valid;
2424
import java.util.List;
2525

2626
/**

model/src/main/java/com/basistech/rosette/apimodel/LanguageOptions.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import lombok.Builder;
2323
import lombok.Value;
2424

25-
import javax.validation.Valid;
26-
import javax.validation.constraints.DecimalMax;
27-
import javax.validation.constraints.DecimalMin;
28-
import javax.validation.constraints.Min;
25+
import jakarta.validation.Valid;
26+
import jakarta.validation.constraints.DecimalMax;
27+
import jakarta.validation.constraints.DecimalMin;
28+
import jakarta.validation.constraints.Min;
2929
import java.util.Set;
3030

3131
/**

model/src/main/java/com/basistech/rosette/apimodel/LanguageWeight.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import lombok.Builder;
2323
import lombok.Value;
2424

25-
import javax.validation.constraints.Max;
26-
import javax.validation.constraints.Min;
25+
import jakarta.validation.constraints.Max;
26+
import jakarta.validation.constraints.Min;
2727

2828
/**
2929
* language weight used to resolve ambiguous results

model/src/main/java/com/basistech/rosette/apimodel/MentionOffsets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import lombok.Builder;
2121
import lombok.Value;
2222

23-
import javax.validation.constraints.Min;
23+
import jakarta.validation.constraints.Min;
2424

2525
/**
2626
* The start and end offset/index for a given mention in a string of text

model/src/main/java/com/basistech/rosette/apimodel/Name.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import lombok.Builder;
2222
import lombok.Value;
2323

24-
import javax.validation.constraints.NotNull;
24+
import jakarta.validation.constraints.NotNull;
2525

2626
/**
2727
* Class that represents a name.

0 commit comments

Comments
 (0)