Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve warnings and use https for URLs (because http no longer supported by either source). #76

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions swagger-notebook-service/jupyter-swagger-codegen/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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

Expand All @@ -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
10 changes: 4 additions & 6 deletions swagger-notebook-service/jupyter-swagger-codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
<artifactId>jupyter-swagger-codegen</artifactId>
<packaging>jar</packaging>
<name>jupyter-swagger-codegen</name>
<version>${version}</version>
<prerequisites>
<maven>2.2.0</maven>
</prerequisites>
<version>1.0.0</version>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -50,6 +47,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<executions>
<execution>
<id>add_sources</id>
Expand Down Expand Up @@ -82,8 +80,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
Expand Down