Skip to content

Commit 4d3486a

Browse files
committed
use bom correctly and bump dependency checker plugin
1 parent 78ebadc commit 4d3486a

2 files changed

Lines changed: 21 additions & 16 deletions

File tree

wdl-parsing/WDLParsingFunction/THIRD-PARTY-LICENSES.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,19 @@ Lists of 191 third-party dependencies.
101101
(The Apache Software License, Version 2.0) J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
102102
(The Apache Software License, Version 2.0) Jackson 2 extensions to the Google APIs Client Library for Java (com.google.api-client:google-api-client-jackson2:1.33.2 - https://github.com/googleapis/google-api-java-client/google-api-client-jackson2)
103103
(The Apache Software License, Version 2.0) Jackson 2 extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-jackson2:1.41.4 - https://github.com/googleapis/google-http-java-client/google-http-client-jackson2)
104-
(The Apache Software License, Version 2.0) Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
105-
(The Apache Software License, Version 2.0) Jackson module: JAXB Annotations (com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.2 - https://github.com/FasterXML/jackson-modules-base)
106-
(The Apache Software License, Version 2.0) Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.12.3 - http://github.com/FasterXML/jackson)
107-
(The Apache Software License, Version 2.0) Jackson-core (com.fasterxml.jackson.core:jackson-core:2.12.7 - https://github.com/FasterXML/jackson-core)
108-
(The Apache Software License, Version 2.0) jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.12.7.1 - http://github.com/FasterXML/jackson)
104+
(The Apache Software License, Version 2.0) Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
105+
(The Apache Software License, Version 2.0) Jackson module: Old JAXB Annotations (javax.xml.bind) (com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.22.0 - https://github.com/FasterXML/jackson-modules-base)
106+
(The Apache Software License, Version 2.0) Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.22 - https://github.com/FasterXML/jackson)
107+
(The Apache Software License, Version 2.0) Jackson-core (com.fasterxml.jackson.core:jackson-core:2.22.0 - https://github.com/FasterXML/jackson-core)
108+
(The Apache Software License, Version 2.0) jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.22.0 - https://github.com/FasterXML/jackson)
109+
(EDL 1.0) Jakarta Activation API jar (jakarta.activation:jakarta.activation-api:1.2.2 - https://github.com/eclipse-ee4j/jaf/jakarta.activation-api)
109110
(EPL 2.0) (GPL2 w/ CPE) Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:1.3.5 - https://projects.eclipse.org/projects/ee4j.ca)
110111
(EPL 2.0) (GPL2 w/ CPE) jakarta.ws.rs-api (jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 - https://github.com/eclipse-ee4j/jaxrs-api)
111-
(Eclipse Distribution License - v 1.0) jakarta.xml.bind-api (jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api)
112112
(BSD-3-Clause) janino (org.codehaus.janino:janino:3.1.7 - http://janino-compiler.github.io/janino/)
113113
(The Apache Software License, Version 2.0) Java 6 (and higher) Extensions to the Google API Client Library for Java. (com.google.api-client:google-api-client-java6:1.33.2 - https://github.com/googleapis/google-api-java-client/google-api-client-java6)
114114
(The Apache Software License, Version 2.0) Java 6 (and higher) extensions to the Google OAuth Client Library for Java. (com.google.oauth-client:google-oauth-client-java6:1.33.0 - https://github.com/googleapis/google-oauth-java-client/google-oauth-client-java6)
115+
(CDDL 1.1) (GPL2 w/ CPE) Java Architecture for XML Binding (javax.xml.bind:jaxb-api:2.2.12 - http://jaxb.java.net/)
115116
(Apache-2.0) (LGPL-2.1-or-later) Java Native Access (net.java.dev.jna:jna:5.9.0 - https://github.com/java-native-access/jna)
116-
(EDL 1.0) JavaBeans Activation Framework API jar (jakarta.activation:jakarta.activation-api:1.2.1 - https://github.com/eclipse-ee4j/jaf/jakarta.activation-api)
117117
(Apache 2) JavaEWAH (com.googlecode.javaewah:JavaEWAH:1.1.13 - https://github.com/lemire/javaewah)
118118
(EPL 2.0) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:jakarta.inject:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/jakarta.inject)
119119
(Apache License, Version 2.0) JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.32 - http://www.slf4j.org)
@@ -190,4 +190,4 @@ Lists of 191 third-party dependencies.
190190
(WDL License https://github.com/openwdl/wdl/blob/master/LICENSE) wdl-biscayne (org.broadinstitute:wdl-biscayne_2.13:85 - no url defined)
191191
(WDL License https://github.com/openwdl/wdl/blob/master/LICENSE) wdl-draft2 (org.broadinstitute:wdl-draft2_2.13:85 - no url defined)
192192
(WDL License https://github.com/openwdl/wdl/blob/master/LICENSE) wdl-draft3 (org.broadinstitute:wdl-draft3_2.13:85 - no url defined)
193-
(Unknown license) womtool (org.broadinstitute:womtool_2.13:85 - no url defined)
193+
(Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt) womtool (org.broadinstitute:womtool_2.13:85 - no url defined)

wdl-parsing/WDLParsingFunction/pom.xml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
<packaging>jar</packaging>
88
<name>WDL parser created for SAM CLI.</name>
99
<properties>
10-
<maven.compiler.source>11</maven.compiler.source>
11-
<maven.compiler.target>11</maven.compiler.target>
1210
<jersey-version>2.34</jersey-version>
13-
<jackson-version>2.12.3</jackson-version>
11+
<jackson-version>2.22.0</jackson-version>
1412
<junit-version>5.7.2</junit-version>
1513
<maven-plugin-version>3.0.0-M5</maven-plugin-version>
1614
</properties>
@@ -48,6 +46,17 @@
4846
<url>https://artifacts.oicr.on.ca/artifactory/collab-release</url>
4947
</repository>
5048
</repositories>
49+
<dependencyManagement>
50+
<dependencies>
51+
<dependency>
52+
<groupId>com.fasterxml.jackson</groupId>
53+
<artifactId>jackson-bom</artifactId>
54+
<version>${jackson-version}</version>
55+
<type>pom</type>
56+
<scope>import</scope>
57+
</dependency>
58+
</dependencies>
59+
</dependencyManagement>
5160
<dependencies>
5261
<dependency>
5362
<groupId>com.amazonaws</groupId>
@@ -132,13 +141,10 @@
132141
<dependency>
133142
<groupId>com.fasterxml.jackson.core</groupId>
134143
<artifactId>jackson-annotations</artifactId>
135-
<version>${jackson-version}</version>
136144
</dependency>
137145
<dependency>
138146
<groupId>com.fasterxml.jackson.core</groupId>
139147
<artifactId>jackson-databind</artifactId>
140-
<!-- The "jackson-version" version of this artifact doesn't exist, override for dependabot -->
141-
<version>2.22.0</version>
142148
</dependency>
143149
<dependency>
144150
<groupId>org.openapitools</groupId>
@@ -148,7 +154,6 @@
148154
<dependency>
149155
<groupId>com.fasterxml.jackson.datatype</groupId>
150156
<artifactId>jackson-datatype-jsr310</artifactId>
151-
<version>${jackson-version}</version>
152157
</dependency>
153158
<dependency>
154159
<groupId>org.glassfish.jersey.core</groupId>
@@ -211,7 +216,7 @@
211216
<plugin>
212217
<groupId>org.apache.maven.plugins</groupId>
213218
<artifactId>maven-dependency-plugin</artifactId>
214-
<version>3.1.2</version>
219+
<version>3.11.0</version>
215220
<configuration>
216221
<failOnWarning>true</failOnWarning>
217222
<outputXML>true</outputXML>

0 commit comments

Comments
 (0)