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/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
-COPY maven/docker-entrypoint.sh /usr/local/bin
+ADD maven/target/resources/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
+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/tomcat-context.xml /var/lib/tomcat/conf/context.xml
-ADD maven/hotswap-agent.properties /var/lib/tomcat/lib
+COPY maven/target/resources/tomcat-context.xml /var/lib/tomcat/conf/context.xml
+ADD maven/target/resources/hotswap-agent.properties /var/lib/tomcat/lib
 
 # Listening for HTTP (not HTTPS) traffic
 EXPOSE 8080

pom.xml

@@ -3,23 +3,21 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>tomcat-rad</artifactId>
-    <version>${base.version}-tomcat-${tomcat.version}</version>
+    <version>10-2.2</version>
     <name>Apache Tomcat for Rapid Application Development</name>
     <packaging>pom</packaging>
 
     <properties>
-        <base.version>2.3</base.version>
-
         <!-- The release version of the Java Hotswap Docker image -->
         <!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker -->
-        <jdk-hotswap.version>2.0.3-jbr-17.0.14</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 -->
-        <tomcat.version>9.0.116</tomcat.version>
-        <tomcat.majorVersion>9</tomcat.majorVersion>
+        <!-- See: https://tomcat.apache.org/download-10.cgi -->
+        <tomcat.version>10.1.41</tomcat.version>
+        <tomcat.majorVersion>10</tomcat.majorVersion>
         <tomcat.mirror.baseUrl>https://archive.apache.org/dist/tomcat</tomcat.mirror.baseUrl>
 
         <!-- The Docker image meta-data for pushing the build -->
@@ -39,7 +37,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-resources</id>
@@ -56,17 +54,15 @@
             <plugin>
                 <groupId>org.eclipse.jkube</groupId>
                 <artifactId>kubernetes-maven-plugin</artifactId>
-                <version>1.19.0</version>
+                <version>1.16.2</version>
                 <configuration>
                     <images>
                         <image>
                             <name>${image.name}:${image.tag}</name>
                             <registry>${image.registry}</registry>
-                            <build>
-                                <contextDir>${project.build.directory}/resources</contextDir>
-                            </build>
                         </image>
                     </images>
+                    <contextDir>${project.build.directory}/resources</contextDir>
                     <buildStrategy>docker</buildStrategy>
                     <verbose>true</verbose>
                 </configuration>
@@ -88,7 +84,7 @@
             <!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless -->
             <plugin>
             	<artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.4</version>
+                <version>3.1.3</version>
             	<configuration>
             		<skip>true</skip>
             	</configuration>