Merge branch 'develop' into test-with-7.7-20200130

Author: Chris Wiechmann

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us to improve the API-Manager CLI
-title: "[BUG]"
+title: ""
 labels: bug
 assignees: cwiechmann
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Tell us what you need and why in the API-Mgr. CLI
-title: "[Feature]"
+title: ""
 labels: enhancement
 assignees: cwiechmann
 

.github/ISSUE_TEMPLATE/question.md

@@ -1,8 +1,8 @@
 ---
 name: Question
 about: Ask a question concerning the CLI
-title: "[Help]"
-labels: help wanted
+title: ""
+labels: question
 assignees: cwiechmann
 
 ---

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## [1.1.0] 2020-06-25
 ### Added
 - Feature to use a YAML based API-Definition for Swagger & OpenAPI (API-Manager 7.7 only)
 - API Backend-Server information in wide and ultra view console get view
@@ -13,6 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Feature to load the API-Definition from the FE-API (See issue [#4](https://github.com/Axway-API-Management-Plus/apim-cli/issues/4))
 - Feature to export APIs as a CSV-File incl. used polices and subscribed applications
 - CLI usage information for all operations improved
+- CLI now properly logs out from API-Manager after the execution
+- API Custom-Properties are exported into CSV and Console view
 
 ### Changed
 - API Console ultra view not longer renders API-Tags in detail. Only indicated with True & False

README.md

@@ -10,7 +10,7 @@ Additionally the CLI supports basic administrative commands for instance to list
 
 Watch this video (28 min): https://youtu.be/2i8i1zMAMps to get an overview + demo.
 
-With that, an API developer or the operations team is just providing the desired state configuration of the API, Application. When checked in, the [CI/CD-Pipeline](https://github.com/Axway-API-Management-Plus/apim-cli/wiki/9.-Jenkins-Integration-with-GitHub-&-Bitbucket) picks it up and replicates it into the API Manager. 
+With that, an API developer or the operations team is just providing the desired state configuration of the API, Application. When checked in, the [CI/CD-Pipeline](https://github.com/Axway-API-Management-Plus/apim-cli/wiki/7.-Pipeline-integration) picks it up and replicates it into the API Manager. 
 
 ![API Manager Swagger-Promote overview](https://github.com/Axway-API-Management-Plus/apim-cli/blob/develop/misc/images/apimanager-swagger-promote-overview.png )
 
@@ -47,7 +47,7 @@ By using this CLI to control your Axway API management infrastructure it becomes
 To achieve this quality bar, the tools was developed from the beginning in a way that it can be tested fully automatically.  
 In addition to a number of executed unit-tests, sophisticated integration tests are performed. These integration tests are executed against different API-Management versions and consists of a number of different scenarios. Each scenrioa contains various __Desired__ states, which are transferred into __Actual__ state by the CLI and finally checked if the Actual State in the API-Manager is as expected. This is performed for APIs and applications.   
 
-The automated End-2-End test suite contains of __113__ different scenarios, which includes more than __250__ executions of CLI (Import & Export) following each by a validation step. The test suite is executed at Travis CI for the following versions and you may check yourself what is done by clicking on the badge icon:  
+The automated End-2-End test suite contains of __116__ different scenarios, which includes more than __284__ executions of CLI (Import & Export) following each by a validation step. The test suite is executed at Travis CI for the following versions and you may check yourself what is done by clicking on the badge icon:  
 
 | Version       | Branch               | Status | Comment | 
 | :---          | :---                 | :---:  | :--- |
@@ -61,12 +61,12 @@ Version 7.5.3 is NOT supported. Version 7.6.2 SP3 is required.
 
 ## Get started
 
-To get started, you have several options to download the CLI and then just run the CLI as shown in the example below
+To get started, you have several options to [download the CLI](https://github.com/Axway-API-Management-Plus/apim-cli/wiki/1.-How-to-get-started) and then just run the CLI as shown in the example below
 
 ```
 scripts\apim api import -c samples/basic/minimal-config-api-definition.json -s api-env
 ```
-This command is reading the API-Management platform configuration details from the environment file: `env.api-env.properties` and replicates the given desired API state in the configuration file: `minimal-config-api-definition.json` into the API-Management platform. 
+This command is reading the API-Management platform configuration details from the [environment file](https://github.com/Axway-API-Management-Plus/apim-cli/wiki/8.2.-Environment-property-files): `env.api-env.properties` and replicates the given desired API state in the configuration file: `minimal-config-api-definition.json` into the API-Management platform. 
 
 Please see the [documentation](https://github.com/Axway-API-Management-Plus/apim-cli/wikis) for more information.  
 

distribution/assembly/dist-release.xml

@@ -1,9 +1,9 @@
 <assembly>
   <id>release</id>
   <formats>
+	<format>dir</format>
     <format>tar.gz</format>
     <format>zip</format>
-    <format>dir</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <includeSiteDirectory>false</includeSiteDirectory>
@@ -17,6 +17,8 @@
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-api-export</include>
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-app-import</include>
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-app-export</include>
+        <include>com.github.axway-api-management-plus.apim-cli:apimcli-organizations</include>
+		<include>com.github.axway-api-management-plus.apim-cli:apimcli-users</include>
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-tool</include>
       </includes>
       <binaries>
@@ -34,6 +36,7 @@
               </includes>
               <excludes>
               	<exclude>*.formatted</exclude>
+				<exclude>scripts/*</exclude>
               </excludes>
           </fileSet>
           <fileSet>

distribution/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -32,13 +32,21 @@
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
 			<artifactId>apimcli-app-export</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
+			<artifactId>apimcli-organizations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
+			<artifactId>apimcli-users</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>distribution</id>