Skip to content

Commit 3c7c17c

Browse files
authored
Merge pull request #506 from Axway-API-Management-Plus/develop
Release 1.14.6
2 parents b8be447 + 42b821d commit 3c7c17c

File tree

40 files changed

+591
-355
lines changed

40 files changed

+591
-355
lines changed

.github/daemon-default.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/integration-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ env:
88
CACHE_FILE_APIM: api-manager_7_7_20240530.cache.tar
99
CACHE_FILE_CASSANDRA: cassandra_4_0_13.cache.tar
1010
FED_FILE: swagger-promote-7.7-20240530.fed
11-
LOG_LEVEL: info
11+
LOG_LEVEL: debug
1212

1313
jobs:
14-
build:
14+
integration-test:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
@@ -58,9 +58,9 @@ jobs:
5858
run: |
5959
mkdir licenses
6060
echo ${{ secrets.APIM_LIC }} | base64 -di > licenses/apim.lic
61-
docker-compose run --rm start_cassandra
62-
docker-compose run --rm start_apimgmt
63-
docker-compose logs --tail 30 apimgmt
61+
docker compose run --rm start_cassandra
62+
docker compose run --rm start_apimgmt
63+
docker compose logs --tail 30 apimgmt
6464
- name: Maven APIM Integration Test
6565
run: mvn verify -P integration-tests
6666

