build(general): replaced jdk by docker openapitool

Signed-off-by: jordigiam <jordi.giron.amezcua@accenture.com>

.devcontainer/Dockerfile

@@ -27,12 +27,6 @@ RUN apt-get update \
 RUN apt-get update \
     && apt-get install software-properties-common -y
 
-# Install openJDK 8
-RUN apt-get update \
-    && apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main' \
-    && apt-get update \
-    && apt-get install openjdk-8-jdk -y
-
 # Install pip3
 RUN apt-get update \
     && apt-get install python3-pip -y

.github/workflows/ci.yml

@@ -47,13 +47,6 @@ jobs:
     # - name: Set up Docker Buildx (ARM64 docker images once we are ready)
     #   uses: docker/setup-buildx-action@v1.0.3
 
-    - name: Set up JDK 8 (OpenAPI generator needs it)
-      uses: actions/setup-java@v1.4.3
-      with:
-        java-version: '8.0.275' # The JDK version to make available on the path.
-        java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
-        architecture: x64 # (x64 or x86) - defaults to x64
-
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v2.1.2
       with:

BUILD.md

@@ -90,7 +90,6 @@ The `npm run watch` script in action:
     * WSL1 or WSL2 or any virtual machine running Ubuntu LTS
   * Git
   * NodeJS 12 or newer LTS (we recommend using nvm if available for your OS)
-  * OpenJDK 11
   * Docker Engine
   * Docker Compose
 

examples/cactus-example-carbon-accounting-business-logic-plugin/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios --reserved-words-mappings protected=protected",
     "tsc": "tsc --project ./tsconfig.json",
     "pretsc": "npm run generate-sdk",
     "watch": "npm-watch",

examples/cactus-example-supply-chain-business-logic-plugin/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/",
     "tsc": "tsc --project ./tsconfig.json",
     "pretsc": "npm run generate-sdk",
     "watch": "npm-watch",

examples/carbon-accounting/Dockerfile

@@ -2,9 +2,6 @@ FROM node:12.20.1-alpine3.12 as builder
 
 RUN apk update
 
-# Need JDK for the openapi-generator that is part of the build process
-RUN apk add --no-cache openjdk8
-
 # Need git because some of our npm depedencies might be coming
 # straight from github instead of being an npm package on npmjs.com.
 RUN apk add --no-cache git

examples/supply-chain-app/Dockerfile

@@ -2,9 +2,6 @@ FROM node:12.20.1-alpine3.12 as builder
 
 RUN apk update
 
-# Need JDK for the openapi-generator that is part of the build process
-RUN apk add --no-cache openjdk8
-
 # Need git because some of our npm depedencies might be coming
 # straight from github instead of being an npm package on npmjs.com.
 RUN apk add --no-cache git

packages/cactus-cmd-api-server/package.json

@@ -15,7 +15,7 @@
   "module": "dist/lib/main/typescript/index.js",
   "types": "dist/types/main/typescript/index.d.ts",
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
     "pretsc": "npm run generate-sdk",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",

packages/cactus-core-api/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
     "pretsc": "npm run generate-sdk",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",

packages/cactus-plugin-consortium-manual/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
+    "generate-sdk": "docker run --rm -v \"${PWD}/../../:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/packages/cactus-plugin-consortium-manual/src/main/json/openapi.json -g typescript-axios -o ./local/packages/cactus-plugin-consortium-manual/src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
     "tsc": "tsc --project ./tsconfig.json",
     "pretsc": "npm run generate-sdk",
     "watch": "npm-watch",

packages/cactus-plugin-keychain-memory/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
     "pretsc": "npm run generate-sdk",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",

packages/cactus-plugin-keychain-vault/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/",
+    "generate-sdk": "docker run --rm -v \"${PWD}/../../:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/packages/cactus-plugin-keychain-vault/src/main/json/openapi.json -g typescript-axios -o ./local/packages/cactus-plugin-keychain-vault/src/main/typescript/generated/openapi/typescript-axios/",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",
     "pretsc": "npm run generate-sdk",

packages/cactus-plugin-ledger-connector-besu/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
     "pretsc": "npm run generate-sdk",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",

packages/cactus-plugin-ledger-connector-corda/package.json

@@ -12,8 +12,8 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/",
-    "generate-server": "openapi-generator generate --input-spec src/main/json/openapi.json -g kotlin-spring -o ./src/main-server/kotlin/gen/kotlin-spring/ -c ./src/main-server/openapi-generator-config.yaml",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/",
+    "generate-server": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g kotlin-spring -o ./local/src/main-server/kotlin/gen/kotlin-spring/ -c ./local/src/main-server/openapi-generator-config.yaml",
     "pretsc": "npm-run-all generate-sdk generate-server",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",

packages/cactus-plugin-ledger-connector-fabric/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
     "pretsc": "npm run generate-sdk",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",

packages/cactus-plugin-ledger-connector-quorum/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",      
     "pretsc": "npm run generate-sdk",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",

packages/cactus-plugin-ledger-connector-xdai/package.json

@@ -12,7 +12,7 @@
     "dist/*"
   ],
   "scripts": {
-    "generate-sdk": "openapi-generator generate --input-spec src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
+    "generate-sdk": "docker run --rm -v \"${PWD}:/local\" openapitools/openapi-generator-cli:v5.0.0-beta2 generate -i ./local/src/main/json/openapi.json -g typescript-axios -o ./local/src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
     "pretsc": "npm run generate-sdk",
     "tsc": "tsc --project ./tsconfig.json",
     "watch": "npm-watch",