File tree Expand file tree Collapse file tree 7 files changed +16
-36
lines changed
src/test/java/oracle/kubernetes/operator/utils
src/test/java/oracle/kubernetes/operator/utils Expand file tree Collapse file tree 7 files changed +16
-36
lines changed Original file line number Diff line number Diff line change 59
59
<dependency >
60
60
<groupId >com.google.guava</groupId >
61
61
<artifactId >guava</artifactId >
62
- <version >25.1-jre </version >
62
+ <version >${guava-version} </version >
63
63
</dependency >
64
64
<dependency >
65
65
<groupId >org.yaml</groupId >
66
66
<artifactId >snakeyaml</artifactId >
67
- <version >1.21 </version >
67
+ <version >${snakeyaml-version} </version >
68
68
</dependency >
69
69
<dependency >
70
70
<groupId >io.kubernetes</groupId >
Original file line number Diff line number Diff line change 77
77
<dependency >
78
78
<groupId >org.yaml</groupId >
79
79
<artifactId >snakeyaml</artifactId >
80
- <version >1.19 </version >
80
+ <version >${snakeyaml-version} </version >
81
81
<scope >test</scope >
82
82
</dependency >
83
83
<dependency >
84
84
<groupId >com.google.guava</groupId >
85
85
<artifactId >guava</artifactId >
86
- <version >22.0 </version >
86
+ <version >${guava-version} </version >
87
87
<scope >test</scope >
88
88
</dependency >
89
89
</dependencies >
Original file line number Diff line number Diff line change 6
6
7
7
import io .kubernetes .client .custom .IntOrString ;
8
8
import io .kubernetes .client .custom .Quantity ;
9
- import java .util .Map ;
10
9
import java .util .Objects ;
11
- import java .util .TreeMap ;
12
10
import org .hamcrest .Description ;
13
11
import org .hamcrest .TypeSafeDiagnosingMatcher ;
14
12
import org .yaml .snakeyaml .DumperOptions ;
@@ -47,12 +45,6 @@ private MyRepresenter() {
47
45
representers .put (IntOrString .class , new RepresentIntOrString ());
48
46
}
49
47
50
- @ Override
51
- protected Node representMapping (Tag tag , Map <?, ?> mapping , Boolean flowStyle ) {
52
- Map <?, ?> sortedMapping = new TreeMap <>(mapping );
53
- return super .representMapping (tag , sortedMapping , flowStyle );
54
- }
55
-
56
48
private class RepresentIntOrString implements Represent {
57
49
public Node representData (Object data ) {
58
50
IntOrString val = (IntOrString ) data ;
Original file line number Diff line number Diff line change 114
114
<dependency >
115
115
<groupId >com.fasterxml.jackson.core</groupId >
116
116
<artifactId >jackson-annotations</artifactId >
117
- <version >2.9.6 </version >
117
+ <version >${jackson-version} </version >
118
118
</dependency >
119
119
<dependency >
120
120
<groupId >org.hamcrest</groupId >
129
129
<dependency >
130
130
<groupId >com.fasterxml.jackson.core</groupId >
131
131
<artifactId >jackson-databind</artifactId >
132
- <version >2.9.6 </version >
132
+ <version >${jackson-version} </version >
133
133
<scope >test</scope >
134
134
</dependency >
135
135
<dependency >
136
136
<groupId >org.yaml</groupId >
137
137
<artifactId >snakeyaml</artifactId >
138
- <version >1.19 </version >
138
+ <version >${snakeyaml-version} </version >
139
139
<scope >test</scope >
140
140
</dependency >
141
141
<dependency >
142
142
<groupId >com.fasterxml.jackson.dataformat</groupId >
143
143
<artifactId >jackson-dataformat-yaml</artifactId >
144
- <version >2.9.6 </version >
144
+ <version >${jackson-version} </version >
145
145
<scope >test</scope >
146
146
</dependency >
147
147
<dependency >
Original file line number Diff line number Diff line change 252
252
<dependency >
253
253
<groupId >com.fasterxml.jackson.dataformat</groupId >
254
254
<artifactId >jackson-dataformat-yaml</artifactId >
255
- <version >2.9.2 </version >
255
+ <version >${jackson-version} </version >
256
256
<type >jar</type >
257
257
</dependency >
258
258
<dependency >
261
261
<version >1.11</version >
262
262
<type >jar</type >
263
263
</dependency >
264
- <dependency >
265
- <groupId >org.codehaus.jackson</groupId >
266
- <artifactId >jackson-core-asl</artifactId >
267
- <version >1.9.11</version >
268
- <type >jar</type >
269
- </dependency >
270
264
<dependency >
271
265
<groupId >io.kubernetes</groupId >
272
266
<artifactId >client-java</artifactId >
286
280
<dependency >
287
281
<groupId >com.google.guava</groupId >
288
282
<artifactId >guava</artifactId >
289
- <version >22.0 </version >
283
+ <version >${guava-version} </version >
290
284
</dependency >
291
285
<dependency >
292
286
<groupId >org.slf4j</groupId >
304
298
<dependency >
305
299
<groupId >org.yaml</groupId >
306
300
<artifactId >snakeyaml</artifactId >
307
- <version >1.19 </version >
301
+ <version >${snakeyaml-version} </version >
308
302
</dependency >
309
303
310
304
<!-- test dependencies -->
Original file line number Diff line number Diff line change 6
6
7
7
import io .kubernetes .client .custom .IntOrString ;
8
8
import io .kubernetes .client .custom .Quantity ;
9
- import java .util .Map ;
10
9
import java .util .Objects ;
11
- import java .util .TreeMap ;
12
10
import org .hamcrest .Description ;
13
11
import org .hamcrest .TypeSafeDiagnosingMatcher ;
14
12
import org .yaml .snakeyaml .DumperOptions ;
@@ -47,12 +45,6 @@ private MyRepresenter() {
47
45
representers .put (IntOrString .class , new RepresentIntOrString ());
48
46
}
49
47
50
- @ Override
51
- protected Node representMapping (Tag tag , Map <?, ?> mapping , Boolean flowStyle ) {
52
- Map <?, ?> sortedMapping = new TreeMap <>(mapping );
53
- return super .representMapping (tag , sortedMapping , flowStyle );
54
- }
55
-
56
48
private class RepresentIntOrString implements Represent {
57
49
public Node representData (Object data ) {
58
50
IntOrString val = (IntOrString ) data ;
Original file line number Diff line number Diff line change 300
300
<java .version>1.8</java .version>
301
301
<maven .compiler.source>${java.version} </maven .compiler.source>
302
302
<maven .compiler.target>${java.version} </maven .compiler.target>
303
- <swagger-core-version >1.5.15 </swagger-core-version >
304
- <jodatime-version >2.9.3 </jodatime-version >
303
+ <swagger-core-version >1.5.21 </swagger-core-version >
304
+ <jodatime-version >2.10.1 </jodatime-version >
305
305
<maven-plugin-version >1.0.0</maven-plugin-version >
306
306
<junit-version >4.12</junit-version >
307
307
<project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
308
308
<jersey-version >2.26
309
309
</jersey-version > <!-- switched from 2.23 to 2.26 to get the RestServer to work -->
310
- <jackson-version >2.9.6</jackson-version >
310
+ <jackson-version >2.9.7</jackson-version >
311
+ <snakeyaml-version >1.23</snakeyaml-version >
312
+ <guava-version >27.0.1-jre</guava-version >
311
313
<root-generated-swagger >${project.basedir} /src-generated-swagger</root-generated-swagger >
312
314
<src-generated-swagger >${root-generated-swagger} /main/java</src-generated-swagger >
313
315
<domain-swagger-file >${project.basedir} /swagger/domain.json</domain-swagger-file >
You can’t perform that action at this time.
0 commit comments