- update slf4j dependency

- revisit constants

Author: r-brown

NetLicensingClient-demo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.labs64.netlicensing</groupId>
         <artifactId>netlicensing-client-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>netlicensing-client-demo</artifactId>

NetLicensingClient/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.labs64.netlicensing</groupId>
         <artifactId>netlicensing-client-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>netlicensing-client</artifactId>

NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/Constants.java

@@ -107,12 +107,18 @@ public static final class License {
     }
 
     public static final class LicensingModel {
+
+        public static final String VALID = "valid";
+
         public static final class TryAndBuy {
             public static final String NAME = "TryAndBuy";
         }
 
         public static final class Rental {
             public static final String NAME = "Rental";
+            /**
+             * @deprecated please use com.labs64.netlicensing.domain.Constants.LicensingModel#VALID instead.
+             */
             public static final String VALID = "valid";
             public static final String RED_THRESHOLD = "redThreshold";
             public static final String YELLOW_THRESHOLD = "yellowThreshold";
@@ -122,6 +128,14 @@ public static final class Rental {
         public static final class Subscription {
             public static final String NAME = "Subscription";
         }
+
+        public static final class Floating {
+            public static final String NAME = "Floating";
+        }
+
+        public static final class MultiFeature {
+            public static final String NAME = "MultiFeature";
+        }
     }
 
     public static final class Transaction {

NetLicensingClient/src/test/java/com/labs64/netlicensing/service/LicenseeServiceTest.java

@@ -163,7 +163,7 @@ public void testValidate() throws Exception {
         assertEquals(
                 "true",
                 validation.getProperties().get("LIST1").getProperties()
-                        .get(Constants.LicensingModel.Rental.VALID).getValue());
+                        .get(Constants.LicensingModel.VALID).getValue());
         assertEquals(
                 "green",
                 validation.getProperties().get("LIST2").getProperties()

pom.xml

@@ -5,10 +5,10 @@
 
     <groupId>com.labs64.netlicensing</groupId>
     <artifactId>netlicensing-client-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Labs64 :: NetLicensing :: Client :: Parent</name>
-    <url>http://www.labs64.com/netlicensing</url>
+    <url>http://netlicensing.io</url>
     <description>Java wrapper for Labs64 NetLicensing RESTful API</description>
     <inceptionYear>2014</inceptionYear>
 
@@ -88,7 +88,7 @@
         <commons-collections4.version>4.1</commons-collections4.version>
         <commons-codec.version>1.10</commons-codec.version>
         <log4j.version>1.2.17</log4j.version>
-        <slf4j.version>1.7.18</slf4j.version>
+        <slf4j.version>1.7.20</slf4j.version>
         <junit.version>4.12</junit.version>
         <jersey.version>2.21</jersey.version>