Skip to content

Commit 4643985

Browse files
JohannesJanderJohannesJander
committed
Version bump of dependencies
1 parent 3be7ed2 commit 4643985

File tree

2 files changed

+78
-17
lines changed

2 files changed

+78
-17
lines changed

‎pom.xml‎

Lines changed: 76 additions & 15 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.16-SNAPSHOT</version>
6+
<version>0.6.17-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<issueManagement>
99
<url>https://github.com/frictionlessdata/tableschema-java/issues</url>
@@ -20,13 +20,14 @@
2020
<java.version>8</java.version>
2121
<maven.compiler.source>${java.version}</maven.compiler.source>
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
23-
<google-guava.version>31.1-jre</google-guava.version>
24-
<apache-commons-lang3.version>3.12.0</apache-commons-lang3.version>
25-
<apache-commons-csv.version>1.10.0</apache-commons-csv.version>
26-
<apache-commons-validator.version>1.7</apache-commons-validator.version>
27-
<geotools.version>24.6</geotools.version>
28-
<jackson.version>2.15.1</jackson.version>
29-
<junit.version>5.9.1</junit.version>
23+
<maven.compiler.release>${java.version}</maven.compiler.release>
24+
<google-guava.version>33.4.0-jre</google-guava.version>
25+
<apache-commons-lang3.version>3.17.0</apache-commons-lang3.version>
26+
<apache-commons-csv.version>1.13.0</apache-commons-csv.version>
27+
<apache-commons-validator.version>1.9.0</apache-commons-validator.version>
28+
<geotools.version>32.2</geotools.version>
29+
<jackson.version>2.18.3</jackson.version>
30+
<junit.version>5.12.0</junit.version>
3031
<locationtech-jts.version>1.19.0</locationtech-jts.version>
3132
<networknt-validator-version>1.0.76</networknt-validator-version>
3233
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
@@ -39,8 +40,8 @@
3940
<maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
4041
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
4142
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
42-
<dependency-check-maven.version>7.4.4</dependency-check-maven.version>
43-
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
43+
<dependency-check-maven.version>12.1.0</dependency-check-maven.version>
44+
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
4445
</properties>
4546
<repositories>
4647
<repository>
@@ -232,8 +233,8 @@
232233

233234
</plugins>
234235
</build>
235-
<dependencies>
236236

237+
<dependencies>
237238
<!-- Dependencies for Bean-based Schema inferal -->
238239
<dependency>
239240
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -257,15 +258,55 @@
257258
<!-- Dependencies for Geopoint/Geojson Fields -->
258259
<dependency>
259260
<groupId>org.geotools</groupId>
260-
<artifactId>gt-opengis</artifactId>
261+
<artifactId>gt-main</artifactId>
261262
<version>${geotools.version}</version>
263+
<exclusions>
264+
<exclusion>
265+
<groupId>org.eclipse.emf</groupId>
266+
<artifactId>org.eclipse.emf.common</artifactId>
267+
</exclusion>
268+
<exclusion>
269+
<groupId>org.geotools</groupId>
270+
<artifactId>gt-http</artifactId>
271+
</exclusion>
272+
</exclusions>
273+
</dependency>
274+
<dependency>
275+
<groupId>org.geotools</groupId>
276+
<artifactId>gt-api</artifactId>
277+
<version>${geotools.version}</version>
278+
<exclusions>
279+
<exclusion>
280+
<groupId>org.eclipse.emf</groupId>
281+
<artifactId>org.eclipse.emf.common</artifactId>
282+
</exclusion>
283+
</exclusions>
284+
</dependency>
285+
<dependency>
286+
<groupId>org.geotools</groupId>
287+
<artifactId>gt-metadata</artifactId>
288+
<version>${geotools.version}</version>
289+
<exclusions>
290+
<exclusion>
291+
<groupId>org.eclipse.emf</groupId>
292+
<artifactId>org.eclipse.emf.common</artifactId>
293+
</exclusion>
294+
<exclusion>
295+
<groupId>org.geotools.ogc</groupId>
296+
<artifactId>net.opengis.ows</artifactId>
297+
</exclusion>
298+
</exclusions>
262299
</dependency>
263-
264-
<!-- Dependencies for Geopoint/Geojson Fields -->
265300
<dependency>
266301
<groupId>org.geotools</groupId>
267-
<artifactId>gt-geometry</artifactId>
302+
<artifactId>gt-referencing</artifactId>
268303
<version>${geotools.version}</version>
304+
<exclusions>
305+
<exclusion>
306+
<groupId>org.eclipse.emf</groupId>
307+
<artifactId>org.eclipse.emf.common</artifactId>
308+
</exclusion>
309+
</exclusions>
269310
</dependency>
270311

271312
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
@@ -280,6 +321,20 @@
280321
<groupId>commons-validator</groupId>
281322
<artifactId>commons-validator</artifactId>
282323
<version>${apache-commons-validator.version}</version>
324+
<exclusions>
325+
<exclusion>
326+
<groupId>commons-beanutils</groupId>
327+
<artifactId>commons-beanutils</artifactId>
328+
</exclusion>
329+
<exclusion>
330+
<groupId>commons-logging</groupId>
331+
<artifactId>commons-logging</artifactId>
332+
</exclusion>
333+
<exclusion>
334+
<groupId>commons-digester</groupId>
335+
<artifactId>commons-digester</artifactId>
336+
</exclusion>
337+
</exclusions>
283338
</dependency>
284339
<!-- https://commons.apache.org/proper/commons-csv/ -->
285340
<dependency>
@@ -293,6 +348,12 @@
293348
<groupId>com.networknt</groupId>
294349
<artifactId>json-schema-validator</artifactId>
295350
<version>${networknt-validator-version}</version>
351+
<exclusions>
352+
<exclusion>
353+
<groupId>ch.qos.logback</groupId>
354+
<artifactId>logback-classic</artifactId>
355+
</exclusion>
356+
</exclusions>
296357
</dependency>
297358

298359
<dependency>

‎src/main/java/io/frictionlessdata/tableschema/schema/BeanSchema.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import io.frictionlessdata.tableschema.field.*;
1515
import io.frictionlessdata.tableschema.util.ReflectionUtil;
1616
import org.apache.commons.lang3.StringUtils;
17-
import org.geotools.geometry.DirectPosition2D;
17+
import org.geotools.geometry.Position2D;
1818
import org.locationtech.jts.geom.Coordinate;
1919

2020
import java.math.BigDecimal;
@@ -143,7 +143,7 @@ else if ((declaredClass.equals(LocalTime.class))
143143
|| (declaredClass.equals(OffsetTime.class)))
144144
field = new TimeField(name);
145145
else if ((declaredClass.equals(Coordinate.class))
146-
|| (declaredClass.equals(DirectPosition2D.class)))
146+
|| (declaredClass.equals(Position2D.class)))
147147
field = new GeopointField(name);
148148
else if (declaredClass.equals(JsonNode.class))
149149
field = new ObjectField(name);

0 commit comments

Comments
 (0)