Repository: eclipse/leshan
Pull request #860 (2020-07-08 10:51:27)

SecurityMode: Add missing "Certificate mode with EST" (4)
This adds missing EST security mode enum value.

Now the list should be complete vs. specification.

This change relates to: https://github.com/eclipse/leshan/issues/859

Signed-off-by: Vesa Jääskeläinen <dachaac@gmail.com>

sbernard31: > I don't want to cause you extra work on re-creating 2.0.x branch so that you might receive some contributions for that -- I don't personally see that model viable contributing method. I feel better to have volatile working branch for a feature and then just rebasing periodically with master to receive new changes from there.

Just to let you know, I will try to release the 1.1 soon and I will create the official new 2.0.x/master branch.
Do you want I create you a dedicate branch for EST ? name : `est_v11` ? (feel free to propose a better name ?)

dachaac: I have my working branch in my fork:
https://github.com/dachaac/leshan/tree/est-support

I like to keep work-in-progress stuff in my fork and only integrate tidied up stuff. So no need to create a specific branch at this time. Let's see how it goes when we progress further.

This particular small change can go also with current version of master as it should not have any effect for anything else. But if you are about to make release feel free to wait with this.

Patch:
diff --git a/leshan-bsserver-demo/pom.xml b/leshan-bsserver-demo/pom.xml
index 45dd986a..9e916279 100644
--- a/leshan-bsserver-demo/pom.xml
+++ b/leshan-bsserver-demo/pom.xml
@@ -20,7 +20,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-bsserver-demo</artifactId>
     <name>leshan - bootstrap server demo</name>
diff --git a/leshan-client-cf/pom.xml b/leshan-client-cf/pom.xml
index d86060e9..d2bf2d66 100644
--- a/leshan-client-cf/pom.xml
+++ b/leshan-client-cf/pom.xml
@@ -22,7 +22,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-client-cf</artifactId>
     <packaging>bundle</packaging>
diff --git a/leshan-client-core/pom.xml b/leshan-client-core/pom.xml
index 74b79cad..178f8443 100644
--- a/leshan-client-core/pom.xml
+++ b/leshan-client-core/pom.xml
@@ -22,7 +22,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-client-core</artifactId>
     <packaging>bundle</packaging>
diff --git a/leshan-client-demo/pom.xml b/leshan-client-demo/pom.xml
index 7e385f87..a41b588d 100644
--- a/leshan-client-demo/pom.xml
+++ b/leshan-client-demo/pom.xml
@@ -20,7 +20,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-client-demo</artifactId>
     <name>leshan - client demo</name>
diff --git a/leshan-core-cf/pom.xml b/leshan-core-cf/pom.xml
index e94edf83..293af6f9 100644
--- a/leshan-core-cf/pom.xml
+++ b/leshan-core-cf/pom.xml
@@ -20,7 +20,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-core-cf</artifactId>
     <packaging>bundle</packaging>
diff --git a/leshan-core/pom.xml b/leshan-core/pom.xml
index 1b084f74..82eda4f4 100644
--- a/leshan-core/pom.xml
+++ b/leshan-core/pom.xml
@@ -22,7 +22,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-core</artifactId>
     <packaging>bundle</packaging>
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/SecurityMode.java b/leshan-core/src/main/java/org/eclipse/leshan/core/SecurityMode.java
index 83137432..3de18703 100644
--- a/leshan-core/src/main/java/org/eclipse/leshan/core/SecurityMode.java
+++ b/leshan-core/src/main/java/org/eclipse/leshan/core/SecurityMode.java
@@ -19,7 +19,7 @@ package org.eclipse.leshan.core;
  * The different DTLS security modes
  */
 public enum SecurityMode {
-    PSK(0), RPK(1), X509(2), NO_SEC(3);
+    PSK(0), RPK(1), X509(2), NO_SEC(3), EST(4);
 
     public final int code;
 
diff --git a/leshan-server-cf/pom.xml b/leshan-server-cf/pom.xml
index 579e3a9f..064c271f 100644
--- a/leshan-server-cf/pom.xml
+++ b/leshan-server-cf/pom.xml
@@ -21,7 +21,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-server-cf</artifactId>
     <packaging>bundle</packaging>
diff --git a/leshan-server-core/pom.xml b/leshan-server-core/pom.xml
index ae1f1c91..7337bddb 100644
--- a/leshan-server-core/pom.xml
+++ b/leshan-server-core/pom.xml
@@ -21,7 +21,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-server-core</artifactId>
     <packaging>bundle</packaging>
diff --git a/leshan-server-demo/pom.xml b/leshan-server-demo/pom.xml
index 79ff0137..b3922c94 100644
--- a/leshan-server-demo/pom.xml
+++ b/leshan-server-demo/pom.xml
@@ -20,7 +20,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-server-demo</artifactId>
     <name>leshan - server demo</name>
diff --git a/leshan-server-redis/pom.xml b/leshan-server-redis/pom.xml
index 5aa0895c..492efc2f 100644
--- a/leshan-server-redis/pom.xml
+++ b/leshan-server-redis/pom.xml
@@ -21,7 +21,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-server-redis</artifactId>
     <packaging>bundle</packaging>
diff --git a/pom.xml b/pom.xml
index eab83b33..7edcab29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ Contributors:
 
     <groupId>org.eclipse.leshan</groupId>
     <artifactId>leshan</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>leshan</name>


Test patch:
diff --git a/leshan-integration-tests/pom.xml b/leshan-integration-tests/pom.xml
index 2113d5be..caa8706b 100644
--- a/leshan-integration-tests/pom.xml
+++ b/leshan-integration-tests/pom.xml
@@ -19,7 +19,7 @@ Contributors:
     <parent>
         <groupId>org.eclipse.leshan</groupId>
         <artifactId>leshan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>leshan-integration-tests</artifactId>
     <name>leshan - integration tests</name>