From 9e96bea367622f27ab3026837dddf2f01aa58fbb Mon Sep 17 00:00:00 2001
From: Jim White <jim@ifcx.org>
Date: Sun, 21 Apr 2024 11:37:55 -0700
Subject: [PATCH 1/2] Resolve warnings and use https for URLs (because http no
 longer supported by either source).

---
 .../jupyter-swagger-codegen/Makefile              | 15 +++++++++++----
 .../jupyter-swagger-codegen/pom.xml               | 10 ++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/swagger-notebook-service/jupyter-swagger-codegen/Makefile b/swagger-notebook-service/jupyter-swagger-codegen/Makefile
index 7a9c9b3..ed3c5ed 100644
--- a/swagger-notebook-service/jupyter-swagger-codegen/Makefile
+++ b/swagger-notebook-service/jupyter-swagger-codegen/Makefile
@@ -4,10 +4,10 @@
 .PHONY: config
 
 SWAGGER_VERSION?=2.1.4
-SWAGGER_SPEC?=http://petstore.swagger.io/v2/swagger.json
+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.9-sapmachine
 
 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..17980c9 100644
--- a/swagger-notebook-service/jupyter-swagger-codegen/pom.xml
+++ b/swagger-notebook-service/jupyter-swagger-codegen/pom.xml
@@ -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>
@@ -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>
@@ -82,8 +80,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>21</source>
+          <target>21</target>
         </configuration>
       </plugin>
     </plugins>

From fdae3566251330fe8bebae2481fcd104417c9b97 Mon Sep 17 00:00:00 2001
From: Jim White <jim@ifcx.org>
Date: Sun, 21 Apr 2024 11:49:53 -0700
Subject: [PATCH 2/2] Update to current codegen release.

---
 swagger-notebook-service/jupyter-swagger-codegen/Makefile | 4 ++--
 swagger-notebook-service/jupyter-swagger-codegen/pom.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/swagger-notebook-service/jupyter-swagger-codegen/Makefile b/swagger-notebook-service/jupyter-swagger-codegen/Makefile
index ed3c5ed..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_VERSION?=2.2.1
 SWAGGER_SPEC?=https://petstore.swagger.io/v2/swagger.json
 KERNEL?=python3
 APP_VERSION?=1.0.0
-REPO=maven:3.9-sapmachine
+REPO=maven:3-eclipse-temurin-11
 
 clean:
 	@docker run -it --rm \
diff --git a/swagger-notebook-service/jupyter-swagger-codegen/pom.xml b/swagger-notebook-service/jupyter-swagger-codegen/pom.xml
index 17980c9..a173b7b 100644
--- a/swagger-notebook-service/jupyter-swagger-codegen/pom.xml
+++ b/swagger-notebook-service/jupyter-swagger-codegen/pom.xml
@@ -80,8 +80,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>21</source>
-          <target>21</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>