.travis.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
# [1.14.6] In progress
8+
## Fixed
9+
- Importing SOAP API with different endpoints (for import and for runtime calls) (See issue [#501](https://github.com/Axway-API-Management-Plus/apim-cli/issues/501))
10+
- -returnCodeMapping option does not work on apim-cli org import (See issue [#496](https://github.com/Axway-API-Management-Plus/apim-cli/issues/496))
11+
- The output of command 'apim api get' is not containing the complete list of client applications (array) of the api (See issue [#495](https://github.com/Axway-API-Management-Plus/apim-cli/issues/495))
12+
- Update API with Assigned Quota (See issue [#499](https://github.com/Axway-API-Management-Plus/apim-cli/issues/499))
13+
14+
### Added
15+
- Force APIM-cli to download the latest Trusted Certificates in a Frontend API (See issue [#494](https://github.com/Axway-API-Management-Plus/apim-cli/issues/494))
16+
17+
### Changed
18+
- Updated libs to fix security vulnerabilities
19+
- com.graphql-java:graphql-java from 21.3 to 21.5
20+
- commons-io:commons-io from 2.11.0 to 2.14.0
21+
22+
723
# [1.14.5] 2024-07-12
824

925
## Fixed

DEVELOPMENT.md

Lines changed: 6 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -19,50 +19,11 @@ are ready for the next version. This means that the develop branch is actually s
1919
- GnuPG for Code-Signing (e.g. https://gnupg.org/)
2020
- Apache Maven 3.6.3 or higher
2121

22-
#### Maven settings.xml
22+
### Maven pgp usage
23+
- https://maven.apache.org/plugins/maven-gpg-plugin/usage.html
2324

24-
A server configuration for GitHub write access by Maven using your personal access token.
2525

26-
```xml
27-
<server>
28-
<id>github</id>
29-
<username>[email protected]</username>
30-
<password>YOUR_GITHUB_PAT</password>
31-
</server>
32-
```
33-
The Code must be signed to be published to Maven-Central. A Signing-Key must be created and published:
34-
Learn more: https://central.sonatype.org/publish/requirements/gpg/
35-
36-
Confguration required for the Sonatype communication:
37-
Learn more: https://github.com/chhh/sonatype-ossrh-parent/blob/master/publishing-to-maven-central.md
38-
39-
A profile Sonatype servers used by Sonatype maven plugin.
40-
41-
```xml
42-
<server>
43-
<id>ossrh</id>
44-
<username>YOUR_OSSRH_USERNAME</username>
45-
<password>YOUR_OSSRH_PASSWORD</password>
46-
</server>
47-
```
48-
49-
A profile for GPG which is used by the `maven-gpg-plugin` plugin.
50-
51-
```xml
52-
<profile>
53-
<id>ossrh</id>
54-
<activation>
55-
<activeByDefault>true</activeByDefault>
56-
</activation>
57-
<properties>
58-
<gpg.executable>gpg</gpg.executable>
59-
<gpg.passphrase>axway</gpg.passphrase>
60-
</properties>
61-
</profile>
62-
```
63-
Learn more: https://maven.apache.org/plugins/maven-gpg-plugin/usage.html
64-
65-
### Create a new release
26+
## Create a new release
6627

6728
For the release, develop is merged into Master and the release is generated on Master with Maven.
6829

@@ -85,47 +46,12 @@ git commit
8546
git push
8647
```
8748

88-
### 4. Create Pre-Release with Maven
49+
### 4. Create Release with Maven
8950

90-
```sh
91-
mvn -Darguments=-DskipTests release:prepare -P release
92-
93-
# Set the version number following [Semantic Versioning](https://semver.org/)
94-
# Git-Label version should be for example: 1.11.0
95-
# Next SNAPSHOT Version: 1.12.0-SNAPSHOT
96-
```
97-
98-
### 5. Validate the Pre-Release
99-
100-
- Use the Pre-Release to manually perform some smoke tests
101-
`apim-cli\distribution\target`
102-
- If you are not happy with the actual build for any reason, you need to rollback the actual release prepare:
103-
```sh
104-
mvn release:rollback
105-
# Sometimes the created tag isn't removed automatically. You need to delete it to re-execute release:prepare:
106-
git tag -d 1.11.0
107-
git push origin :refs/tags/1.11.0
108-
```
109-
110-
### 6. Create the release
111-
112-
```sh
113-
# This uploads the release artifacts to Maven-Central automatically
114-
mvn -Darguments=-DskipTests release:perform -P release
115-
```
116-
117-
### 7. Create a release on GitHub
51+
- Run Github action Release API CLI on github and Maven repository
11852

119-
- Select the tag created by Maven
120-
- Use the description from the previous release and modify it
121-
- It also pushes the Chocolately package
122-
- upload the created release files to GitHub:
123-
```
124-
target/checkout/distribution/target/axway-apimcli-1.11.0.zip
125-
target/checkout/distribution/target/axway-apimcli-1.11.0.tar.gz
126-
```
12753

128-
### 8. Commit all changes and merge master into develop
54+
### 5. Commit all changes and merge master into develop
12955
```
13056
git checkout develop
13157
git merge master

ROTATE_PGP_KEY.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Rotate PGP Keys.
2+
3+
PGP key comes with expiry date.
4+
5+
6+
## Create new key
7+
8+
```bash
9+
➜ apim-cli git:(master) gpg --gen-key
10+
gpg (GnuPG) 2.4.5; Copyright (C) 2024 g10 Code GmbH
11+
This is free software: you are free to change and redistribute it.
12+
There is NO WARRANTY, to the extent permitted by law.
13+
14+
Note: Use "gpg --full-generate-key" for a full featured key generation dialog.
15+
16+
GnuPG needs to construct a user ID to identify your key.
17+
18+
Real name: Rathna
19+
Email address: [email protected]
20+
You selected this USER-ID:
21+
"Rathna <[email protected]>"
22+
23+
Change (N)ame, (E)mail, or (O)kay/(Q)uit? O
24+
```
25+
26+
## Push the key to Key server
27+
28+
Use the pgp id to upload it key server
29+
30+
```bash
31+
gpg --keyserver keyserver.ubuntu.com --send-keys 5D8F776E941F2D1D91EB2875212961A21019826F
32+
```
33+
34+
## Store the key password and private key to Github action secrets and variables.
35+
36+
- Secret names
37+
- GPG_PASSPHRASE
38+
- GPG_PRIVATE_KEY
39+
40+
### Export private key
41+
```bash
42+
gpg --output private.pgp --armor --export-secret-key 5D8F776E941F2D1D91EB2875212961A21019826F
43+
```

build/base_apim_setup.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

build/pull_apim_docker_image.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

build/pull_cassandra_docker_image.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

build/pull_wait_for_dependencies.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)