Maintenance: upgrade component versions

doc/requirements.txt

@@ -1,5 +1,5 @@
-Sphinx==7.3.7
-sphinx-book-theme==1.1.2
+Sphinx==8.0.2
+sphinx-book-theme==1.1.3
 plantuml==0.3.0
 sphinxcontrib-plantuml
 sphinxcontrib-httpdomain

server/django/Dockerfile.django

@@ -1,6 +1,6 @@
 # Use the official lightweight Python image.
 # 3.11.0a4 at the time of writing; use 3.11 when it is released
-FROM python:3.11-slim
+FROM python:3.12-slim
 
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1

server/django/requirements.txt

@@ -1,15 +1,15 @@
-Django==5.0.6
+Django==5.1
 django-extensions==3.2.3
-requests==2.31.0
-djangorestframework==3.15.1
-whitenoise==6.6.0
+requests==2.32.3
+djangorestframework==3.15.2
+whitenoise==6.7.0
 celery[redis]==5.4.0
 gevent==24.2.1
 
 # Generation of Entity-Relationship Diagrams
 graphviz==0.20.3
-pyparsing==3.1.2
-pydot==2.0.0
+pyparsing==3.1.4
+pydot==3.0.1
 
 # Generation of API documentation
 drf-spectacular==0.27.2

server/django/server/celery.py

@@ -12,6 +12,8 @@
 
 app = Celery('server')
 
+app.conf.broker_connection_retry_on_startup = True
+
 # Using a string here means the worker doesn't have to serialize
 # the configuration object to child processes.
 # - namespace='CELERY' means all celery-related configuration keys

server/docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - CELERY_RESULT_BACKEND=redis://redis:6379/0
 
   redis:
-    image: redis:7.2.5
+    image: redis:7.4-alpine
     networks:
       - mynetwork
     ports:

server/leshan/Dockerfile.leshan

@@ -1,5 +1,5 @@
-# Use the official OpenJDK 17 base image
-FROM openjdk:17-slim
+# Use the official OpenJDK 21 base image
+FROM openjdk:21-slim
 
 # Set the working directory in the container
 WORKDIR /leshan
@@ -12,7 +12,7 @@ RUN apt-get update && \
     apt-get install -y maven && \
     rm -rf /var/lib/apt/lists/*
 
-# Your startup script that handles running Leshan and logging
+# Startup script that handles running Leshan and logging
 RUN chmod +x /leshan/leshan_build_run.sh
 
 # Set the entrypoint to your start script

server/leshan/pom.xml

@@ -11,28 +11,28 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>
         <!-- Leshan Server Core dependency -->
         <dependency>
             <groupId>org.eclipse.leshan</groupId>
             <artifactId>leshan-server-cf</artifactId>
-            <version>2.0.0-M14</version>
+            <version>2.0.0-M15</version>
         </dependency>
         <!-- Logback dependencies for logging -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.6</version>
+            <version>1.5.7</version>
         </dependency>
         <!-- SLF4J Simple binding for logging at runtime -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.11</version>
+            <version>2.0.16</version>
             <scope>runtime</scope>
         </dependency>
         <!-- Add other dependencies here as needed -->
@@ -50,17 +50,17 @@
         <dependency>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-webapp</artifactId>
-          <version>11.0.20</version>
+          <version>11.0.23</version>
         </dependency>
         <dependency>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-servlets</artifactId>
-          <version>11.0.20</version>
+          <version>11.0.23</version>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>6.0.0</version>
+            <version>6.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -70,15 +70,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.7.1</version>
                 <configuration>
                     <archive>
                         <manifest>

server/leshan/src/main/java/lwm2m/json/JacksonSecurityDeserializer.java

@@ -34,7 +34,7 @@
 import java.security.spec.KeySpec;
 
 import org.eclipse.leshan.core.util.Hex;
-import org.eclipse.leshan.core.util.SecurityUtil;
+import org.eclipse.leshan.core.security.util.SecurityUtil;
 import org.eclipse.leshan.server.security.SecurityInfo;
 
 import com.fasterxml.jackson.core.JsonParseException;