diff --git a/swagger-notebook-service/jupyter-swagger-codegen/Makefile b/swagger-notebook-service/jupyter-swagger-codegen/Makefile index 7a9c9b3..6ad42d1 100644 --- a/swagger-notebook-service/jupyter-swagger-codegen/Makefile +++ b/swagger-notebook-service/jupyter-swagger-codegen/Makefile @@ -3,11 +3,11 @@ .PHONY: config -SWAGGER_VERSION?=2.1.4 -SWAGGER_SPEC?=http://petstore.swagger.io/v2/swagger.json +SWAGGER_VERSION?=2.2.1 +SWAGGER_SPEC?=https://petstore.swagger.io/v2/swagger.json KERNEL?=python3 APP_VERSION?=1.0.0 -REPO=maven:3.3.3-jdk-7 +REPO=maven:3-eclipse-temurin-11 clean: @docker run -it --rm \ @@ -22,7 +22,7 @@ swagger-codegen-cli-$(SWAGGER_VERSION).jar: -v `pwd`:/src \ -v `pwd`/target/.m2:/root/.m2 \ -w /src \ - $(REPO) curl http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/${SWAGGER_VERSION}/swagger-codegen-cli-${SWAGGER_VERSION}.jar -o swagger-codegen-cli-${SWAGGER_VERSION}.jar + $(REPO) curl https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/${SWAGGER_VERSION}/swagger-codegen-cli-${SWAGGER_VERSION}.jar -o swagger-codegen-cli-${SWAGGER_VERSION}.jar download_swagger: swagger-codegen-cli-$(SWAGGER_VERSION).jar @@ -41,5 +41,12 @@ gen: install config download_swagger -v `pwd`:/src \ -v `pwd`/target/.m2:/root/.m2 \ -w /src \ - $(REPO) java -cp swagger-codegen-cli-${SWAGGER_VERSION}.jar:target/jupyter-swagger-codegen-$(APP_VERSION).jar \ + $(REPO) java -cp swagger-codegen-cli-${SWAGGER_VERSION}.jar:target/jupyter-swagger-codegen-${APP_VERSION}.jar \ io.swagger.codegen.Codegen -i ${SWAGGER_SPEC} -l jupyter -c target/config.json + +sh: install config + @docker run -it --rm \ + -v `pwd`:/src \ + -v `pwd`/target/.m2:/root/.m2 \ + -w /src \ + $(REPO) bash diff --git a/swagger-notebook-service/jupyter-swagger-codegen/pom.xml b/swagger-notebook-service/jupyter-swagger-codegen/pom.xml index 4565f2f..a173b7b 100644 --- a/swagger-notebook-service/jupyter-swagger-codegen/pom.xml +++ b/swagger-notebook-service/jupyter-swagger-codegen/pom.xml @@ -7,10 +7,7 @@ jupyter-swagger-codegen jar jupyter-swagger-codegen - ${version} - - 2.2.0 - + 1.0.0 @@ -50,6 +47,7 @@ org.codehaus.mojo build-helper-maven-plugin + 3.4.0 add_sources @@ -82,8 +80,8 @@ maven-compiler-plugin 2.3.2 - 1.7 - 1.7 + 1.8 + 1.8