Merge branch 'release/ceridwen-standard-interchange-protocol-library-…

…2.9.4'
ceridwen-com · Feb 20, 2017 · 577cdf6 · 577cdf6
2 parents 91a0db1 + 91ea44b
commit 577cdf6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,8 +1,19 @@
+Version 2.9.4: 20/02/2017
+Made field ordering option constants publicly accessible
+Update dependencies apache commons lang and net
+Dependencies: ceridwen utility 1.6.2
+              apache commons beanutils 1.9.3
+              apache commons lang 3.5
+              apache commons logging 1.2 
+              apache commons net 3.6
+              io.netty transport 4.1.5.Final
+              io.netty handler 4.1.5.Final
+
 Version 2.9.3: 10/10/2016
 Update sample to use netty server
 Added SSL Socket client connection
 Updated Netty SSL server to load certificates
-Dependencies: ceridwen utilitiy 1.6.2
+Dependencies: ceridwen utility 1.6.2
               apache commons beanutils 1.9.3
               apache commons lang 3.4
               apache commons logging 1.2 
@@ -14,7 +25,7 @@ Version 2.9.2: 20/04/2016
 Added netty server implementation
 Added field ordering options (alphabetic or specification listed)
 Changed holdQueueLength definition to match 3M emulator rather than specification
-Dependencies: ceridwen utilitiy 1.6.2
+Dependencies: ceridwen utility 1.6.2
               apache commons beanutils 1.9.2
               apache commons lang 3.4
               apache commons logging 1.2 

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>com.ceridwen.circulation</groupId>
   <artifactId>ceridwen-standard-interchange-protocol-library</artifactId>
-  <version>2.9.3</version>
+  <version>2.9.4</version>
   <packaging>jar</packaging>
 
   <name>ceridwen-standard-interchange-protocol-library</name>
@@ -98,12 +98,12 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
+      <version>3.5</version>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>3.5</version>
+      <version>3.6</version>
     </dependency> 
     <dependency>
       <groupId>commons-logging</groupId>

diff --git a/src/main/java/com/ceridwen/circulation/SIP/messages/Message.java b/src/main/java/com/ceridwen/circulation/SIP/messages/Message.java
@@ -85,19 +85,19 @@ public abstract class Message implements Serializable {
     private static final long serialVersionUID = 1609258005567594730L;
     public static final String PROP_CHARSET = "com.ceridwen.circulation.SIP.charset";
     public static final String PROP_AUTOPOPULATE = "com.ceridwen.circulation.SIP.messages.AutoPopulationEmptyRequiredFields";
-    private static final String PROP_VARIABLE_FIELD_ORDERING = "com.ceridwen.circulation.SIP.VariableFieldOrdering";
+    public static final String PROP_VARIABLE_FIELD_ORDERING = "com.ceridwen.circulation.SIP.VariableFieldOrdering";
 
     public static final String PROP_AUTOPOPULATE_OFF = "off";
     public static final String PROP_AUTOPOPULATE_DECODE = "decode";
     public static final String PROP_AUTOPOPULATE_ENCODE = "encode";
     public static final String PROP_AUTOPOPULATE_BIDIRECTIONAL = "bidirectional";
 
-    private static final String PROP_AUTOPOPULATE_DEFAULT = PROP_AUTOPOPULATE_BIDIRECTIONAL;
+    public static final String PROP_AUTOPOPULATE_DEFAULT = PROP_AUTOPOPULATE_BIDIRECTIONAL;
 
-    private static final String PROP_VARIABLE_FIELD_ORDERING_ALPHABETICAL = "alphabetical";
-    private static final String PROP_VARIABLE_FIELD_ORDERING_SPECIFICATION = "specification";
+    public static final String PROP_VARIABLE_FIELD_ORDERING_ALPHABETICAL = "alphabetical";
+    public static final String PROP_VARIABLE_FIELD_ORDERING_SPECIFICATION = "specification";
 
-    private static final String PROP_VARIABLE_FIELD_ORDERING_DEFAULT =  PROP_VARIABLE_FIELD_ORDERING_ALPHABETICAL;
+    public static final String PROP_VARIABLE_FIELD_ORDERING_DEFAULT =  PROP_VARIABLE_FIELD_ORDERING_ALPHABETICAL;
 
     private static final String PROP_DEFAULT_CHARSET = "cp850";