Skip to content

Commit d34c221

Browse files
cowtowncodercowtowncoder
authored
Merge pull request #271 from FasterXML/tatu/2.19/268-add-junit4-deps
Start work on #268: junit5 conversion; first demote junit4 dependency
2 parents 7f04a04 + 47118ac commit d34c221

File tree

12 files changed

+62
-31
lines changed

12 files changed

+62
-31
lines changed

‎afterburner/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ field access and method calls
6262
<groupId>org.ow2.asm</groupId>
6363
<artifactId>asm</artifactId>
6464
</dependency>
65-
<dependency> <!-- tests use Jackson annotations -->
66-
<groupId>com.fasterxml.jackson.core</groupId>
67-
<artifactId>jackson-annotations</artifactId>
68-
<scope>provided</scope>
65+
66+
<dependency>
67+
<groupId>junit</groupId>
68+
<artifactId>junit</artifactId>
69+
<scope>test</scope>
6970
</dependency>
7071
</dependencies>
7172

@@ -167,7 +168,6 @@ field access and method calls
167168
<plugin>
168169
<groupId>org.apache.maven.plugins</groupId>
169170
<artifactId>maven-surefire-plugin</artifactId>
170-
<version>3.0.0-M8</version>
171171
<configuration>
172172
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
173173
</configuration>

‎android-record/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@
3939
</dependency>
4040
<dependency>
4141
<groupId>com.fasterxml.jackson.core</groupId>
42-
<artifactId>jackson-annotations</artifactId>
42+
<artifactId>jackson-databind</artifactId>
4343
</dependency>
44+
4445
<dependency>
45-
<groupId>com.fasterxml.jackson.core</groupId>
46-
<artifactId>jackson-databind</artifactId>
46+
<groupId>junit</groupId>
47+
<artifactId>junit</artifactId>
48+
<scope>test</scope>
4749
</dependency>
4850
</dependencies>
4951

‎blackbird/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ that uses LambdaMetafactory based code generation to replace reflection calls.
4343
<groupId>com.fasterxml.jackson.core</groupId>
4444
<artifactId>jackson-databind</artifactId>
4545
</dependency>
46-
<dependency> <!-- tests use Jackson annotations -->
47-
<groupId>com.fasterxml.jackson.core</groupId>
48-
<artifactId>jackson-annotations</artifactId>
49-
<scope>provided</scope>
46+
47+
<dependency>
48+
<groupId>junit</groupId>
49+
<artifactId>junit</artifactId>
50+
<scope>test</scope>
5051
</dependency>
5152
</dependencies>
5253

@@ -84,7 +85,6 @@ that uses LambdaMetafactory based code generation to replace reflection calls.
8485
<plugin>
8586
<groupId>org.apache.maven.plugins</groupId>
8687
<artifactId>maven-surefire-plugin</artifactId>
87-
<version>3.0.0-M8</version>
8888
<configuration>
8989
<argLine>--add-opens java.base/javax.security.auth=ALL-UNNAMED</argLine>
9090
</configuration>

‎guice/pom.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737

3838
<dependencies>
3939
<!-- Extends Jackson mapper, but also uses types from core, hence direct dep as well -->
40-
<dependency>
41-
<groupId>com.fasterxml.jackson.core</groupId>
42-
<artifactId>jackson-annotations</artifactId>
43-
</dependency>
4440
<dependency>
4541
<groupId>com.fasterxml.jackson.core</groupId>
4642
<artifactId>jackson-core</artifactId>
@@ -54,6 +50,12 @@
5450
<artifactId>guice</artifactId>
5551
<version>${version.guice}</version>
5652
</dependency>
53+
54+
<dependency>
55+
<groupId>junit</groupId>
56+
<artifactId>junit</artifactId>
57+
<scope>test</scope>
58+
</dependency>
5759
</dependencies>
5860

5961
<build>

‎guice7/pom.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737

3838
<dependencies>
3939
<!-- Extends Jackson mapper, but also uses types from core, hence direct dep as well -->
40-
<dependency>
41-
<groupId>com.fasterxml.jackson.core</groupId>
42-
<artifactId>jackson-annotations</artifactId>
43-
</dependency>
4440
<dependency>
4541
<groupId>com.fasterxml.jackson.core</groupId>
4642
<artifactId>jackson-core</artifactId>
@@ -54,6 +50,12 @@
5450
<artifactId>guice</artifactId>
5551
<version>${version.guice}</version>
5652
</dependency>
53+
54+
<dependency>
55+
<groupId>junit</groupId>
56+
<artifactId>junit</artifactId>
57+
<scope>test</scope>
58+
</dependency>
5759
</dependencies>
5860

5961
<build>

‎jakarta-xmlbind/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
<version>2.1.0</version>
7676
</dependency>
7777

78+
<dependency>
79+
<groupId>junit</groupId>
80+
<artifactId>junit</artifactId>
81+
<scope>test</scope>
82+
</dependency>
83+
7884
<!-- may also need JAXB impl for tests -->
7985
<dependency>
8086
<groupId>org.glassfish.jaxb</groupId>

‎jaxb/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ for configuring data-binding.
7474
<version>1.2.2</version>
7575
</dependency>
7676

77+
<dependency>
78+
<groupId>junit</groupId>
79+
<artifactId>junit</artifactId>
80+
<scope>test</scope>
81+
</dependency>
82+
7783
<!-- may also need JAXB impl for tests -->
7884
<!-- 20-May-2024, tatu: no longer needed it seems:
7985
<dependency>

‎mrbean/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ ${project.groupId}.mrbean.*;version=${project.version}
6161
<groupId>org.ow2.asm</groupId>
6262
<artifactId>asm</artifactId>
6363
</dependency>
64+
65+
<dependency>
66+
<groupId>junit</groupId>
67+
<artifactId>junit</artifactId>
68+
<scope>test</scope>
69+
</dependency>
6470
</dependencies>
6571

6672
<build>

‎no-ctor-deser/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141
<groupId>com.fasterxml.jackson.core</groupId>
4242
<artifactId>jackson-databind</artifactId>
4343
</dependency>
44+
45+
<dependency>
46+
<groupId>junit</groupId>
47+
<artifactId>junit</artifactId>
48+
<scope>test</scope>
49+
</dependency>
4450
</dependencies>
4551

4652
<build>

‎osgi/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
<artifactId>org.osgi.core</artifactId>
4747
<version>${version.osgi.core}</version>
4848
</dependency>
49+
<dependency>
50+
<groupId>junit</groupId>
51+
<artifactId>junit</artifactId>
52+
<scope>test</scope>
53+
</dependency>
4954
<dependency>
5055
<groupId>org.mockito</groupId>
5156
<artifactId>mockito-all</artifactId>
@@ -82,7 +87,6 @@
8287
<plugin>
8388
<groupId>org.apache.maven.plugins</groupId>
8489
<artifactId>maven-surefire-plugin</artifactId>
85-
<version>3.0.0-M8</version>
8690
<configuration>
8791
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
8892
</configuration>

0 commit comments

Comments
 (0)