Skip to content

Commit 4f49076

Browse files
dvgabadvgaba
authored
Version 7.0.0 release (#43)
1. Bumped JDK to 17 2. Bumped data-faker to 2.1.x from 1.6.x 3. Bumped validation framework to jakarta from javax + other 3PP Version bump.
1 parent 0937279 commit 4f49076

File tree

19 files changed

+79
-61
lines changed

19 files changed

+79
-61
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
Active
2323

2424
## Latest news
25+
* 1/15/2024 7.0.0 Major release, default Java version bumped to 17 and other 3PP version bump. [Breaking changes].
2526
* 9/1/2023 6.2.1 Minor release to initialize leaf nodes for Records [Breaking change].
2627
* 8/10/2023 6.2.0 Minor release to add custom radomizer support for protobuf, 3PP and code refactoring.
2728
* 5/23/2023 6.1.8 Patch release to fix [#26](https://github.com/dvgaba/easy-random/issues/26) and [#28](https://github.com/dvgaba/easy-random/issues/28), thanks @[carborgar](https://github.com/carborgar).

‎easy-random-bean-validation/pom.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.dvgaba</groupId>
66
<artifactId>easy-random</artifactId>
7-
<version>6.2.1</version>
7+
<version>7.0.0</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>easy-random-bean-validation</artifactId>
@@ -53,25 +53,32 @@
5353
<groupId>io.github.dvgaba</groupId>
5454
<artifactId>easy-random-randomizers</artifactId>
5555
</dependency>
56-
<dependency>
57-
<groupId>javax.validation</groupId>
58-
<artifactId>validation-api</artifactId>
59-
</dependency>
6056
<dependency>
6157
<groupId>org.assertj</groupId>
6258
<artifactId>assertj-core</artifactId>
6359
<scope>test</scope>
6460
</dependency>
6561
<dependency>
6662
<groupId>org.glassfish</groupId>
67-
<artifactId>javax.el</artifactId>
63+
<artifactId>jakarta.el</artifactId>
6864
<scope>test</scope>
6965
</dependency>
7066
<dependency>
7167
<groupId>org.hibernate.validator</groupId>
7268
<artifactId>hibernate-validator</artifactId>
7369
<scope>test</scope>
7470
</dependency>
71+
72+
<dependency>
73+
<groupId>org.glassfish.expressly</groupId>
74+
<artifactId>expressly</artifactId>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>jakarta.validation</groupId>
79+
<artifactId>jakarta.validation-api</artifactId>
80+
</dependency>
81+
7582
<dependency>
7683
<groupId>org.junit.jupiter</groupId>
7784
<artifactId>junit-jupiter</artifactId>

‎easy-random-bean-validation/src/main/java/org/jeasy/random/validation/BeanValidationRandomizerRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.lang.reflect.Field;
2828
import java.util.HashMap;
2929
import java.util.Map;
30-
import javax.validation.constraints.*;
30+
import jakarta.validation.constraints.*;
3131
import org.jeasy.random.EasyRandomParameters;
3232
import org.jeasy.random.annotation.Priority;
3333
import org.jeasy.random.api.Randomizer;

‎easy-random-bean-validation/src/main/java/org/jeasy/random/validation/DecimalMinMaxAnnotationHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
import java.lang.reflect.Field;
2727
import java.math.BigDecimal;
28-
import javax.validation.constraints.DecimalMax;
29-
import javax.validation.constraints.DecimalMin;
28+
import jakarta.validation.constraints.DecimalMax;
29+
import jakarta.validation.constraints.DecimalMin;
3030
import org.jeasy.random.api.Randomizer;
3131
import org.jeasy.random.util.ReflectionUtils;
3232

‎easy-random-bean-validation/src/main/java/org/jeasy/random/validation/MinMaxAnnotationHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
import java.lang.reflect.Field;
2727
import java.math.BigDecimal;
28-
import javax.validation.constraints.Max;
29-
import javax.validation.constraints.Min;
28+
import jakarta.validation.constraints.Max;
29+
import jakarta.validation.constraints.Min;
3030
import org.jeasy.random.api.Randomizer;
3131
import org.jeasy.random.util.ReflectionUtils;
3232

‎easy-random-bean-validation/src/main/java/org/jeasy/random/validation/PatternAnnotationHandler.java

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

2626
import java.lang.reflect.Field;
2727
import java.util.Random;
28-
import javax.validation.constraints.Pattern;
28+
import jakarta.validation.constraints.Pattern;
2929
import org.jeasy.random.api.Randomizer;
3030
import org.jeasy.random.randomizers.RegularExpressionRandomizer;
3131
import org.jeasy.random.util.ReflectionUtils;

‎easy-random-bean-validation/src/main/java/org/jeasy/random/validation/SizeAnnotationHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.Collection;
3434
import java.util.EnumMap;
3535
import java.util.Map;
36-
import javax.validation.constraints.Size;
36+
import jakarta.validation.constraints.Size;
3737
import org.jeasy.random.EasyRandom;
3838
import org.jeasy.random.EasyRandomParameters;
3939
import org.jeasy.random.api.Randomizer;

‎easy-random-bean-validation/src/test/java/org/jeasy/random/validation/BeanValidationAnnotatedBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.time.Instant;
2828
import java.time.LocalDateTime;
2929
import java.util.*;
30-
import javax.validation.constraints.*;
30+
import jakarta.validation.constraints.*;
3131

3232
class BeanValidationAnnotatedBean {
3333

‎easy-random-bean-validation/src/test/java/org/jeasy/random/validation/BeanValidationMethodAnnotatedBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.time.Instant;
2828
import java.time.LocalDateTime;
2929
import java.util.*;
30-
import javax.validation.constraints.*;
30+
import jakarta.validation.constraints.*;
3131

3232
class BeanValidationMethodAnnotatedBean {
3333

‎easy-random-bean-validation/src/test/java/org/jeasy/random/validation/BeanValidationTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030
import java.util.Date;
3131
import java.util.List;
3232
import java.util.Set;
33-
import javax.validation.ConstraintViolation;
34-
import javax.validation.Valid;
35-
import javax.validation.Validation;
36-
import javax.validation.Validator;
37-
import javax.validation.ValidatorFactory;
38-
import javax.validation.constraints.DecimalMax;
39-
import javax.validation.constraints.DecimalMin;
40-
import javax.validation.constraints.Digits;
41-
import javax.validation.constraints.NotNull;
42-
import javax.validation.constraints.Size;
33+
import jakarta.validation.ConstraintViolation;
34+
import jakarta.validation.Valid;
35+
import jakarta.validation.Validation;
36+
import jakarta.validation.Validator;
37+
import jakarta.validation.ValidatorFactory;
38+
import jakarta.validation.constraints.DecimalMax;
39+
import jakarta.validation.constraints.DecimalMin;
40+
import jakarta.validation.constraints.Digits;
41+
import jakarta.validation.constraints.NotNull;
42+
import jakarta.validation.constraints.Size;
4343
import org.jeasy.random.EasyRandom;
4444
import org.jeasy.random.EasyRandomParameters;
4545
import org.jeasy.random.randomizers.range.BigDecimalRangeRandomizer;

‎easy-random-bean-validation/src/test/java/org/jeasy/random/validation/BeanValidationWithoutReadMethodBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
package org.jeasy.random.validation;
2525

26-
import javax.validation.constraints.NotNull;
26+
import jakarta.validation.constraints.NotNull;
2727

2828
public class BeanValidationWithoutReadMethodBean {
2929

‎easy-random-bean-validation/src/test/java/org/jeasy/random/validation/EmbeddedBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.jeasy.random.validation;
2525

2626
import java.util.List;
27-
import javax.validation.constraints.Size;
27+
import jakarta.validation.constraints.Size;
2828

2929
public class EmbeddedBean {
3030

‎easy-random-bean-validation/src/test/java/org/jeasy/random/validation/MyCustomBeanValidationRandomizerRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
package org.jeasy.random.validation;
2525

26-
import javax.validation.constraints.Digits;
26+
import jakarta.validation.constraints.Digits;
2727
import org.jeasy.random.EasyRandomParameters;
2828

2929
public class MyCustomBeanValidationRandomizerRegistry extends BeanValidationRandomizerRegistry {

‎easy-random-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.dvgaba</groupId>
66
<artifactId>easy-random</artifactId>
7-
<version>6.2.1</version>
7+
<version>7.0.0</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>easy-random-core</artifactId>

‎easy-random-protobuf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.dvgaba</groupId>
66
<artifactId>easy-random</artifactId>
7-
<version>6.2.1</version>
7+
<version>7.0.0</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>easy-random-protobuf</artifactId>

‎easy-random-randomizers/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.dvgaba</groupId>
66
<artifactId>easy-random</artifactId>
7-
<version>6.2.1</version>
7+
<version>7.0.0</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>easy-random-randomizers</artifactId>

‎easy-random-randomizers/src/test/java/org/jeasy/random/randomizers/RandomizersTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ static Object[][] generateSeededRandomizersAndTheirExpectedValues() {
7272
{ new CityRandomizer(SEED), "Breannaberg" },
7373
{ new CompanyRandomizer(SEED), "Hegmann, Hansen and Mills" },
7474
{ new CountryRandomizer(SEED), "Peru" },
75-
{ new CreditCardNumberRandomizer(SEED), "1211-1221-1234-2201" },
75+
{ new CreditCardNumberRandomizer(SEED), "6762-0695-7475-3962" },
7676
{ new EmailRandomizer(SEED), "jacob.hansen@hotmail.com" },
7777
{ new FirstNameRandomizer(SEED), "Jacob" },
7878
{ new FullNameRandomizer(SEED), "Breanna Mills" },
7979
{ new Ipv4AddressRandomizer(SEED), "16.188.76.229" },
80-
{ new Ipv6AddressRandomizer(SEED), "b3f4:4994:c9e8:b21a:c493:e923:f711:1115" },
81-
{ new IsbnRandomizer(SEED), "9781786075390" },
80+
{ new Ipv6AddressRandomizer(SEED), "d119:54cc:1cbd:a03d:6170:26a2:57ab:af62" },
81+
{ new IsbnRandomizer(SEED), "9790893392719" },
8282
{ new LastNameRandomizer(SEED), "Durgan" },
8383
{ new LatitudeRandomizer(SEED), "40.17135654" },
8484
{ new LongitudeRandomizer(SEED), "80.34271308" },
@@ -87,13 +87,13 @@ static Object[][] generateSeededRandomizersAndTheirExpectedValues() {
8787
new ParagraphRandomizer(SEED),
8888
"Totam assumenda eius autem similique. Aut voluptatem enim praesentium. Suscipit cupiditate doloribus debitis dolor. Cumque sapiente occaecati. Quos maiores quae.",
8989
},
90-
{ new PhoneNumberRandomizer(SEED), "1-352-773-9574" },
90+
{ new PhoneNumberRandomizer(SEED), "(352) 773-9574 x7539" },
9191
{ new RegularExpressionRandomizer("\\d+[A-Z]{5}", SEED), "8UYSMT" },
9292
{ new SentenceRandomizer(SEED), "Dolor totam assumenda eius autem." },
9393
{ new StateRandomizer(SEED), "North Carolina" },
9494
{ new StreetRandomizer(SEED), "Hegmann Locks" },
9595
{ new WordRandomizer(SEED), "repellat" },
96-
{ new ZipCodeRandomizer(SEED), "06957" },
96+
{ new ZipCodeRandomizer(SEED), "20695" },
9797
};
9898
}
9999

@@ -108,16 +108,16 @@ void shouldGenerateTheSameValueForTheSameSeed(Randomizer<?> randomizer, Object e
108108

109109
static Object[][] generateSeededRandomizersWithLocaleAndTheirExpectedValues() {
110110
return new Object[][] {
111-
{ new CityRandomizer(SEED, LOCALE), "Versailles" },
111+
{ new CityRandomizer(SEED, LOCALE), "Neuilly-sur-Seine" },
112112
{ new CompanyRandomizer(SEED, LOCALE), "Masson et Lambert" },
113113
{ new CountryRandomizer(SEED, LOCALE), "Peru" },
114-
{ new CreditCardNumberRandomizer(SEED, LOCALE), "1211-1221-1234-2201" },
114+
{ new CreditCardNumberRandomizer(SEED, LOCALE), "6762-0695-7475-3962" },
115115
{ new EmailRandomizer(SEED, LOCALE), "alice.masson@hotmail.fr" },
116116
{ new FirstNameRandomizer(SEED, LOCALE), "Alice" },
117117
{ new FullNameRandomizer(SEED, LOCALE), "Masson Emilie" },
118118
{ new Ipv4AddressRandomizer(SEED, LOCALE), "16.188.76.229" },
119-
{ new Ipv6AddressRandomizer(SEED, LOCALE), "b3f4:4994:c9e8:b21a:c493:e923:f711:1115" },
120-
{ new IsbnRandomizer(SEED, LOCALE), "9781786075390" },
119+
{ new Ipv6AddressRandomizer(SEED, LOCALE), "d119:54cc:1cbd:a03d:6170:26a2:57ab:af62" },
120+
{ new IsbnRandomizer(SEED, LOCALE), "9790893392719" },
121121
{ new LastNameRandomizer(SEED, LOCALE), "Faure" },
122122
{ new LatitudeRandomizer(SEED, LOCALE), "40,17135654" }, // should really be "40.171357", seems like a bug in java-faker
123123
{ new LongitudeRandomizer(SEED, LOCALE), "80,34271308" }, // should really be "80.342713", seems like a bug in java-faker
@@ -129,9 +129,9 @@ static Object[][] generateSeededRandomizersWithLocaleAndTheirExpectedValues() {
129129
{ new PhoneNumberRandomizer(SEED, LOCALE), "03 06 95 74 75" },
130130
{ new SentenceRandomizer(SEED, LOCALE), "Dolor totam assumenda eius autem." },
131131
{ new StateRandomizer(SEED, LOCALE), "Lorraine" },
132-
{ new StreetRandomizer(SEED, LOCALE), "Rue de Presbourg" },
132+
{ new StreetRandomizer(SEED, LOCALE), "Passage des Francs-Bourgeois" },
133133
{ new WordRandomizer(SEED, LOCALE), "repellat" },
134-
{ new ZipCodeRandomizer(SEED, LOCALE), "06957" },
134+
{ new ZipCodeRandomizer(SEED, LOCALE), "20695" },
135135
};
136136
}
137137

‎jitpack.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
jdk:
2+
- openjdk17
3+
install:
4+
- mvn install -Dmaven.javadoc.skip=true -DskipTests

‎pom.xml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>io.github.dvgaba</groupId>
1111
<artifactId>easy-random</artifactId>
12-
<version>6.2.1</version>
12+
<version>7.0.0</version>
1313
<packaging>pom</packaging>
1414

1515
<build>
@@ -115,11 +115,6 @@
115115
<groupId>io.github.dvgaba</groupId>
116116
<version>${project.version}</version>
117117
</dependency>
118-
<dependency>
119-
<artifactId>validation-api</artifactId>
120-
<groupId>javax.validation</groupId>
121-
<version>${validation-api.version}</version>
122-
</dependency>
123118
<dependency>
124119
<artifactId>objenesis</artifactId>
125120
<groupId>org.objenesis</groupId>
@@ -137,12 +132,22 @@
137132
<version>${classgraph.version}</version>
138133
</dependency>
139134
<dependency>
140-
<artifactId>hibernate-validator</artifactId>
141135
<groupId>org.hibernate.validator</groupId>
136+
<artifactId>hibernate-validator</artifactId>
142137
<version>${hibernate-validator.version}</version>
143138
</dependency>
144139
<dependency>
145-
<artifactId>javax.el</artifactId>
140+
<groupId>org.glassfish.expressly</groupId>
141+
<artifactId>expressly</artifactId>
142+
<version>${expressly.version}</version>
143+
</dependency>
144+
<dependency>
145+
<groupId>jakarta.validation</groupId>
146+
<artifactId>jakarta.validation-api</artifactId>
147+
<version>${jakarta.validation-api.version}</version>
148+
</dependency>
149+
<dependency>
150+
<artifactId>jakarta.el</artifactId>
146151
<groupId>org.glassfish</groupId>
147152
<version>${javax.el.version}</version>
148153
</dependency>
@@ -310,13 +315,13 @@
310315
</profiles>
311316

312317
<properties>
313-
<assertj.version>3.24.2</assertj.version>
314-
<classgraph.version>4.8.162</classgraph.version>
315-
<datafaker.version>1.6.0</datafaker.version>
316-
<hibernate-validator.version>6.1.6.Final</hibernate-validator.version>
317-
<java.version>16</java.version>
318-
<javax.el.version>3.0.0</javax.el.version>
319-
<junit.version>5.9.3</junit.version>
318+
<assertj.version>3.25.1</assertj.version>
319+
<classgraph.version>4.8.165</classgraph.version>
320+
<datafaker.version>2.1.0</datafaker.version>
321+
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
322+
<java.version>17</java.version>
323+
<javax.el.version>4.0.2</javax.el.version>
324+
<junit.version>5.10.1</junit.version>
320325
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
321326
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
322327
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
@@ -325,19 +330,20 @@
325330
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
326331
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
327332
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
328-
<mockito.version>4.11.0</mockito.version>
333+
<mockito.version>5.9.0</mockito.version>
329334
<nexus-staging-maven-plugin.version>1.6.12</nexus-staging-maven-plugin.version>
330335
<objenesis.version>3.3</objenesis.version>
331336
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
332337
<prettier-java.version>1.6.2</prettier-java.version>
333338
<prettier.version>2.7.1</prettier.version>
334339
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
335340
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
336-
<protobuf.version>3.23.4</protobuf.version>
337-
<snakeyaml.version>2.0</snakeyaml.version>
341+
<protobuf.version>3.25.2</protobuf.version>
342+
<snakeyaml.version>2.2</snakeyaml.version>
338343
<spotless-maven-plugin.version>2.26.0</spotless-maven-plugin.version>
339-
<validation-api.version>2.0.1.Final</validation-api.version>
340344
<velocity-engine-core.version>2.3</velocity-engine-core.version>
345+
<expressly.version>5.0.0</expressly.version>
346+
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
341347
</properties>
342348

343349
<scm>

0 commit comments

Comments
 (0)