Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions THIRD-PARTY-LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ Lists of 414 third-party dependencies.
(Apache-2.0) Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:2.0.18 - http://www.slf4j.org)
(Eclipse Public License - v 2.0) (GNU Lesser General Public License) Logback Access Common Module (ch.qos.logback.access:logback-access-common:2.0.12 - http://logback.qos.ch/logback-access-common)
(Eclipse Public License - v 2.0) (GNU Lesser General Public License) Logback Access Jetty 12 Module (ch.qos.logback.access:logback-access-jetty12:2.0.12 - http://logback.qos.ch/logback-access-jetty12)
(EPL-2.0) (LGPL-2.1-only) Logback Classic Module (ch.qos.logback:logback-classic:1.5.33 - http://logback.qos.ch/logback-classic)
(EPL-2.0) (LGPL-2.1-only) Logback Core Module (ch.qos.logback:logback-core:1.5.33 - http://logback.qos.ch/logback-core)
(EPL-2.0) (LGPL-2.1-only) Logback Classic Module (ch.qos.logback:logback-classic:1.5.35 - http://logback.qos.ch/logback-classic)
(EPL-2.0) (LGPL-2.1-only) Logback Core Module (ch.qos.logback:logback-core:1.5.35 - http://logback.qos.ch/logback-core)
(Apache License, Version 2.0) (MIT License) Logstash Logback Encoder (net.logstash.logback:logstash-logback-encoder:4.11 - https://github.com/logstash/logstash-logback-encoder)
(Apache License, Version 2.0) Lucene Core (org.apache.lucene:lucene-core:8.7.0 - https://lucene.apache.org/lucene-parent/lucene-core)
(Apache License 2.0) Metrics Core (io.dropwizard.metrics:metrics-core:4.2.39 - https://metrics.dropwizard.io/metrics-core)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-cli-integration-testing</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand All @@ -30,13 +30,13 @@
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-client</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-integration-testing</artifactId>
<version>1.20.0-beta.3</version>
<version>1.20.0</version>
<classifier>tests</classifier>
<scope>compile</scope>
<exclusions>
Expand All @@ -49,7 +49,7 @@
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-common</artifactId>
<version>1.20.0-beta.3</version>
<version>1.20.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -61,7 +61,7 @@
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-webservice</artifactId>
<version>1.20.0-beta.3</version>
<version>1.20.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -73,7 +73,7 @@
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>openapi-java-client</artifactId>
<version>1.20.0-beta.3</version>
<version>1.20.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -97,14 +97,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.33</version>
<version>1.5.35</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.5.33</version>
<version>1.5.35</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions dockstore-cli-reports/generated/src/main/resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-cli-reports</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand All @@ -30,13 +30,13 @@
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-webservice</artifactId>
<version>1.20.0-beta.3</version>
<version>1.20.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-common</artifactId>
<version>1.20.0-beta.3</version>
<version>1.20.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -48,13 +48,13 @@
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-client</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-cli-integration-testing</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions dockstore-client/generated/src/main/resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-client</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand Down Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-common</artifactId>
<version>1.20.0-beta.3</version>
<version>1.20.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -82,19 +82,19 @@
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>openapi-java-client</artifactId>
<version>1.20.0-beta.3</version>
<version>1.20.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>openapi-java-wes-client</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-file-plugin-parent</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -228,7 +228,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.33</version>
<version>1.5.35</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dockstore</groupId>
<artifactId>dockstore-file-plugin-parent</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dockstore</groupId>
<artifactId>openapi-java-wes-client</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
-->
<properties>
<!-- the following properties set sane defaults when no revision properties are set from the command-line -->
<revision>1.18</revision>
<revision>1.21</revision>
<changelist>.0-SNAPSHOT</changelist>

<github.url>scm:git:git@github.com:dockstore/dockstore-cli.git</github.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dockstore-core.version>1.20.0-beta.3</dockstore-core.version>
<dockstore-core.version>1.20.0</dockstore-core.version>
<maven-failsafe.version>2.22.2</maven-failsafe.version>
<maven-surefire.version>2.22.2</maven-surefire.version>
<skipTests>false</skipTests>
Expand Down
2 changes: 1 addition & 1 deletion support/generated/src/main/resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dockstore</groupId>
<artifactId>support</artifactId>
<version>1.18.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand Down
Loading