Skip to content

Commit ba7ae2c

Browse files
committed
Assorted dependency updates, cleanups, and dependency checker
1 parent beda9ec commit ba7ae2c

6 files changed

Lines changed: 42 additions & 22 deletions

File tree

dependency-check-suppression.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3+
<suppress>
4+
<notes><![CDATA[file name: opentelemetry-gcp-resources-1.37.0-alpha.jar taken for a Go implementation of the same library]]></notes>
5+
<packageUrl regex="true">^pkg:maven/io\.opentelemetry\.contrib/opentelemetry-gcp-resources@.*$</packageUrl>
6+
<cpe>cpe:/a:opentelemetry:opentelemetry</cpe>
7+
</suppress>
8+
<suppress>
9+
<notes><![CDATA[file name: opentelemetry-semconv-1.29.0-alpha.jar taken for a Go implementation of the same library]]></notes>
10+
<packageUrl regex="true">^pkg:maven/io\.opentelemetry\.semconv/opentelemetry-semconv@.*$</packageUrl>
11+
<cpe>cpe:/a:opentelemetry:opentelemetry</cpe>
12+
</suppress>
13+
</suppressions>

plugin/cog/cog-reader/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@
5656
<artifactId>testcontainers-fake-gcs-server</artifactId>
5757
<scope>test</scope>
5858
</dependency>
59-
<dependency>
60-
<groupId>org.slf4j</groupId>
61-
<artifactId>slf4j-log4j12</artifactId>
62-
<version>1.7.33</version>
63-
<scope>runtime</scope>
64-
</dependency>
6559
</dependencies>
6660

6761
<build>

plugin/cog/cog-reader/src/test/resources/log4j.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

plugin/cog/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</modules>
2323

2424
<properties>
25-
<cloud-dependencies-bom.version>1.0.1</cloud-dependencies-bom.version>
25+
<cloud-dependencies-bom.version>1.0.2</cloud-dependencies-bom.version>
2626
<okhttp.version>5.3.2</okhttp.version>
2727
<ehcache.version>3.4.0</ehcache.version>
2828
<online.skip.pattern>**/*OnlineTest.java</online.skip.pattern>

pom.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,5 +780,33 @@
780780
</plugins>
781781
</build>
782782
</profile>
783+
<!--
784+
Dependency vulnerability checks. Run with:
785+
mvnd initialize dependency-check:aggregate -Dall -Pdependencycheck -nsu -fae -DnvdApiKey=<your nvd api key>
786+
-->
787+
<profile>
788+
<id>dependencycheck</id>
789+
<build>
790+
<plugins>
791+
<plugin>
792+
<groupId>org.owasp</groupId>
793+
<artifactId>dependency-check-maven</artifactId>
794+
<version>12.2.0</version>
795+
<executions>
796+
<execution>
797+
<goals>
798+
<goal>aggregate</goal>
799+
</goals>
800+
</execution>
801+
</executions>
802+
<configuration>
803+
<failBuildOnCVSS>7</failBuildOnCVSS>
804+
<suppressionFile>dependency-check-suppression.xml</suppressionFile>
805+
<format>ALL</format>
806+
</configuration>
807+
</plugin>
808+
</plugins>
809+
</build>
810+
</profile>
783811
</profiles>
784812
</project>

release/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,6 @@
134134
<artifactId>imageio-ext-kakadu</artifactId>
135135
<version>${project.version}</version>
136136
</dependency>
137-
<dependency>
138-
<groupId>it.geosolutions.imageio-ext</groupId>
139-
<artifactId>imageio-ext-grib1</artifactId>
140-
<version>${project.version}</version>
141-
</dependency>
142-
<dependency>
143-
<groupId>it.geosolutions.imageio-ext</groupId>
144-
<artifactId>imageio-ext-hdf4</artifactId>
145-
<version>${project.version}</version>
146-
</dependency>
147137
<dependency>
148138
<groupId>it.geosolutions.imageio-ext</groupId>
149139
<artifactId>imageio-ext-turbojpeg</artifactId>

0 commit comments

Comments
 (0)