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

Author: Chris Wiechmann

CHANGELOG.md

@@ -5,12 +5,38 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Support to import and export organizations
+- Support to import and export users
+- Support to publish APIs
+- Support to change the backend URL of an API (See issue [#43](https://github.com/Axway-API-Management-Plus/apim-cli/issues/43))
+- Support to search applications based on their credentials (API-Key & Client-ID) (See issue [#44](https://github.com/Axway-API-Management-Plus/apim-cli/issues/44))
+- Support to search applications based on their OAuth Redirect-URL
+- Stabilized API-Access handling (See issue [#35](https://github.com/Axway-API-Management-Plus/apim-cli/issues/35))
+- Unkown API-Specifications are now handled gracefully and exported as text files
+
+### Changed
+- Library Apache httpclient Version: 4.5.6 to 4.5.12
+- Library Apache commons-io Version: 2.6 to 2.7
+- Library Apache commons-text Version: 1.7 to 1.8
+- Library Apache commons-lang 2.6 to commons-lang3 3.10
+- Library Apache httpmime Version: 4.5.6 to 4.5.12
+- Library slf4j-log4j12 Version: 1.7.25 to 1.7.30
+- Test library testng Version: 6.9.10 to 6.9.13.6
+
+### Fixed
+- Fixed NPE when API has no security configured (See issue [#46](https://github.com/Axway-API-Management-Plus/apim-cli/issues/46))
+- apim.sh changed to improve support on Mac/Linux systems. Identifed by [@cbrowet-axway](https://github.com/cbrowet-axway) (See issue [#42](https://github.com/Axway-API-Management-Plus/apim-cli/issues/42))  
+- Improving support for OpenAPI 3.x spec having no servers declared (See issue [#40](https://github.com/Axway-API-Management-Plus/apim-cli/issues/40))
+- API export with methods doesn't contain anymore the internal method-id (See issue [#39](https://github.com/Axway-API-Management-Plus/apim-cli/issues/39))
+- CLI tool is now taking over RC given by each module (See issue [#33](https://github.com/Axway-API-Management-Plus/apim-cli/issues/33))
+- Policies are now exported with their name instead of the internal ID
 
 ## [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
-- Option to filter API having a specificied backendBasepath
+- Option to filter API having a specified backendBasepath
 - Show detailed API information if only 1 API is returned (See issue [#11](https://github.com/Axway-API-Management-Plus/apim-cli/issues/11))
 - 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

distribution/assembly/dist-release.xml

@@ -13,12 +13,10 @@
       <useAllReactorProjects>true</useAllReactorProjects>
       <includes>
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-apim-adapter</include>
-		<include>com.github.axway-api-management-plus.apim-cli:apimcli-api-import</include>
-        <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-apis</include>
+        <include>com.github.axway-api-management-plus.apim-cli:apimcli-apps</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-users</include>
         <include>com.github.axway-api-management-plus.apim-cli:apimcli-tool</include>
       </includes>
       <binaries>

distribution/pom.xml

@@ -22,15 +22,11 @@
 		</dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-			<artifactId>apimcli-api-export</artifactId>
+			<artifactId>apimcli-apis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-			<artifactId>apimcli-api-import</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
-			<artifactId>apimcli-app-export</artifactId>
+			<artifactId>apimcli-apps</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.github.axway-api-management-plus.apim-cli</groupId>