Skip to content

Commit 68fb89e

Browse files
UrielChUrielCh
committed
bump all version
1 parent 11ac37c commit 68fb89e

Some content is hidden

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

45 files changed

+241
-201
lines changed

‎accessors-smart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.junit.jupiter</groupId>
4343
<artifactId>junit-jupiter-api</artifactId>
44-
<version>5.6.2</version>
44+
<version>5.7.1</version>
4545
<scope>test</scope>
4646
</dependency>
4747
<dependency>

‎accessors-smart/src/test/java/net/minidev/asm/ASMTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import org.junit.jupiter.api.Test;
88

9-
// import junit.framework.TestCase;
109
import net.minidev.asm.bean.BTest;
1110

1211
public class ASMTest {

‎json-smart-action/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>net.minidev</groupId>
55
<artifactId>minidev-parent</artifactId>
6-
<version>2.3</version>
6+
<version>2.4.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>json-smart-action</artifactId>
@@ -47,11 +47,11 @@
4747
<maven.compiler.target>1.8</maven.compiler.target>
4848
</properties>
4949
<dependencies>
50-
<dependency>
51-
<groupId>junit</groupId>
52-
<artifactId>junit</artifactId>
53-
<scope>test</scope>
54-
</dependency>
50+
<dependency>
51+
<groupId>org.junit.jupiter</groupId>
52+
<artifactId>junit-jupiter-api</artifactId>
53+
<scope>test</scope>
54+
</dependency>
5555
<dependency>
5656
<groupId>net.minidev</groupId>
5757
<artifactId>json-smart</artifactId>

‎json-smart-action/src/main/java/net/minidev/json/actions/traverse/KeysPrintAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public boolean start(JSONObject object) {
1717

1818
@Override
1919
public boolean traverseEntry(String fullPathToEntry, Entry<String, Object> entry) {
20-
System.out.println(entry.getKey());
20+
// System.out.println(entry.getKey());
2121
return true;
2222
}
2323

‎json-smart-action/src/test/java/net/minidev/json/test/actions/ElementRemoverTest.java

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import net.minidev.json.JSONValue;
55
import net.minidev.json.actions.ElementRemover;
66
import net.minidev.json.parser.ParseException;
7-
import org.junit.Test;
87
import org.junit.runner.RunWith;
98
import org.junit.runners.Parameterized;
109

10+
import org.junit.jupiter.api.Test;
11+
1112
import java.util.*;
1213

1314
import static org.junit.Assert.assertEquals;
@@ -58,50 +59,4 @@ public void test() throws ParseException {
5859
er.remove(objectToClean);
5960
assertEquals(expectedObject, objectToClean);
6061
}
61-
62-
// private ElementRemover switchKeyToRemove()
63-
// {
64-
// long m = System.currentTimeMillis();
65-
// if (elementsToRemove == null && m % 4 == 0)
66-
// {
67-
// System.out.println("cast to String");
68-
// return new ElementRemover((String)null);
69-
// }
70-
// else if (elementsToRemove == null && m % 4 == 1)
71-
// {
72-
// System.out.println("cast to String[]");
73-
// return new ElementRemover((String[])null);
74-
// }
75-
// else if (elementsToRemove == null && m % 4 == 2)
76-
// {
77-
// System.out.println("cast to JSONArray");
78-
// return new ElementRemover((JSONArray)null);
79-
// }
80-
// else if (elementsToRemove == null && m % 4 == 3)
81-
// {
82-
// System.out.println("cast to List<String>");
83-
// return new ElementRemover((List<String>)null);
84-
// }
85-
// else if (elementsToRemove instanceof String)
86-
// {
87-
// return new ElementRemover((String) elementsToRemove);
88-
// }
89-
// else if (elementsToRemove instanceof String[])
90-
// {
91-
// return new ElementRemover((String[]) elementsToRemove);
92-
// }
93-
// else if (elementsToRemove instanceof JSONArray)
94-
// {
95-
// return new ElementRemover((JSONArray) elementsToRemove);
96-
// }
97-
// else if (elementsToRemove instanceof List<?>)
98-
// {
99-
// return new ElementRemover((List<String>) elementsToRemove);
100-
// }
101-
// else
102-
// {
103-
// throw new IllegalArgumentException("bad test setup: wrong type of key to remove");
104-
// }
105-
// }
106-
10762
}

‎json-smart-action/src/test/java/net/minidev/json/test/actions/PathLocatorTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
import static org.junit.Assert.assertEquals;
1818

19+
import org.junit.jupiter.api.Test;
20+
1921
/**
2022
* @author adoneitan@gmail.com
2123
*/
@@ -115,16 +117,16 @@ private PathLocator switchKeyToRemove()
115117
{
116118
long m = System.currentTimeMillis();
117119
if (keysToFind == null && m % 4 == 0) {
118-
System.out.println("cast to String");
120+
// System.out.println("cast to String");
119121
return new PathLocator((String)null);
120122
} else if (keysToFind == null && m % 4 == 1) {
121-
System.out.println("cast to String[]");
123+
// System.out.println("cast to String[]");
122124
return new PathLocator((String[])null);
123125
} else if (keysToFind == null && m % 4 == 2) {
124-
System.out.println("cast to JSONArray");
126+
// System.out.println("cast to JSONArray");
125127
return new PathLocator((JSONArray)null);
126128
} else if (keysToFind == null && m % 4 == 3) {
127-
System.out.println("cast to List<String>");
129+
// System.out.println("cast to List<String>");
128130
return new PathLocator((List<String>)null);
129131
} else if (keysToFind instanceof String) {
130132
return new PathLocator((String) keysToFind);

‎json-smart-action/src/test/java/net/minidev/json/test/actions/PathRemoverTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
import static org.junit.Assert.assertEquals;
1818

19+
import org.junit.jupiter.api.Test;
20+
1921
/**
2022
* Tests {@link PathRemover}
2123
*
@@ -90,16 +92,16 @@ private PathRemover switchKeyToRemove()
9092
{
9193
long m = System.currentTimeMillis();
9294
if (keyToRemove == null && m % 4 == 0) {
93-
System.out.println("cast to String");
95+
// System.out.println("cast to String");
9496
return new PathRemover((String)null);
9597
} else if (keyToRemove == null && m % 4 == 1) {
96-
System.out.println("cast to String[]");
98+
// System.out.println("cast to String[]");
9799
return new PathRemover((String[])null);
98100
} else if (keyToRemove == null && m % 4 == 2) {
99-
System.out.println("cast to JSONArray");
101+
// System.out.println("cast to JSONArray");
100102
return new PathRemover((JSONArray)null);
101103
} else if (keyToRemove == null && m % 4 == 3) {
102-
System.out.println("cast to List<String>");
104+
// System.out.println("cast to List<String>");
103105
return new PathRemover((List<String>)null);
104106
} else if (keyToRemove instanceof String) {
105107
return new PathRemover((String)keyToRemove);

‎json-smart-action/src/test/java/net/minidev/json/test/actions/PathReplicatorTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import net.minidev.json.JSONArray;
55
import net.minidev.json.JSONObject;
66
import net.minidev.json.JSONValue;
7-
import org.junit.Test;
87
import org.junit.runner.RunWith;
98
import org.junit.runners.Parameterized;
109

@@ -13,6 +12,8 @@
1312
import java.util.Collection;
1413
import java.util.List;
1514

15+
import org.junit.jupiter.api.Test;
16+
1617
import static org.junit.Assert.assertEquals;
1718

1819
/**
@@ -145,16 +146,16 @@ public void test2() throws Exception {
145146
private PathReplicator switchKeyToCopy() {
146147
long m = System.currentTimeMillis();
147148
if (pathsToCopy == null && m % 4 == 0) {
148-
System.out.println("cast to String");
149+
// System.out.println("cast to String");
149150
return new PathReplicator((String) null);
150151
} else if (pathsToCopy == null && m % 4 == 1) {
151-
System.out.println("cast to String[]");
152+
// System.out.println("cast to String[]");
152153
return new PathReplicator((String[]) null);
153154
} else if (pathsToCopy == null && m % 4 == 2) {
154-
System.out.println("cast to JSONArray");
155+
// System.out.println("cast to JSONArray");
155156
return new PathReplicator((JSONArray) null);
156157
} else if (pathsToCopy == null && m % 4 == 3) {
157-
System.out.println("cast to List<String>");
158+
// System.out.println("cast to List<String>");
158159
return new PathReplicator((List<String>) null);
159160
} else if (pathsToCopy instanceof String) {
160161
return new PathReplicator((String) pathsToCopy);
@@ -172,16 +173,16 @@ private PathReplicator switchKeyToCopy() {
172173
private PathReplicator switchKeyToCopy2() {
173174
long m = System.currentTimeMillis();
174175
if (pathsToCopy == null && m % 4 == 0) {
175-
System.out.println("cast to String");
176+
// System.out.println("cast to String");
176177
return new PathReplicator((String) null);
177178
} else if (pathsToCopy == null && m % 4 == 1) {
178-
System.out.println("cast to String[]");
179+
// System.out.println("cast to String[]");
179180
return new PathReplicator((String[]) null);
180181
} else if (pathsToCopy == null && m % 4 == 2) {
181-
System.out.println("cast to JSONArray");
182+
// System.out.println("cast to JSONArray");
182183
return new PathReplicator((JSONArray) null);
183184
} else if (pathsToCopy == null && m % 4 == 3) {
184-
System.out.println("cast to List<String>");
185+
// System.out.println("cast to List<String>");
185186
return new PathReplicator((List<String>) null);
186187
} else if (pathsToCopy instanceof String) {
187188
return new PathReplicator((String) pathsToCopy);

‎json-smart-action/src/test/java/net/minidev/json/test/actions/PathsRetainerTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import java.util.Collection;
1616
import java.util.List;
1717

18+
import org.junit.jupiter.api.Test;
19+
1820
import static org.junit.Assert.assertEquals;
1921

2022
/**
@@ -122,16 +124,16 @@ public void test() throws ParseException {
122124
private PathsRetainer switchKeyToRemove() {
123125
long m = System.currentTimeMillis();
124126
if (keyToKeep == null && m % 4 == 0) {
125-
System.out.println("cast to String");
127+
// System.out.println("cast to String");
126128
return new PathsRetainer((String) null);
127129
} else if (keyToKeep == null && m % 4 == 1) {
128-
System.out.println("cast to String[]");
130+
// System.out.println("cast to String[]");
129131
return new PathsRetainer((String[]) null);
130132
} else if (keyToKeep == null && m % 4 == 2) {
131-
System.out.println("cast to JSONArray");
133+
// System.out.println("cast to JSONArray");
132134
return new PathsRetainer((JSONArray) null);
133135
} else if (keyToKeep == null && m % 4 == 3) {
134-
System.out.println("cast to List<String>");
136+
// System.out.println("cast to List<String>");
135137
return new PathsRetainer((List<String>) null);
136138
} else if (keyToKeep instanceof String) {
137139
return new PathsRetainer((String) keyToKeep);

‎json-smart/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>net.minidev</groupId>
55
<artifactId>minidev-parent</artifactId>
6-
<version>2.4</version>
6+
<version>2.4.1</version>
77
</parent>
88
<!-- this POM is released under an Apache 2.0 license -->
99
<modelVersion>4.0.0</modelVersion>
@@ -49,9 +49,9 @@
4949
</properties>
5050
<dependencies>
5151
<dependency>
52-
<groupId>junit</groupId>
53-
<artifactId>junit</artifactId>
54-
<scope>test</scope>
52+
<groupId>org.junit.jupiter</groupId>
53+
<artifactId>junit-jupiter-api</artifactId>
54+
<scope>test</scope>
5555
</dependency>
5656
<dependency>
5757
<groupId>net.minidev</groupId>

0 commit comments

Comments
 (0)