Merge branch 'malowe/master/update-jenkins-build' into 'master'

Fix makefile + package json to not use npm

See merge request eclipsefdn/it/api/geoip-rest-api!23

.gitignore

@@ -62,3 +62,4 @@ data/
 .env
 src/test/resources/schemas
 node_modules
+/.apt_generated_tests/

Makefile

@@ -2,15 +2,15 @@ clean:;
 	rm -rf ./maxmind
 	mvn clean
 install: clean;
-	npm ci 
+	yarn install --frozen-lockfile 
 	sh ./bin/maxmind.sh maxmind/
 package: install;
 	mvn compile package -Declipse.maxmind.root=${PWD}/maxmind
 dirty-package:;
 	mvn compile package -Declipse.maxmind.root=${PWD}/maxmind
 production-build:;
-	npm ci
-	npm run generate-json-schema
+	yarn install --frozen-lockfile
+	yarn run generate-json-schema
 	mvn compile package -Declipse.maxmind.root=${PWD}/maxmind
 headless-docker: package;
 	docker-compose down

package.json

@@ -11,9 +11,9 @@
   },
   "private": true,
   "scripts": {
-    "start": "npm run generate-json-schema && npx @redocly/openapi-cli preview-docs spec/openapi.yaml -p 8093",
-    "test": "npm run generate-json-schema && npx @redocly/openapi-cli lint spec/openapi.yaml",
-    "generate-json-schema": "npm run clean && node src/main/js/openapi2schema.js -s spec/openapi.yaml -t src/test/resources",
+    "start": "yarn run generate-json-schema && npx @redocly/openapi-cli preview-docs spec/openapi.yaml -p 8093",
+    "test": "yarn run generate-json-schema && npx @redocly/openapi-cli lint spec/openapi.yaml",
+    "generate-json-schema": "yarn run clean && node src/main/js/openapi2schema.js -s spec/openapi.yaml -t src/test/resources",
     "clean": "rm -rf src/test/resources/schemas/"
   }
 }