Skip to content

Commit a661ca6

Browse files
JohannesJanderJohannesJander
committed
Grooming of pom.xml
1 parent 9e96bbf commit a661ca6

File tree

8 files changed

+176
-178
lines changed

8 files changed

+176
-178
lines changed

‎pom.xml‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.frictionlessdata</groupId>
55
<artifactId>tableschema-java</artifactId>
6-
<version>0.6.4-SNAPSHOT</version>
6+
<version>0.6.5-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<issueManagement>
99
<url>https://github.com/frictionlessdata/tableschema-java/issues</url>
@@ -16,6 +16,7 @@
1616
</scm>
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1920
<java.version>8</java.version>
2021
<maven.compiler.source>${java.version}</maven.compiler.source>
2122
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -27,7 +28,7 @@
2728
<jackson.version>2.14.1</jackson.version>
2829
<junit.version>5.9.1</junit.version>
2930
<locationtech-jts.version>1.19.0</locationtech-jts.version>
30-
<networknt-validator-version>1.0.73</networknt-validator-version>
31+
<networknt-validator-version>1.0.75</networknt-validator-version>
3132
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
3233
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
3334
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
@@ -38,6 +39,7 @@
3839
<maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
3940
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
4041
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
42+
<dependency-check-maven.version>7.1.0</dependency-check-maven.version>
4143
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
4244
</properties>
4345
<repositories>
@@ -57,11 +59,12 @@
5759
<artifactId>maven-compiler-plugin</artifactId>
5860
<version>${maven-compiler-plugin.version}</version>
5961
<configuration>
60-
<encoding>utf-8</encoding>
62+
<encoding>UTF-8</encoding>
6163
<source>${maven.compiler.source}</source>
6264
<target>${maven.compiler.target}</target>
6365
</configuration>
6466
</plugin>
67+
6568
<plugin>
6669
<groupId>org.apache.maven.plugins</groupId>
6770
<artifactId>maven-resources-plugin</artifactId>
@@ -70,12 +73,14 @@
7073
<encoding>UTF-8</encoding>
7174
</configuration>
7275
</plugin>
76+
7377
<plugin>
7478
<groupId>org.apache.maven.plugins</groupId>
7579
<artifactId>maven-surefire-plugin</artifactId>
7680
<version>${maven-surefire-plugin.version}</version>
7781
<configuration />
7882
</plugin>
83+
7984
<plugin>
8085
<groupId>org.apache.maven.plugins</groupId>
8186
<artifactId>maven-source-plugin</artifactId>
@@ -89,6 +94,7 @@
8994
</execution>
9095
</executions>
9196
</plugin>
97+
9298
<plugin>
9399
<groupId>org.apache.maven.plugins</groupId>
94100
<artifactId>maven-javadoc-plugin</artifactId>
@@ -108,7 +114,7 @@
108114
</execution>
109115
</executions>
110116
</plugin>
111-
117+
<!--
112118
<plugin>
113119
<artifactId>maven-deploy-plugin</artifactId>
114120
<version>${maven-deploy-plugin.version}</version>
@@ -122,7 +128,7 @@
122128
</execution>
123129
</executions>
124130
</plugin>
125-
131+
-->
126132
<plugin>
127133
<groupId>org.apache.maven.plugins</groupId>
128134
<artifactId>maven-gpg-plugin</artifactId>
@@ -189,10 +195,11 @@
189195
</execution>
190196
</executions>
191197
</plugin>
198+
192199
<plugin>
193200
<groupId>org.owasp</groupId>
194201
<artifactId>dependency-check-maven</artifactId>
195-
<version>7.1.0</version>
202+
<version>${dependency-check-maven.version}</version>
196203
<executions>
197204
<execution>
198205
<goals>
@@ -201,23 +208,10 @@
201208
</execution>
202209
</executions>
203210
</plugin>
211+
204212
</plugins>
205213
</build>
206214
<dependencies>
207-
<!-- Unit Testing -->
208-
<dependency>
209-
<groupId>org.junit.jupiter</groupId>
210-
<artifactId>junit-jupiter-engine</artifactId>
211-
<version>${junit.version}</version>
212-
<scope>test</scope>
213-
</dependency>
214-
215-
<dependency>
216-
<groupId>org.junit.vintage</groupId>
217-
<artifactId>junit-vintage-engine</artifactId>
218-
<version>${junit.version}</version>
219-
<scope>test</scope>
220-
</dependency>
221215

