Browse Source

update jvm to be version 21 across all Ktor versions for consistency

Ilya Nemtsev 7 months ago
parent
commit
fd62a31476

+ 2 - 2
frameworks/Kotlin/ktor/ktor-cio.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.9.7-amazoncorretto-17-debian as maven
+FROM maven:3.9.9-amazoncorretto-21-debian-bookworm as maven
 WORKDIR /ktor
 WORKDIR /ktor
 COPY ktor/pom.xml pom.xml
 COPY ktor/pom.xml pom.xml
 COPY ktor/src src
 COPY ktor/src src
 RUN mvn clean package -q
 RUN mvn clean package -q
 
 
-FROM amazoncorretto:17.0.11-al2023-headless
+FROM amazoncorretto:21-al2023-headless
 WORKDIR /ktor
 WORKDIR /ktor
 COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-cio-bundle.jar app.jar
 COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-cio-bundle.jar app.jar
 
 

+ 2 - 2
frameworks/Kotlin/ktor/ktor-jetty.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.9.7-amazoncorretto-17-debian as maven
+FROM maven:3.9.9-amazoncorretto-21-debian-bookworm as maven
 WORKDIR /ktor
 WORKDIR /ktor
 COPY ktor/pom.xml pom.xml
 COPY ktor/pom.xml pom.xml
 COPY ktor/src src
 COPY ktor/src src
 RUN mvn clean package -q
 RUN mvn clean package -q
 
 
-FROM amazoncorretto:17.0.11-al2023-headless
+FROM amazoncorretto:21-al2023-headless
 WORKDIR /ktor
 WORKDIR /ktor
 COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-jetty-bundle.jar app.jar
 COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-jetty-bundle.jar app.jar
 
 

+ 0 - 30
frameworks/Kotlin/ktor/ktor-r2dbc/src/main/assembly/cio-bundle.xml

@@ -1,30 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>cio-bundle</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <dependencySets>
-        <dependencySet>
-            <unpack>true</unpack>
-            <scope>runtime</scope>
-
-            <useTransitiveDependencies>true</useTransitiveDependencies>
-
-            <excludes>
-                <exclude>*:ktor-server-netty</exclude>
-                <exclude>*:ktor-server-jetty</exclude>
-            </excludes>
-        </dependencySet>
-    </dependencySets>
-
-    <fileSets>
-        <fileSet>
-            <directory>${project.build.outputDirectory}</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>

+ 0 - 30
frameworks/Kotlin/ktor/ktor-r2dbc/src/main/assembly/jetty-bundle.xml

@@ -1,30 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>jetty-bundle</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <dependencySets>
-        <dependencySet>
-            <unpack>true</unpack>
-            <scope>runtime</scope>
-
-            <useTransitiveDependencies>true</useTransitiveDependencies>
-
-            <excludes>
-                <exclude>*:ktor-server-netty</exclude>
-                <exclude>*:ktor-server-cio</exclude>
-            </excludes>
-        </dependencySet>
-    </dependencySets>
-
-    <fileSets>
-        <fileSet>
-            <directory>${project.build.outputDirectory}</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>