upgrade to jdk17

Dockerfile

@@ -1,5 +1,5 @@
 
-FROM docker.inteligr8.com/inteligr8/java-dcevm-hotswap:${java-dcevm-hotswap.version}
+FROM docker.inteligr8.com/inteligr8/jdk-hotswap:${jdk-hotswap.version}
 
 # Configure the Apache Tomcat Catalina script
 ENV JAVA_MEMORY_INIT=128m
@@ -26,14 +26,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 setenv.sh /usr/local/bin/${project.artifactId}-setenv.sh
-COPY docker-entrypoint.sh /usr/local/bin
+ADD maven/target/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
+COPY maven/target/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 tomcat-context.xml /var/lib/tomcat/conf/context.xml
-ADD hotswap-agent.properties /var/lib/tomcat/lib
+COPY maven/target/tomcat-context.xml /var/lib/tomcat/conf/context.xml
+ADD maven/target/hotswap-agent.properties /var/lib/tomcat/lib
 
 # Listening for HTTP (not HTTPS) traffic
 EXPOSE 8080

README.md

@@ -1,7 +1,7 @@
 
 # Apache Tomcat Application Container Image with Hot-Reloading
 
-This project creates a Docker image that has uses the [Java DCEVM Hotswap Docker Image](/inteligr8/java-dcevm-hotswap-docker) to support hot-reloading for the enablement of rapid application development.  As a Docker image, containers can be started to facilitate development without requiring complicated installations on developer workstations.
+This project creates a Docker image that has uses the [Java Hotswap Docker Image](/inteligr8/jdk-hotswap-docker) to support hot-reloading for the enablement of rapid application development.  As a Docker image, containers can be started to facilitate development without requiring complicated installations on developer workstations.
 
 It is expected that containers are configured in Maven using the Fabric8 or Spotify Docker plugins.  These configurations should expose the 8080 (HTTP) and 8000 (debugger) ports and any other port that the application may open.  Most importantly, it should mount/bind the source code to the following possible paths.
 

docker-entrypoint.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-. /usr/local/bin/java-dcevm-hotswap-setenv.sh
-. /usr/local/bin/tomcat-rad-setenv.sh
+. /usr/local/bin/jdk-hotswap-setenv.sh
+. /usr/local/bin/${namespace.prefix}-setenv.sh
 
 exec "$@"

hotswap-agent.properties

@@ -52,7 +52,7 @@ webappDir=/var/lib/tomcat/dev/web
 
 # Comma separated list of disabled plugins
 # Use plugin name - e.g. Hibernate, Spring, ZK, Hotswapper, AnonymousClassPatch, Tomcat, Logback ....
-disabledPlugins=Hibernate
+disabledPlugins=${hotswap.disablePlugins}
 
 # Watch for changed class files on watchResources path and reload class definition in the running application.
 #

pom.xml

@@ -3,18 +3,20 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>tomcat-rad</artifactId>
-    <version>9-1.3</version>
+    <version>9-2.0</version>
     <name>Apache Tomcat for Rapid Application Development</name>
     <packaging>pom</packaging>
 
     <properties>
-        <!-- The release version of the Java DCEVM Hotswap Docker image -->
-        <!-- See: https://bitbucket.org/inteligr8/java-dcevm-hotswap-docker -->
-        <java-dcevm-hotswap.version>11.0.11-1.4.1</java-dcevm-hotswap.version>
+        <!-- The release version of the Java Hotswap Docker image -->
+        <!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker -->
+        <jdk-hotswap.version>1.4.1-jbr-17.0.8</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.46</tomcat.version>
+        <tomcat.version>9.0.80</tomcat.version>
         <tomcat.majorVersion>9</tomcat.majorVersion>
         <tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl>
 
@@ -25,12 +27,39 @@
     </properties>
 
     <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>*.sh</include>
+                    <include>*.properties</include>
+                    <include>*.xml</include>
+                </includes>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}</targetPath>
+            </resource>
+        </resources>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-resources</phase>
+                        <goals><goal>resources</goal></goals>
+                        <configuration>
+                            <encoding>utf-8</encoding>
+                            <propertiesEncoding>utf-8</propertiesEncoding>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- This plugin build and pushes the Docker image -->
             <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>fabric8-maven-plugin</artifactId>
-                <version>4.4.0</version>
+                <groupId>org.eclipse.jkube</groupId>
+                <artifactId>kubernetes-maven-plugin</artifactId>
+                <version>1.14.0</version>
                 <configuration>
                     <images>
                         <image>
@@ -60,7 +89,7 @@
             <!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless -->
             <plugin>
             	<artifactId>maven-deploy-plugin</artifactId>
-                <version>3.0.0-M1</version>
+                <version>3.1.1</version>
             	<configuration>
             		<skip>true</skip>
             	</configuration>