222216
<!-- Dependencies for Bean-based Schema inferal -->
223217
<dependency>
@@ -226,40 +220,32 @@
226220
<version>${jackson.version}</version>
227221
</dependency>
228222

229-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
223+
<!-- Jackson support for new Java data/time API. For Date/DateTime/Time ec. Fields -->
230224
<dependency>
231225
<groupId>com.fasterxml.jackson.datatype</groupId>
232226
<artifactId>jackson-datatype-jsr310</artifactId>
233227
<version>${jackson.version}</version>
234228
</dependency>
235229

236-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
237230
<dependency>
238231
<groupId>com.fasterxml.jackson.core</groupId>
239232
<artifactId>jackson-databind</artifactId>
240233
<version>${jackson.version}</version>
241234
</dependency>
242235

243-
<!-- https://mvnrepository.com/artifact/org.geotools/gt-opengis -->
236+
<!-- Dependencies for Geopoint/Geojson Fields -->
244237
<dependency>
245238
<groupId>org.geotools</groupId>
246239
<artifactId>gt-opengis</artifactId>
247240
<version>${geotools.version}</version>
248241
</dependency>
249242

250-
<!-- https://mvnrepository.com/artifact/org.geotools/gt-geometry-->
243+
<!-- Dependencies for Geopoint/Geojson Fields -->
251244
<dependency>
252245
<groupId>org.geotools</groupId>
253246
<artifactId>gt-geometry</artifactId>
254247
<version>${geotools.version}</version>
255248
</dependency>
256-
<!-- https://mvnrepository.com/artifact/org.locationtech.jts/jts-core -->
257-
<dependency>
258-
<groupId>org.locationtech.jts</groupId>
259-
<artifactId>jts-core</artifactId>
260-
<version>${locationtech-jts.version}</version>
261-
</dependency>
262-
<!-- End Dependencies for Bean-based Schema inferal -->
263249

264250
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
265251
<dependency>
@@ -293,5 +279,14 @@
293279
<artifactId>guava</artifactId>
294280
<version>${google-guava.version}</version>
295281
</dependency>
282+
283+
<!-- Unit Testing -->
284+
<dependency>
285+
<groupId>org.junit.jupiter</groupId>
286+
<artifactId>junit-jupiter-engine</artifactId>
287+
<version>${junit.version}</version>
288+
<scope>test</scope>
289+
</dependency>
290+
296291
</dependencies>
297292
</project>

‎src/test/java/io/frictionlessdata/tableschema/field/FieldFormatTests.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.frictionlessdata.tableschema.field;
22

