From 8d434d42dd4cb2fa72d71fe106032724e29bcb1b Mon Sep 17 00:00:00 2001
From: Simon Bernard <code@simonbernard.eu>
Date: Thu, 4 Jul 2024 11:13:26 +0200
Subject: [PATCH] Refactoring add oscore module - edit file content

This aims to implement :
https://github.com/eclipse-leshan/leshan/issues/1295

Refactoring was done in 2 commits to try to keep git history :
https://stackoverflow.com/questions/2314652/is-it-possible-to-move-rename-files-in-git-and-maintain-their-history
---
 leshan-demo-bsserver/pom.xml              |  4 ++++
 leshan-demo-client/pom.xml                |  4 ++++
 leshan-demo-server/pom.xml                |  4 ++++
 leshan-integration-tests/pom.xml          | 20 ++++++++++++----
 leshan-tl-cf-bsserver-coap-oscore/pom.xml | 12 ++--------
 leshan-tl-cf-client-coap-oscore/pom.xml   | 17 ++------------
 leshan-tl-cf-client-coap/pom.xml          |  5 ----
 leshan-tl-cf-server-coap-oscore/pom.xml   | 12 ++--------
 pom.xml                                   | 28 ++++++++++++++++++++++-
 9 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/leshan-demo-bsserver/pom.xml b/leshan-demo-bsserver/pom.xml
index e365f432bd..048ed5aa32 100644
--- a/leshan-demo-bsserver/pom.xml
+++ b/leshan-demo-bsserver/pom.xml
@@ -33,6 +33,10 @@ Contributors:
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-tl-cf-bsserver-coap</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-cf-bsserver-coap-oscore</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-demo-shared</artifactId>
diff --git a/leshan-demo-client/pom.xml b/leshan-demo-client/pom.xml
index 5bb4429d19..5b28d920ae 100644
--- a/leshan-demo-client/pom.xml
+++ b/leshan-demo-client/pom.xml
@@ -33,6 +33,10 @@ Contributors:
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-tl-cf-client-coap</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-cf-client-coap-oscore</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-tl-jc-client-coap</artifactId>
diff --git a/leshan-demo-server/pom.xml b/leshan-demo-server/pom.xml
index 23aa03ef81..233304c4a8 100644
--- a/leshan-demo-server/pom.xml
+++ b/leshan-demo-server/pom.xml
@@ -37,6 +37,10 @@ Contributors:
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-tl-cf-server-coap</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-cf-server-coap-oscore</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-demo-shared</artifactId>
diff --git a/leshan-integration-tests/pom.xml b/leshan-integration-tests/pom.xml
index 35a6a6cdc8..ea30ca2017 100644
--- a/leshan-integration-tests/pom.xml
+++ b/leshan-integration-tests/pom.xml
@@ -44,19 +44,27 @@ Contributors:
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-tl-jc-server-coap</artifactId>
+      <artifactId>leshan-tl-cf-client-coap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-tl-jc-server-coaptcp</artifactId>
+      <artifactId>leshan-tl-cf-server-coap-oscore</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-lwm2m-server-redis</artifactId>
+      <artifactId>leshan-tl-cf-bsserver-coap-oscore</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-tl-cf-client-coap</artifactId>
+      <artifactId>leshan-tl-cf-client-coap-oscore</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-jc-server-coap</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-jc-server-coaptcp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
@@ -66,6 +74,10 @@ Contributors:
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-tl-jc-client-coaptcp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-lwm2m-server-redis</artifactId>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
diff --git a/leshan-tl-cf-bsserver-coap-oscore/pom.xml b/leshan-tl-cf-bsserver-coap-oscore/pom.xml
index 875d23130c..09cd6bbfbb 100644
--- a/leshan-tl-cf-bsserver-coap-oscore/pom.xml
+++ b/leshan-tl-cf-bsserver-coap-oscore/pom.xml
@@ -33,19 +33,11 @@ Contributors:
   <dependencies>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-tl-cf-shared</artifactId>
