Release/1.6.0 beta.3 (#2222)

* [maven-release-plugin] prepare release 1.6.0-beta.3 * [maven-release-plugin] prepare for next development iteration * new release
dockstore · Mar 13, 2019 · 6bd4b59 · 6bd4b59
1 parent 8eea323
commit 6bd4b59
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 41 deletions.
diff --git a/dockstore-client/pom.xml b/dockstore-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.dockstore</groupId>
         <artifactId>dockstore</artifactId>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
     </parent>
     <artifactId>dockstore-client</artifactId>
     <packaging>jar</packaging>
@@ -42,22 +42,22 @@
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-common</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>swagger-java-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>openapi-java-wes-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-file-plugin-parent</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.avro</groupId>

diff --git a/dockstore-common/pom.xml b/dockstore-common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.dockstore</groupId>
         <artifactId>dockstore</artifactId>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dockstore-common</artifactId>

diff --git a/dockstore-event-consumer/pom.xml b/dockstore-event-consumer/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>dockstore</artifactId>
         <groupId>io.dockstore</groupId>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,12 +30,12 @@
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-common</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>swagger-java-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>

diff --git a/dockstore-file-plugin-parent/pom.xml b/dockstore-file-plugin-parent/pom.xml
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <groupId>io.dockstore</groupId>
         <artifactId>dockstore</artifactId>
         <relativePath>../pom.xml</relativePath>

diff --git a/dockstore-integration-testing/pom.xml b/dockstore-integration-testing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.dockstore</groupId>
         <artifactId>dockstore</artifactId>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dockstore-integration-testing</artifactId>
@@ -34,30 +34,30 @@
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-common</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-webservice</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>openapi-java-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
 
         <!-- testing -->
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-common</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>

diff --git a/dockstore-webservice/pom.xml b/dockstore-webservice/pom.xml
@@ -27,7 +27,7 @@
     </properties>
 
     <parent>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <groupId>io.dockstore</groupId>
         <artifactId>dockstore</artifactId>
         <relativePath>../pom.xml</relativePath>
@@ -57,22 +57,22 @@
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>swagger-java-quay-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>swagger-java-sam-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>swagger-java-bitbucket-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-common</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
@@ -534,7 +534,7 @@
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-common</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>

diff --git a/dockstore-webservice/src/main/resources/openapi.yaml b/dockstore-webservice/src/main/resources/openapi.yaml
@@ -3,7 +3,7 @@ info:
   description: This describes the dockstore API, a webservice that manages pairs of Docker
     images and associated metadata such as CWL documents and Dockerfiles used to
     build those images
-  version: 1.6.0-beta.3-SNAPSHOT
+  version: 1.6.0-beta.4-SNAPSHOT
   title: Dockstore API
   termsOfService: TBD
   contact:

diff --git a/dockstore-webservice/src/main/resources/openapi3/openapi.yaml b/dockstore-webservice/src/main/resources/openapi3/openapi.yaml
@@ -3023,7 +3023,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Aliasable'
+                $ref: '#/components/schemas/Collection'
           description: default response
   /organizations/name/{name}:
     get:
@@ -3755,7 +3755,7 @@ paths:
                 type: boolean
           description: default response
     get:
-      operationId: getUser_1
+      operationId: getUser
       requestBody:
         content:
           '*/*':
@@ -3914,7 +3914,7 @@ paths:
           description: default response
   /users/{userId}:
     get:
-      operationId: getUser
+      operationId: getUser_1
       parameters:
       - in: path
         name: userId

diff --git a/dockstore-webservice/src/main/resources/swagger.yaml b/dockstore-webservice/src/main/resources/swagger.yaml
@@ -4,7 +4,7 @@ info:
   description: "This describes the dockstore API, a webservice that manages pairs\
     \ of Docker images and associated metadata such as CWL documents and Dockerfiles\
     \ used to build those images"
-  version: "1.6.0-beta.3-SNAPSHOT"
+  version: "1.6.0-beta.4-SNAPSHOT"
   title: "Dockstore API"
   termsOfService: "TBD"
   contact:

diff --git a/openapi-java-client/pom.xml b/openapi-java-client/pom.xml
@@ -22,7 +22,7 @@
     <name>openapi-java-client</name>
 
     <parent>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <groupId>io.dockstore</groupId>
         <artifactId>dockstore</artifactId>
         <relativePath>../pom.xml</relativePath>
@@ -289,7 +289,7 @@
             <!-- used just for ordering since this uses the swagger.json created by dockstore-webservice during the build -->
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-webservice</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

diff --git a/openapi-java-wes-client/pom.xml b/openapi-java-wes-client/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>dockstore</artifactId>
         <groupId>io.dockstore</groupId>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>io.dockstore</groupId>
     <artifactId>dockstore</artifactId>
-    <version>1.6.0-beta.3-SNAPSHOT</version>
+    <version>1.6.0-beta.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>dockstore</name>

diff --git a/reports/pom.xml b/reports/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>dockstore</artifactId>
         <groupId>io.dockstore</groupId>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,22 +29,22 @@
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-webservice</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-common</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-client</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-integration-testing</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/swagger-java-bitbucket-client/pom.xml b/swagger-java-bitbucket-client/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>dockstore</artifactId>
         <groupId>io.dockstore</groupId>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/swagger-java-client/pom.xml b/swagger-java-client/pom.xml
@@ -22,7 +22,7 @@
     <name>swagger-java-client</name>
 
     <parent>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <groupId>io.dockstore</groupId>
         <artifactId>dockstore</artifactId>
         <relativePath>../pom.xml</relativePath>
@@ -265,7 +265,7 @@
             <!-- used just for ordering since this uses the swagger.json created by dockstore-webservice during the build -->
             <groupId>io.dockstore</groupId>
             <artifactId>dockstore-webservice</artifactId>
-            <version>1.6.0-beta.3-SNAPSHOT</version>
+            <version>1.6.0-beta.4-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

diff --git a/swagger-java-quay-client/pom.xml b/swagger-java-quay-client/pom.xml
@@ -22,7 +22,7 @@
     <name>swagger-java-quay-client</name>
 
     <parent>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <groupId>io.dockstore</groupId>
         <artifactId>dockstore</artifactId>
         <relativePath>../pom.xml</relativePath>

diff --git a/swagger-java-sam-client/pom.xml b/swagger-java-sam-client/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>dockstore</artifactId>
         <groupId>io.dockstore</groupId>
-        <version>1.6.0-beta.3-SNAPSHOT</version>
+        <version>1.6.0-beta.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>