Refactoring add oscore module - edit file content

This aims to implement : eclipse-leshan#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
sbernard31 · Jul 4, 2024 · 8d434d4 · 8d434d4
1 parent d5c81f1
commit 8d434d4
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>