+      <artifactId>leshan-tl-cf-bsserver-coap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-lwm2m-bsserver</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.californium</groupId>
-      <artifactId>californium-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.californium</groupId>
-      <artifactId>scandium</artifactId>
+      <artifactId>leshan-tl-cf-shared-oscore</artifactId>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/leshan-tl-cf-client-coap-oscore/pom.xml b/leshan-tl-cf-client-coap-oscore/pom.xml
index 5a2b11cbfa..4fe3cf860a 100644
--- a/leshan-tl-cf-client-coap-oscore/pom.xml
+++ b/leshan-tl-cf-client-coap-oscore/pom.xml
@@ -33,24 +33,11 @@ Contributors:
   <dependencies>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-tl-cf-shared</artifactId>
+      <artifactId>leshan-tl-cf-client-coap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-lwm2m-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.californium</groupId>
-      <artifactId>californium-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.californium</groupId>
-      <artifactId>scandium</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.californium</groupId>
-      <artifactId>cf-oscore</artifactId>
-      <version>${californium.version}</version>
+      <artifactId>leshan-tl-cf-shared-oscore</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/leshan-tl-cf-client-coap/pom.xml b/leshan-tl-cf-client-coap/pom.xml
index badf749cbf..4be1c8abf3 100644
--- a/leshan-tl-cf-client-coap/pom.xml
+++ b/leshan-tl-cf-client-coap/pom.xml
@@ -47,10 +47,5 @@ Contributors:
       <groupId>org.eclipse.californium</groupId>
       <artifactId>scandium</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.californium</groupId>
-      <artifactId>cf-oscore</artifactId>
-      <version>${californium.version}</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/leshan-tl-cf-server-coap-oscore/pom.xml b/leshan-tl-cf-server-coap-oscore/pom.xml
index fb743d1d7a..d7342e7dd3 100644
--- a/leshan-tl-cf-server-coap-oscore/pom.xml
+++ b/leshan-tl-cf-server-coap-oscore/pom.xml
@@ -33,19 +33,11 @@ Contributors:
   <dependencies>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-tl-cf-shared</artifactId>
+      <artifactId>leshan-tl-cf-server-coap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-lwm2m-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.californium</groupId>
-      <artifactId>californium-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.californium</groupId>
-      <artifactId>scandium</artifactId>
+      <artifactId>leshan-tl-cf-shared-oscore</artifactId>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/pom.xml b/pom.xml
index 1e4b49c971..5d11889c18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,11 +86,16 @@ Contributors:
     <module>leshan-lwm2m-server</module>
     <module>leshan-lwm2m-server-redis</module>
 
-    <!-- transport layer based on californiuù -->
+    <!-- transport layer based on californium -->
     <module>leshan-tl-cf-shared</module>
     <module>leshan-tl-cf-bsserver-coap</module>
     <module>leshan-tl-cf-client-coap</module>
     <module>leshan-tl-cf-server-coap</module>
+    <!-- transport layer based on californium oscore -->
+    <module>leshan-tl-cf-shared-oscore</module>
+    <module>leshan-tl-cf-bsserver-coap-oscore</module>
+    <module>leshan-tl-cf-client-coap-oscore</module>
+    <module>leshan-tl-cf-server-coap-oscore</module>
 
     <!-- transport layer based on java-coap -->
     <module>leshan-tl-jc-shared</module>
@@ -200,6 +205,27 @@ Contributors:
         <artifactId>leshan-tl-cf-client-coap</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <!-- transport layer based on Californium OSCORE-->
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>leshan-tl-cf-shared-oscore</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>leshan-tl-cf-bsserver-coap-oscore</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>leshan-tl-cf-server-coap-oscore</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>leshan-tl-cf-client-coap-oscore</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <!-- transport layer based on java-coap -->
       <dependency>