Skip to content

Commit da0cdf4

Browse files
JohannesJanderJohannesJander
committed
Updated dependencies, excluded some transitive dependencies with security issues
1 parent 3be7ed2 commit da0cdf4

File tree

2 files changed

+102
-60
lines changed

2 files changed

+102
-60
lines changed

‎pom.xml‎

Lines changed: 100 additions & 58 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>
@@ -69,26 +70,7 @@
6970
<groupId>org.apache.maven.plugins</groupId>
7071
<artifactId>maven-resources-plugin</artifactId>
7172
<version>${maven-resources-plugin.version}</version>
72-
<!--
73-
<executions>
74-
<execution>
75-
<id>copy-javadoc</id>
76-
<phase>package</phase>
77-
<goals>
78-
<goal>testResources</goal>
79-
</goals>
80-
<configuration>
81-
<outputDirectory>${basedir}/docs/javadoc</outputDirectory>
82-
<resources>
83-
<resource>
84-
<directory>${basedir}/target/apidocs</directory>
85-
<filtering>false</filtering>
86-
</resource>
87-
</resources>
88-
</configuration>
89-
</execution>
90-
</executions>
91-
-->
73+
9274
<configuration>
9375
<encoding>UTF-8</encoding>
9476
</configuration>
@@ -135,21 +117,21 @@
135117
</execution>
136118
</executions>
137119
</plugin>
138-
<!--
139-
<plugin>
140-
<artifactId>maven-deploy-plugin</artifactId>
141-
<version>${maven-deploy-plugin.version}</version>
142-
<executions>
143-
<execution>
144-
<id>default-deploy</id>
145-
<phase>deploy</phase>
146-
<goals>
147-
<goal>deploy</goal>
148-
</goals>
149-
</execution>
150-
</executions>
151-
</plugin>
152-
-->
120+
<!--
121+
<plugin>
122+
<artifactId>maven-deploy-plugin</artifactId>
123+
<version>${maven-deploy-plugin.version}</version>
124+
<executions>
125+
<execution>
126+
<id>default-deploy</id>
127+
<phase>deploy</phase>
128+
<goals>
129+
<goal>deploy</goal>
130+
</goals>
131+
</execution>
132+
</executions>
133+
</plugin>
134+
-->
153135
<plugin>
154136
<groupId>org.apache.maven.plugins</groupId>
155137
<artifactId>maven-gpg-plugin</artifactId>
@@ -232,8 +214,8 @@
232214

233215
</plugins>
234216
</build>
235-
<dependencies>
236217

218+
<dependencies>
237219
<!-- Dependencies for Bean-based Schema inferal -->
238220
<dependency>
239221
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -248,24 +230,64 @@
248230
<version>${jackson.version}</version>
249231
</dependency>
250232

251-
<dependency>
252-
<groupId>com.fasterxml.jackson.core</groupId>
253-
<artifactId>jackson-databind</artifactId>
254-
<version>${jackson.version}</version>
255-
</dependency>
233+
<dependency>
234+
<groupId>com.fasterxml.jackson.core</groupId>
235+
<artifactId>jackson-databind</artifactId>
236+
<version>${jackson.version}</version>
237+
</dependency>
256238

257239
<!-- Dependencies for Geopoint/Geojson Fields -->
258240
<dependency>
259241
<groupId>org.geotools</groupId>
260-
<artifactId>gt-opengis</artifactId>
242+
<artifactId>gt-main</artifactId>
261243
<version>${geotools.version}</version>
244+
<exclusions>
245+
<exclusion>
246+
<groupId>org.eclipse.emf</groupId>
247+
<artifactId>org.eclipse.emf.common</artifactId>
248+
</exclusion>
249+
<exclusion>
250+
<groupId>org.geotools</groupId>
251+
<artifactId>gt-http</artifactId>
252+
</exclusion>
253+
</exclusions>
254+
</dependency>
255+
<dependency>
256+
<groupId>org.geotools</groupId>
257+
<artifactId>gt-api</artifactId>
258+
<version>${geotools.version}</version>
259+
<exclusions>
260+
<exclusion>
261+
<groupId>org.eclipse.emf</groupId>
262+
<artifactId>org.eclipse.emf.common</artifactId>
263+
</exclusion>
264+
</exclusions>
265+
</dependency>
266+
<dependency>
267+
<groupId>org.geotools</groupId>
268+
<artifactId>gt-metadata</artifactId>
269+
<version>${geotools.version}</version>
270+
<exclusions>
271+
<exclusion>
272+
<groupId>org.eclipse.emf</groupId>
273+
<artifactId>org.eclipse.emf.common</artifactId>
274+
</exclusion>
275+
<exclusion>
276+
<groupId>org.geotools.ogc</groupId>
277+
<artifactId>net.opengis.ows</artifactId>
278+
</exclusion>
279+
</exclusions>
262280
</dependency>
263-
264-
<!-- Dependencies for Geopoint/Geojson Fields -->
265281
<dependency>
266282
<groupId>org.geotools</groupId>
267-
<artifactId>gt-geometry</artifactId>
283+
<artifactId>gt-referencing</artifactId>
268284
<version>${geotools.version}</version>
285+
<exclusions>
286+
<exclusion>
287+
<groupId>org.eclipse.emf</groupId>
288+
<artifactId>org.eclipse.emf.common</artifactId>
289+
</exclusion>
290+
</exclusions>
269291
</dependency>
270292

271293
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
@@ -280,6 +302,20 @@
280302
<groupId>commons-validator</groupId>
281303
<artifactId>commons-validator</artifactId>
282304
<version>${apache-commons-validator.version}</version>
305+
<exclusions>
306+
<exclusion>
307+
<groupId>commons-beanutils</groupId>
308+
<artifactId>commons-beanutils</artifactId>
309+
</exclusion>
310+
<exclusion>
311+
<groupId>commons-logging</groupId>
312+
<artifactId>commons-logging</artifactId>
313+
</exclusion>
314+
<exclusion>
315+
<groupId>commons-digester</groupId>
316+
<artifactId>commons-digester</artifactId>
317+
</exclusion>
318+
</exclusions>
283319
</dependency>
284320
<!-- https://commons.apache.org/proper/commons-csv/ -->
285321
<dependency>
@@ -290,9 +326,15 @@
290326

291327
<!-- JSON Schema Validator -->
292328
<dependency>
293-
<groupId>com.networknt</groupId>
294-
<artifactId>json-schema-validator</artifactId>
295-
<version>${networknt-validator-version}</version>
329+
<groupId>com.networknt</groupId>
330+
<artifactId>json-schema-validator</artifactId>
331+
<version>${networknt-validator-version}</version>
332+
<exclusions>
333+
<exclusion>
334+
<groupId>ch.qos.logback</groupId>
335+
<artifactId>logback-classic</artifactId>
336+
</exclusion>
337+
</exclusions>
296338
</dependency>
297339

298340
<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)