diff --git a/THIRD-PARTY-LICENSES.txt b/THIRD-PARTY-LICENSES.txt index 414a32e15..d7541bd3e 100644 --- a/THIRD-PARTY-LICENSES.txt +++ b/THIRD-PARTY-LICENSES.txt @@ -9,16 +9,16 @@ Lists of 403 third-party dependencies. (Apache License 2.0) Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.2.19 - https://metrics.dropwizard.io/metrics-annotation) (The BSD License) ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.10.1 - http://www.antlr.org/antlr4-runtime) (EPL 2.0) (GPL2 w/ CPE) aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.4 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged) - (Apache-2.0) Apache Avro (org.apache.avro:avro:1.11.3 - https://avro.apache.org) + (Apache-2.0) Apache Avro (org.apache.avro:avro:1.11.4 - https://avro.apache.org) (Apache License, Version 2.0) Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/) (Apache-2.0) Apache Commons Codec (commons-codec:commons-codec:1.17.1 - https://commons.apache.org/proper/commons-codec/) (Apache License, Version 2.0) Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/) (Apache License, Version 2.0) Apache Commons Collections (org.apache.commons:commons-collections4:4.4 - https://commons.apache.org/proper/commons-collections/) - (Apache-2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.26.0 - https://commons.apache.org/proper/commons-compress/) + (Apache-2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.26.2 - https://commons.apache.org/proper/commons-compress/) (Apache-2.0) Apache Commons Configuration (org.apache.commons:commons-configuration2:2.10.1 - https://commons.apache.org/proper/commons-configuration/) (Apache License, Version 2.0) Apache Commons CSV (org.apache.commons:commons-csv:1.5 - http://commons.apache.org/proper/commons-csv/) (Apache License, Version 2.0) Apache Commons Exec (org.apache.commons:commons-exec:1.3 - http://commons.apache.org/proper/commons-exec/) - (Apache-2.0) Apache Commons IO (commons-io:commons-io:2.15.1 - https://commons.apache.org/proper/commons-io/) + (Apache-2.0) Apache Commons IO (commons-io:commons-io:2.16.1 - https://commons.apache.org/proper/commons-io/) (Apache-2.0) Apache Commons Lang (org.apache.commons:commons-lang3:3.14.0 - https://commons.apache.org/proper/commons-lang/) (Apache-2.0) Apache Commons Logging (commons-logging:commons-logging:1.3.0 - https://commons.apache.org/proper/commons-logging/) (Apache License, Version 2.0) Apache Commons Net (commons-net:commons-net:3.9.0 - https://commons.apache.org/proper/commons-net/) @@ -132,8 +132,8 @@ Lists of 403 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:85 - 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:85 - no url defined) (Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt) cromwell-wom (org.broadinstitute:cromwell-wom_2.13:85 - no url defined) - (Apache License, Version 2.0) cwlavro-generated (io.cwl:cwlavro-generated:2.0.4.9 - no url defined) - (Apache License, Version 2.0) cwlavro-tools (io.cwl:cwlavro-tools:2.0.4.9 - no url defined) + (Apache License, Version 2.0) cwlavro-generated (io.cwl:cwlavro-generated:2.1.0 - no url defined) + (Apache License, Version 2.0) cwlavro-tools (io.cwl:cwlavro-tools:2.1.0 - no url defined) (The Apache Software License, Version 2.0) docker-java-api (com.github.docker-java:docker-java-api:3.3.6 - 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.6 - https://github.com/docker-java/docker-java) (The Apache Software License, Version 2.0) docker-java-transport (com.github.docker-java:docker-java-transport:3.3.6 - https://github.com/docker-java/docker-java) diff --git a/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml b/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml index 90ee7b489..0a7292ee5 100644 --- a/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml +++ b/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore dockstore-cli-integration-testing - 1.16.0 + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 @@ -30,13 +30,13 @@ io.dockstore dockstore-client - 1.16.0 + 1.17.0-SNAPSHOT compile io.dockstore dockstore-integration-testing - 1.16.0 + 1.17.0-alpha.0 tests compile @@ -49,13 +49,13 @@ io.dockstore dockstore-common - 1.16.0 + 1.17.0-alpha.0 compile io.dockstore dockstore-webservice - 1.16.0 + 1.17.0-alpha.0 compile @@ -67,7 +67,7 @@ io.dockstore openapi-java-client - 1.16.0 + 1.17.0-alpha.0 compile @@ -79,7 +79,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 compile diff --git a/dockstore-cli-reports/generated/src/main/resources/pom.xml b/dockstore-cli-reports/generated/src/main/resources/pom.xml index 5ba1c8719..7907e92dd 100644 --- a/dockstore-cli-reports/generated/src/main/resources/pom.xml +++ b/dockstore-cli-reports/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore dockstore-cli-reports - 1.16.0 + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 @@ -30,25 +30,25 @@ io.dockstore dockstore-webservice - 1.16.0 + 1.17.0-alpha.0 compile io.dockstore dockstore-common - 1.16.0 + 1.17.0-alpha.0 compile io.dockstore dockstore-client - 1.16.0 + 1.17.0-SNAPSHOT compile io.dockstore dockstore-cli-integration-testing - 1.16.0 + 1.17.0-SNAPSHOT compile diff --git a/dockstore-client/generated/src/main/resources/pom.xml b/dockstore-client/generated/src/main/resources/pom.xml index 36e5ed221..d43a6fd69 100644 --- a/dockstore-client/generated/src/main/resources/pom.xml +++ b/dockstore-client/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore dockstore-client - 1.16.0 + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 @@ -66,7 +66,7 @@ io.dockstore dockstore-common - 1.16.0 + 1.17.0-alpha.0 compile @@ -78,19 +78,19 @@ io.dockstore openapi-java-client - 1.16.0 + 1.17.0-alpha.0 compile io.dockstore openapi-java-wes-client - 1.16.0 + 1.17.0-SNAPSHOT compile io.dockstore dockstore-file-plugin-parent - 1.16.0 + 1.17.0-SNAPSHOT compile @@ -126,7 +126,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 compile @@ -162,7 +162,7 @@ io.cwl cwlavro-tools - 2.0.4.9 + 2.1.0 compile @@ -178,7 +178,7 @@ io.cwl cwlavro-generated - 2.0.4.9 + 2.1.0 compile diff --git a/dockstore-client/src/main/java/io/dockstore/client/cli/nested/AbstractEntryClient.java b/dockstore-client/src/main/java/io/dockstore/client/cli/nested/AbstractEntryClient.java index b63587c58..649e07960 100644 --- a/dockstore-client/src/main/java/io/dockstore/client/cli/nested/AbstractEntryClient.java +++ b/dockstore-client/src/main/java/io/dockstore/client/cli/nested/AbstractEntryClient.java @@ -221,7 +221,7 @@ boolean getIgnoreChecksums() { public CWL getCwlUtil() { // TODO: may be reactivated if we find a different way to read CWL into Java // String cwlrunner = CWLRunnerFactory.getCWLRunner(); - return new CWL(false, Utilities.parseConfig(getConfigFile())); + return new CWL(Utilities.parseConfig(getConfigFile())); } public abstract String getConfigFile(); diff --git a/dockstore-client/src/main/java/io/github/collaboratory/cwl/CWLClient.java b/dockstore-client/src/main/java/io/github/collaboratory/cwl/CWLClient.java index a71380899..8c5a454b2 100644 --- a/dockstore-client/src/main/java/io/github/collaboratory/cwl/CWLClient.java +++ b/dockstore-client/src/main/java/io/github/collaboratory/cwl/CWLClient.java @@ -177,7 +177,7 @@ public File provisionInputFiles() { Class cwlClassTarget = getCWLClassTarget(); // Load CWL from JSON to object - CWL cwlUtil = new CWL(false, config); + CWL cwlUtil = new CWL(config); // This won't work since I am using zip files, it is expecting files to be unzipped final String imageDescriptorContent = cwlUtil.parseCWL(localPrimaryDescriptorFile.getAbsolutePath()).getLeft(); Object cwlObject = null; diff --git a/dockstore-client/src/test/java/io/dockstore/client/cli/YamlValidatorTest.java b/dockstore-client/src/test/java/io/dockstore/client/cli/YamlValidatorTest.java index 1217ec963..c25d9bb85 100644 --- a/dockstore-client/src/test/java/io/dockstore/client/cli/YamlValidatorTest.java +++ b/dockstore-client/src/test/java/io/dockstore/client/cli/YamlValidatorTest.java @@ -90,7 +90,7 @@ void relativePrimaryPathYml() { YamlVerifyUtility.dockstoreValidate(relativePathDockstoreYmlDirectory); fail("Invalid YAML not caught"); } catch (YamlVerifyUtility.ValidateYamlException ex) { - assertTrue(ex.getMessage().contains("the path must be an absolute path to be valid")); + assertTrue(ex.getMessage().contains("must be an absolute path to be valid")); } } @@ -103,7 +103,7 @@ void relativeTestDescriptorPathYml() { YamlVerifyUtility.dockstoreValidate(relativePathDockstoreYmlDirectory); fail("Invalid YAML not caught"); } catch (YamlVerifyUtility.ValidateYamlException ex) { - assertTrue(ex.getMessage().contains("the path must be an absolute path to be valid")); + assertTrue(ex.getMessage().contains("must be an absolute path to be valid")); } } diff --git a/dockstore-file-plugin-parent/generated/src/main/resources/pom.xml b/dockstore-file-plugin-parent/generated/src/main/resources/pom.xml index a2ee737d2..1f3f7f0c9 100644 --- a/dockstore-file-plugin-parent/generated/src/main/resources/pom.xml +++ b/dockstore-file-plugin-parent/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore dockstore-file-plugin-parent - 1.16.0 + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 diff --git a/openapi-java-wes-client/generated/src/main/resources/pom.xml b/openapi-java-wes-client/generated/src/main/resources/pom.xml index fe8ba92e6..65505c398 100644 --- a/openapi-java-wes-client/generated/src/main/resources/pom.xml +++ b/openapi-java-wes-client/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore openapi-java-wes-client - 1.16.0 + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index bb695961d..02423660f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,12 +33,12 @@ --> - 1.16 + 1.17 .0-SNAPSHOT scm:git:git@github.com:dockstore/dockstore-cli.git UTF-8 - 1.16.0 + 1.17.0-alpha.0 2.22.2 2.22.2 false @@ -53,7 +53,7 @@ ${project.basedir}/target/jacoco.xml,${project.basedir}/target/jacoco-it.xml,${project.basedir}/../dockstore-cli-reports/target/site/jacoco-aggregate/jacoco.xml - 2.0.4.9 + 2.1.0 @@ -200,28 +200,6 @@ - - - org.apache.commons - commons-compress - 1.26.0 - - - org.apache.commons - commons-text - 1.11.0 - - - commons-io - commons-io - 2.15.1 - - - org.apache.commons - commons-lang3 - 3.14.0 - - diff --git a/support/generated/src/main/resources/pom.xml b/support/generated/src/main/resources/pom.xml index 01c1a4ca2..9f7589209 100644 --- a/support/generated/src/main/resources/pom.xml +++ b/support/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore support - 1.16.0 + 1.17.0-SNAPSHOT Apache Software License, Version 2.0