jbr v21.0.7

Dockerfile

@@ -11,9 +11,9 @@ ENV ENABLE_HOTSWAP=true
 ENV ENABLE_JDWP=true
 ENV DISABLE_HOTSWAP_PLUGINS=
 
-# Install curl
+# Install curl & essentials
 RUN apt update && \
-        apt -y install curl
+        apt -y install curl libfreetype6 fontconfig fonts-dejavu
 
 # Download & Install JBR Java
 RUN mkdir -p /usr/local/lib/jvm && \
@@ -34,12 +34,12 @@ RUN mkdir -p /var/lib/jvm && cd /var/lib/jvm && \
         mkdir lib lib-extra1 lib-extra2 lib-extra3 lib-extra4 lib-extra5 lib-extra6 lib-extra7
 
 # Add our Docker container initialization scripts
-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
-ADD maven/target/docker-entrypoint.sh /usr/local/bin
+ADD maven/target/resources/docker-entrypoint.sh /usr/local/bin
 RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
 
 # Add our default hotswap configuration; may be overwritten in dev/classes* volumes
-ADD maven/target/hotswap-agent.properties /var/lib/jvm/lib
+ADD maven/target/resources/hotswap-agent.properties /var/lib/jvm/lib
 
 # Listening for Java debugger traffic
 EXPOSE 8000

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>jdk-hotswap</artifactId>
-    <version>1.4.1-jbr-17.0.11</version>
+    <version>${hotswap.version}-jbr-${jbr.version}</version>
     <name>Java Hotswap Kit for Rapid Application Development</name>
     <packaging>pom</packaging>
 
@@ -11,18 +11,18 @@
         <!-- The release version of Ubuntu to use as the base -->
         <!-- See: https://hub.docker.com/_/ubuntu -->
         <!-- This has very little impact and may be replaced -->
-        <ubuntu.version>24.04</ubuntu.version>
+        <ubuntu.version>25.04</ubuntu.version>
 
         <namespace.prefix>${project.artifactId}</namespace.prefix>
 
         <!-- The version of the Hotswap Agent to use -->
         <!-- See: https://github.com/HotswapProjects/HotswapAgent/releases -->
-        <hotswap.version>1.4.1</hotswap.version>
+        <hotswap.version>2.0.1</hotswap.version>
 
         <!-- The version of the JetBrains JDK -->
         <!-- See: https://github.com/JetBrains/JetBrainsRuntime/releases -->
-        <jbr.version>17.0.11</jbr.version>
+        <jbr.version>21.0.7</jbr.version>
-        <jbr.buildNumber>1207.30</jbr.buildNumber>
+        <jbr.buildNumber>1020.35</jbr.buildNumber>
         <jbr.basename>jbr_jcef-${jbr.version}-linux-x64-b${jbr.buildNumber}</jbr.basename>
         <jbr.filename>${jbr.basename}.tar.gz</jbr.filename>
 
@@ -35,13 +35,9 @@
     <build>
         <resources>
             <resource>
-                <directory>.</directory>
+                <directory>src/main/docker</directory>
-                <includes>
-                    <include>*.sh</include>
-                    <include>*.properties</include>
-                </includes>
                 <filtering>true</filtering>
-                <targetPath>${project.build.directory}</targetPath>
+                <targetPath>${project.build.directory}/resources</targetPath>
             </resource>
         </resources>
         <plugins>
@@ -72,7 +68,8 @@
                             <registry>${image.registry}</registry>
                         </image>
                     </images>
-                    <contextDir>${project.build.directory}</contextDir>
+                    <contextDir>${project.build.directory}/resources</contextDir>
+                    <dockerFile>${project.basedir}/Dockerfile</dockerFile>
                     <verbose>true</verbose>
                 </configuration>
                 <executions>
@@ -93,7 +90,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.2</version>
+                <version>3.1.4</version>
             	<configuration>
             		<skip>true</skip>
             	</configuration>