Skip to content

Commit ac511e2

Browse files
iSnowJohannesJander
iSnow
and
JohannesJander
authored
Updated dependencies, excluded some transitive dependencies (#85)
* Updated dependencies, excluded some transitive dependencies with security issues * updated compiler plugin * updated compiler plugin * Update maven.yml * updated compiler plugin * updated compiler plugin * updated compiler plugin * updated compiler plugin * updated compiler plugin * Added dependency check to build pipeline --------- Co-authored-by: JanderJ1 <johannes.jander@basf.com>
1 parent 3be7ed2 commit ac511e2

File tree

3 files changed

+101
-54
lines changed

3 files changed

+101
-54
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
- name: Set up JDK 1.8
20-
uses: actions/setup-java@v1
18+
- uses: actions/checkout@v4
19+
- name: Set up JDK 17
20+
uses: actions/setup-java@v4
2121
with:
22-
java-version: 1.8
22+
java-version: '17'
2323
distribution: 'temurin'
2424
cache: maven
2525
- name: Build with Maven
2626
run: mvn -B package --file pom.xml
2727
- name: Run test and coverage report
28-
run: mvn clean test jacoco:report coveralls:report -DrepoToken=${{ secrets.COVERALL_REPO_SECRET }}
28+
run: mvn clean test jacoco:report
29+
- name: Run dependency check
30+
run: mvn org.owasp:dependency-check-maven:check

‎pom.xml‎

Lines changed: 92 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.frictionlessdata</groupId>
5-
<artifactId>tableschema-java</artifactId>
6-
<version>0.6.16-SNAPSHOT</version>
5+
<artifactId>tableschema-java-isnow</artifactId>
6+
<version>0.6.17-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<issueManagement>
99
<url>https://github.com/frictionlessdata/tableschema-java/issues</url>
@@ -20,16 +20,16 @@
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+
<google-guava.version>33.4.0-jre</google-guava.version>
24+
<apache-commons-lang3.version>3.17.0</apache-commons-lang3.version>
25+
<apache-commons-csv.version>1.13.0</apache-commons-csv.version>
26+
<apache-commons-validator.version>1.9.0</apache-commons-validator.version>
27+
<geotools.version>32.2</geotools.version>
28+
<jackson.version>2.18.3</jackson.version>
29+
<junit.version>5.12.0</junit.version>
3030
<locationtech-jts.version>1.19.0</locationtech-jts.version>
3131
<networknt-validator-version>1.0.76</networknt-validator-version>
32-
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
32+
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
3333
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
3434
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
3535
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
@@ -39,8 +39,8 @@
3939
<maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
4040
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
4141
<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>
42+
<dependency-check-maven.version>12.1.0</dependency-check-maven.version>
43+
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
4444
</properties>
4545
<repositories>
4646
<repository>
@@ -69,26 +69,7 @@
6969
<groupId>org.apache.maven.plugins</groupId>
7070
<artifactId>maven-resources-plugin</artifactId>
7171
<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-
-->
72+
9273
<configuration>
9374
<encoding>UTF-8</encoding>
9475
</configuration>
@@ -135,7 +116,7 @@
135116
</execution>
136117
</executions>
137118
</plugin>
138-
<!--
119+
<!--
139120
<plugin>
140121
<artifactId>maven-deploy-plugin</artifactId>
141122
<version>${maven-deploy-plugin.version}</version>
@@ -149,7 +130,7 @@
149130
</execution>
150131
</executions>
151132
</plugin>
152-
-->
133+
-->
153134
<plugin>
154135
<groupId>org.apache.maven.plugins</groupId>
155136
<artifactId>maven-gpg-plugin</artifactId>
@@ -177,6 +158,7 @@
177158
</configuration>
178159
</plugin>
179160

161+
<!--
180162
<plugin>
181163
<groupId>org.apache.maven.plugins</groupId>
182164
<artifactId>maven-release-plugin</artifactId>
@@ -195,13 +177,16 @@
195177
</dependency>
196178
</dependencies>
197179
</plugin>
180+
-->
198181

199182
<!-- Test Coverage: https://github.com/trautonen/coveralls-maven-plugin -->
183+
<!--
200184
<plugin>
201185
<groupId>org.eluder.coveralls</groupId>
202186
<artifactId>coveralls-maven-plugin</artifactId>
203187
<version>${coveralls-maven-plugin.version}</version>
204188
</plugin>
189+
-->
205190

206191
<plugin>
207192
<groupId>org.jacoco</groupId>
@@ -232,8 +217,8 @@
232217

233218
</plugins>
234219
</build>
235-
<dependencies>
236220

221+
<dependencies>
237222
<!-- Dependencies for Bean-based Schema inferal -->
238223
<dependency>
239224
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -248,24 +233,64 @@
248233
<version>${jackson.version}</version>
249234
</dependency>
250235

251-
<dependency>
252-
<groupId>com.fasterxml.jackson.core</groupId>
253-
<artifactId>jackson-databind</artifactId>
254-
<version>${jackson.version}</version>
255-
</dependency>
236+
<dependency>
237+
<groupId>com.fasterxml.jackson.core</groupId>
238+
<artifactId>jackson-databind</artifactId>
239+
<version>${jackson.version}</version>
240+
</dependency>
256241

257242
<!-- Dependencies for Geopoint/Geojson Fields -->
258243
<dependency>
259244
<groupId>org.geotools</groupId>
260-
<artifactId>gt-opengis</artifactId>
245+
<artifactId>gt-main</artifactId>
261246
<version>${geotools.version}</version>
247+
<exclusions>
248+
<exclusion>
249+
<groupId>org.eclipse.emf</groupId>
250+
<artifactId>org.eclipse.emf.common</artifactId>
251+
</exclusion>
252+
<exclusion>
253+
<groupId>org.geotools</groupId>
254+
<artifactId>gt-http</artifactId>
255+
</exclusion>
256+
</exclusions>
257+
</dependency>
258+
<dependency>
259+
<groupId>org.geotools</groupId>
260+
<artifactId>gt-api</artifactId>
261+
<version>${geotools.version}</version>
262+
<exclusions>
263+
<exclusion>
264+
<groupId>org.eclipse.emf</groupId>
265+
<artifactId>org.eclipse.emf.common</artifactId>
266+
</exclusion>
267+
</exclusions>
268+
</dependency>
269+
<dependency>
270+
<groupId>org.geotools</groupId>
271+
<artifactId>gt-metadata</artifactId>
272+
<version>${geotools.version}</version>
273+
<exclusions>
274+
<exclusion>
275+
<groupId>org.eclipse.emf</groupId>
276+
<artifactId>org.eclipse.emf.common</artifactId>
277+
</exclusion>
278+
<exclusion>
279+
<groupId>org.geotools.ogc</groupId>
280+
<artifactId>net.opengis.ows</artifactId>
281+
</exclusion>
282+
</exclusions>
262283
</dependency>
263-
264-
<!-- Dependencies for Geopoint/Geojson Fields -->
265284
<dependency>
266285
<groupId>org.geotools</groupId>
267-
<artifactId>gt-geometry</artifactId>
286+
<artifactId>gt-referencing</artifactId>
268287
<version>${geotools.version}</version>
288+
<exclusions>
289+
<exclusion>
290+
<groupId>org.eclipse.emf</groupId>
291+
<artifactId>org.eclipse.emf.common</artifactId>
292+
</exclusion>
293+
</exclusions>
269294
</dependency>
270295

271296
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
@@ -280,6 +305,20 @@
280305
<groupId>commons-validator</groupId>
281306
<artifactId>commons-validator</artifactId>
282307
<version>${apache-commons-validator.version}</version>
308+
<exclusions>
309+
<exclusion>
310+
<groupId>commons-beanutils</groupId>
311+
<artifactId>commons-beanutils</artifactId>
312+
</exclusion>
313+
<exclusion>
314+
<groupId>commons-logging</groupId>
315+
<artifactId>commons-logging</artifactId>
316+
</exclusion>
317+
<exclusion>
318+
<groupId>commons-digester</groupId>
319+
<artifactId>commons-digester</artifactId>
320+
</exclusion>
321+
</exclusions>
283322
</dependency>
284323
<!-- https://commons.apache.org/proper/commons-csv/ -->
285324
<dependency>
@@ -290,9 +329,15 @@
290329

291330
<!-- JSON Schema Validator -->
292331
<dependency>
293-
<groupId>com.networknt</groupId>
294-
<artifactId>json-schema-validator</artifactId>
295-
<version>${networknt-validator-version}</version>
332+
<groupId>com.networknt</groupId>
333+
<artifactId>json-schema-validator</artifactId>
334+
<version>${networknt-validator-version}</version>
335+
<exclusions>
336+
<exclusion>
337+
<groupId>ch.qos.logback</groupId>
338+
<artifactId>logback-classic</artifactId>
339+
</exclusion>
340+
</exclusions>
296341
</dependency>
297342

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