33
import io.frictionlessdata.tableschema.exception.TypeInferringException;
4-
import org.junit.Assert;
54
import org.junit.jupiter.api.Assertions;
65
import org.junit.jupiter.api.DisplayName;
76
import org.junit.jupiter.api.Test;
@@ -20,9 +19,9 @@ class FieldFormatTests {
2019
void formatBooleanField() {
2120
BooleanField field = new BooleanField("bf");
2221
String val = field.formatValueAsString(true, null, null);
23-
Assert.assertEquals("true", val);
22+
Assertions.assertEquals("true", val);
2423
val = field.formatValueAsString(false, null, null);
25-
Assert.assertEquals("false", val);
24+
Assertions.assertEquals("false", val);
2625
}
2726

2827
@Test
@@ -34,9 +33,9 @@ void formatBooleanField2() {
3433

3534
BooleanField field = new BooleanField("bf");
3635
String val = field.formatValueAsString(true, null, options);
37-
Assert.assertEquals("da", val);
36+
Assertions.assertEquals("da", val);
3837
val = field.formatValueAsString(false, null, options);
39-
Assert.assertEquals("njet", val);
38+
Assertions.assertEquals("njet", val);
4039
}
4140

4241
@Test
@@ -68,15 +67,15 @@ void parseBooleanFieldWithCustomFalseValues() {
6867
void formatGeopointField() {
6968
GeopointField field = new GeopointField("gpf");
7069
String val = field.formatValueAsString(new double[]{123.45, 56.789}, null, null);
71-
Assert.assertEquals("123.45,56.789", val);
70+
Assertions.assertEquals("123.45,56.789", val);
7271
val = field.formatValueAsString(new double[]{123.45, 56.789}, Field.FIELD_FORMAT_DEFAULT, null);
73-
Assert.assertEquals("123.45,56.789", val);
72+
Assertions.assertEquals("123.45,56.789", val);
7473
val = field.formatValueAsString(new double[]{123.45, 56.789}, Field.FIELD_FORMAT_ARRAY, null);
75-
Assert.assertEquals("[123.45,56.789]", val);
74+
Assertions.assertEquals("[123.45,56.789]", val);
7675
val = field.formatValueAsString(new double[]{123.45, 56.789}, Field.FIELD_FORMAT_OBJECT, null);
77-
Assert.assertEquals("{\"lon\": 123.45, \"lat\":56.789}", val);
76+
Assertions.assertEquals("{\"lon\": 123.45, \"lat\":56.789}", val);
7877
val = field.formatValueAsString(new double[]{123.45, 56.789}, "invalid", null);
79-
Assert.assertNull(val);
78+
Assertions.assertNull(val);
8079
}
8180

8281

‎src/test/java/io/frictionlessdata/tableschema/field/NumberFieldTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.frictionlessdata.tableschema.field;
22

3-
import org.junit.Assert;
3+
import org.junit.jupiter.api.Assertions;
44
import org.junit.jupiter.api.BeforeAll;
55
import org.junit.jupiter.api.DisplayName;
66
import org.junit.jupiter.api.Test;
@@ -24,15 +24,15 @@ static void setUp() {
2424
void formatNumberField() {
2525
NumberField field = new NumberField("test");
2626
String val = field.formatValueAsString(123123.123, null, null);
27-
Assert.assertEquals("123123.123", val);
27+
Assertions.assertEquals("123123.123", val);
2828
}
2929

3030
@Test
3131
@DisplayName("format number values via non-default settings")
3232
void formatNumberField2() {
3333
NumberField field = new NumberField("test");
3434
String val = field.formatValueAsString(1234567890.123, null, germanOptions);
35-
Assert.assertEquals("1.234.567.890,123", val);
35+
Assertions.assertEquals("1.234.567.890,123", val);
3636
}
3737

3838
@Test
@@ -41,27 +41,27 @@ void formatNumberField4() {
4141
NumberField field = new NumberField("test");
4242
String val = field.formatValueAsString(123.678f, null, germanOptions);
4343
// value is not exact due to floating point
44-
Assert.assertEquals("123,6780014038086" , val);
44+
Assertions.assertEquals("123,6780014038086" , val);
4545
}
4646

4747
@Test
4848
@DisplayName("format number values with barNumbers allowed")
4949
void formatNumberField3() {
5050
NumberField field = new NumberField("test");
5151
Number val = field.parseValue("123.234€", null, bareNumberOptions);
52-
Assert.assertEquals(123.234, val.doubleValue(), 0);
52+
Assertions.assertEquals(123.234, val.doubleValue(), 0);
5353
}
5454

5555
@Test
5656
@DisplayName("format NAN/INF double values")
5757
void formatNumberFieldNan() {
5858
NumberField field = new NumberField("test");
5959
String val = field.formatValueAsString(Double.NaN, null, null);
60-
Assert.assertEquals("NAN", val);
60+
Assertions.assertEquals("NAN", val);
6161
val = field.formatValueAsString(Double.POSITIVE_INFINITY, null, null);
62-
Assert.assertEquals("INF", val);
62+
Assertions.assertEquals("INF", val);
6363
val = field.formatValueAsString(Double.NEGATIVE_INFINITY, null, null);
64-
Assert.assertEquals("-INF", val);
64+
Assertions.assertEquals("-INF", val);
6565
}
6666

6767

@@ -70,18 +70,18 @@ void formatNumberFieldNan() {
7070
void formatNumberFieldNan2() {
7171
NumberField field = new NumberField("test");
7272
String val = field.formatValueAsString(Float.NaN, null, null);
73-
Assert.assertEquals("NAN", val);
73+
Assertions.assertEquals("NAN", val);
7474
val = field.formatValueAsString(Float.POSITIVE_INFINITY, null, null);
75-
Assert.assertEquals("INF", val);
75+
Assertions.assertEquals("INF", val);
7676
val = field.formatValueAsString(Float.NEGATIVE_INFINITY, null, null);
77-
Assert.assertEquals("-INF", val);
77+
Assertions.assertEquals("-INF", val);
7878
}
7979

8080
@Test
8181
@DisplayName("format null value")
8282
void formatNumberField6() {
8383
NumberField field = new NumberField("test");
8484
String val = field.formatValueAsString(null, null, null);
85-
Assert.assertNull( val);
85+
Assertions.assertNull( val);
8686
}
8787
}

0 commit comments

Comments
 (0)