From 732770dd9714378777da3ba61382d270e47cfe69 Mon Sep 17 00:00:00 2001
From: Kathy Tran <kathylevtran@gmail.com>
Date: Thu, 22 Jun 2023 13:53:25 -0400
Subject: [PATCH] Use cwlavro from bom

---
 THIRD-PARTY-LICENSES.txt |  4 ++--
 pom.xml                  | 33 ---------------------------------
 toolbackup/pom.xml       | 22 ----------------------
 3 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/THIRD-PARTY-LICENSES.txt b/THIRD-PARTY-LICENSES.txt
index d4b96faa..f56d7df6 100644
--- a/THIRD-PARTY-LICENSES.txt
+++ b/THIRD-PARTY-LICENSES.txt
@@ -117,8 +117,8 @@ Lists of 399 third-party dependencies.
      (Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt) cromwell-wdl-transforms-new-base (org.broadinstitute:cromwell-wdl-transforms-new-base_2.13:84 - no url defined)
      (Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt) cromwell-wdl-transforms-shared (org.broadinstitute:cromwell-wdl-transforms-shared_2.13:84 - no url defined)
      (Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt) cromwell-wom (org.broadinstitute:cromwell-wom_2.13:84 - no url defined)
-     (Apache License, Version 2.0) cwlavro-generated (io.cwl:cwlavro-generated:2.0.4.7 - no url defined)
-     (Apache License, Version 2.0) cwlavro-tools (io.cwl:cwlavro-tools:2.0.4.7 - no url defined)
+     (Apache License, Version 2.0) cwlavro-generated (io.cwl:cwlavro-generated:2.0.4.8 - no url defined)
+     (Apache License, Version 2.0) cwlavro-tools (io.cwl:cwlavro-tools:2.0.4.8 - no url defined)
      (The Apache Software License, Version 2.0) docker-client (com.spotify:docker-client:7.0.2 - https://github.com/spotify/docker-client)
      (The Apache Software License, Version 2.0) docker-java-api (com.github.docker-java:docker-java-api:3.3.0 - https://github.com/docker-java/docker-java)
      (The Apache Software License, Version 2.0) docker-java-core (com.github.docker-java:docker-java-core:3.3.0 - https://github.com/docker-java/docker-java)
diff --git a/pom.xml b/pom.xml
index 8776f381..04b33f9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,6 @@
             ${project.basedir}/target/jacoco.xml,${project.basedir}/target/jacoco-it.xml,${project.basedir}/../dockstore-support-reports/target/site/jacoco-aggregate/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
         <!-- end sonarcloud properties -->
-        <cwlavro.version>2.0.4.7</cwlavro.version>
     </properties>
 
     <organization>
@@ -159,38 +158,6 @@
                 <artifactId>jersey-hk2</artifactId>
                 <version>3.0.9</version>
             </dependency>
-            <!--  cwl management -->
-            <dependency>
-                <groupId>io.cwl</groupId>
-                <artifactId>cwlavro-tools</artifactId>
-                <version>${cwlavro.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient-osgi</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpcore-osgi</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <!-- Used by cwlavro. Even though cwlavro uses 1.21, cwlavro's avro dependency uses 1.20 -->
-            <dependency>
-                <groupId>io.cwl</groupId>
-                <artifactId>cwlavro-generated</artifactId>
-                <version>${cwlavro.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient-osgi</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpcore-osgi</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/toolbackup/pom.xml b/toolbackup/pom.xml
index 8cafe3f1..2cac274f 100644
--- a/toolbackup/pom.xml
+++ b/toolbackup/pom.xml
@@ -85,32 +85,10 @@
             <dependency>
                 <groupId>io.cwl</groupId>
                 <artifactId>cwlavro-tools</artifactId>
-                <version>${cwlavro.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient-osgi</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpcore-osgi</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.cwl</groupId>
                 <artifactId>cwlavro-generated</artifactId>
-                <version>${cwlavro.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient-osgi</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpcore-osgi</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
         </dependencies>
     </dependencyManagement>