upgrade jdk/tomcat

Dockerfile

@@ -28,14 +28,14 @@ RUN cd /var/lib/tomcat/dev && \
         mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
 
 # Add our Docker container initialization script
-ADD maven/target/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
+ADD maven/target/resources/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
-COPY maven/target/docker-entrypoint.sh /usr/local/bin
+COPY maven/target/resources/docker-entrypoint.sh /usr/local/bin
 RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
 
 # Add our Apache Tomcat configuration
 #   This gives us dynamic injection points into the running webapps
-COPY maven/target/tomcat-context.xml /var/lib/tomcat/conf/context.xml
+COPY maven/target/resources/tomcat-context.xml /var/lib/tomcat/conf/context.xml
-ADD maven/target/hotswap-agent.properties /var/lib/tomcat/lib
+ADD maven/target/resources/hotswap-agent.properties /var/lib/tomcat/lib
 
 # Listening for HTTP (not HTTPS) traffic
 EXPOSE 8080

pom.xml

@@ -3,22 +3,22 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>tomcat-rad</artifactId>
-    <version>9-2.2</version>
+    <version>10-2.2</version>
     <name>Apache Tomcat for Rapid Application Development</name>
     <packaging>pom</packaging>
 
     <properties>
         <!-- The release version of the Java Hotswap Docker image -->
         <!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker -->
-        <jdk-hotswap.version>2.0.1-jbr-17.0.12</jdk-hotswap.version>
+        <jdk-hotswap.version>2.0.1-jbr-17.0.14</jdk-hotswap.version>
 
         <namespace.prefix>tomcat-rad</namespace.prefix>
 
         <!-- The version of Apache Tomcat to serve as the basis of this Docker image -->
-        <!-- See: https://tomcat.apache.org/download-90.cgi -->
+        <!-- See: https://tomcat.apache.org/download-10.cgi -->
-        <tomcat.version>9.0.98</tomcat.version>
+        <tomcat.version>10.1.41</tomcat.version>
-        <tomcat.majorVersion>9</tomcat.majorVersion>
+        <tomcat.majorVersion>10</tomcat.majorVersion>
-        <tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl>
+        <tomcat.mirror.baseUrl>https://archive.apache.org/dist/tomcat</tomcat.mirror.baseUrl>
 
         <!-- The Docker image meta-data for pushing the build -->
         <image.name>inteligr8/${project.artifactId}</image.name>
@@ -29,14 +29,9 @@
     <build>
         <resources>
             <resource>
-                <directory>.</directory>
+                <directory>src/main/docker</directory>
-                <includes>
-                    <include>*.sh</include>
-                    <include>*.properties</include>
-                    <include>*.xml</include>
-                </includes>
                 <filtering>true</filtering>
-                <targetPath>${project.build.directory}</targetPath>
+                <targetPath>${project.build.directory}/resources</targetPath>
             </resource>
         </resources>
         <plugins>
@@ -59,7 +54,7 @@
             <plugin>
                 <groupId>org.eclipse.jkube</groupId>
                 <artifactId>kubernetes-maven-plugin</artifactId>
-                <version>1.18.0</version>
+                <version>1.16.2</version>
                 <configuration>
                     <images>
                         <image>
@@ -67,7 +62,7 @@
                             <registry>${image.registry}</registry>
                         </image>
                     </images>
-                    <contextDir>${basedir}</contextDir>
+                    <contextDir>${project.build.directory}/resources</contextDir>
                     <buildStrategy>docker</buildStrategy>
                     <verbose>true</verbose>
                 </configuration>