Release 2.0.7

- Upgrade Serotonin Utils to 2.1.7
MangoAutomation · Dec 3, 2014 · 1dfda76 · 1dfda76
1 parent 749580a
commit 1dfda76
Show file tree

Hide file tree

Showing 17 changed files with 179 additions and 5 deletions.
diff --git a/Modbus4J/RELEASE-NOTES b/Modbus4J/RELEASE-NOTES
@@ -1,3 +1,6 @@
+*Release notes for version 2.0.7*
+* Upgrading to Serotonin Utils 2.1.7
+
 *Release notes for version 2.0.6*
 * Adding several more changes from Diego R. Ferreira to expose the TcpListener via the Modbus Factory
 * Adding some logging to the SerialMaster

diff --git a/...odbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-javadoc.jar b/...odbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-javadoc.jar
diff --git a/...s4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-javadoc.jar.md5 b/...s4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-javadoc.jar.md5
@@ -0,0 +1 @@
+db573e71d759fd0eb9309bc0d45c7fd2
diff --git a/...4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-javadoc.jar.sha1 b/...4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-javadoc.jar.sha1
@@ -0,0 +1 @@
+627992abbb665045f535d3d8cc8d1c6f0d6f07f4
diff --git a/...odbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-sources.jar b/...odbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-sources.jar
diff --git a/...s4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-sources.jar.md5 b/...s4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-sources.jar.md5
@@ -0,0 +1 @@
+77c504676585d83c757f8fc06653fc2b
diff --git a/...4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-sources.jar.sha1 b/...4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7-sources.jar.sha1
@@ -0,0 +1 @@
+291e6a27ffd1ec8ad2be545239108014f32b23a8
diff --git a/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.jar b/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.jar
diff --git a/...4J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.jar.md5 b/...4J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.jar.md5
@@ -0,0 +1 @@
+e2fa0cd22a7f6ef2b2dee40165d6cd0f
diff --git a/...J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.jar.sha1 b/...J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.jar.sha1
@@ -0,0 +1 @@
+729a2d6b5470a1d4dfc7333d5b203a205e16d551
diff --git a/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.pom b/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.pom
@@ -0,0 +1,162 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.serotonin</groupId>
+ <artifactId>serotonin-utils</artifactId>
+ <version>2.1.7</version>
+ <name>Serotonin Utils</name>
+ <properties>
+  <!-- previous spring version: 3.1.1.RELEASE,3.1.2.RELEASE, 4.0.5.RELEASE 
+   for websockets support -->
+  <springVersion>4.0.5.RELEASE</springVersion>
+ </properties>
+ <build>
+  <sourceDirectory>src</sourceDirectory>
+  <plugins>
+   <plugin>
+    <artifactId>maven-compiler-plugin</artifactId>
+    <version>3.1</version>
+    <configuration>
+     <source>1.7</source>
+     <target>1.7</target>
+    </configuration>
+   </plugin>
+  </plugins>
+ </build>
+ <dependencies>
+  <dependency>
+   <groupId>org.apache.ant</groupId>
+   <artifactId>ant</artifactId>
+   <version>1.8.1</version>
+  </dependency>
+
+  <dependency>
+   <groupId>commons-logging</groupId>
+   <artifactId>commons-logging</artifactId>
+   <version>1.1.1</version>
+  </dependency>
+
+  <dependency>
+   <groupId>commons-io</groupId>
+   <artifactId>commons-io</artifactId>
+   <version>1.3.2</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.springframework</groupId>
+   <artifactId>spring-jdbc</artifactId>
+   <version>${springVersion}</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.springframework</groupId>
+   <artifactId>spring-webmvc</artifactId>
+   <version>${springVersion}</version>
+  </dependency>
+
+  <dependency>
+    <groupId>org.springframework</groupId>
+    <artifactId>spring-context-support</artifactId>
+    <version>${springVersion}</version>
+    </dependency>
+
+  <dependency>
+   <groupId>commons-dbcp</groupId>
+   <artifactId>commons-dbcp</artifactId>
+   <version>1.4</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.apache.commons</groupId>
+   <artifactId>commons-lang3</artifactId>
+   <version>3.0</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.apache.httpcomponents</groupId>
+   <artifactId>httpcore</artifactId>
+   <version>4.3.2</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.apache.httpcomponents</groupId>
+   <artifactId>httpclient</artifactId>
+   <version>4.3.2</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.apache.tomcat</groupId>
+   <artifactId>jasper</artifactId>
+   <version>6.0.41</version>
+  </dependency>
+
+  <dependency>
+   <groupId>commons-codec</groupId>
+   <artifactId>commons-codec</artifactId>
+   <version>1.6</version>
+  </dependency>
+
+  <dependency>
+   <groupId>javax.servlet</groupId>
+   <artifactId>servlet-api</artifactId>
+   <version>2.5</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.directwebremoting</groupId>
+   <artifactId>dwr</artifactId>
+   <version>2.0.10</version>
+   <optional>true</optional>
+  </dependency>
+
+  <dependency>
+   <groupId>log4j</groupId>
+   <artifactId>log4j</artifactId>
+   <version>1.2.14</version>
+  </dependency>
+
+  <dependency>
+   <groupId>commons-httpclient</groupId>
+   <artifactId>commons-httpclient</artifactId>
+   <version>3.1</version>
+  </dependency>
+
+  <dependency>
+   <groupId>javax.servlet.jsp</groupId>
+   <artifactId>javax.servlet.jsp-api</artifactId>
+   <version>2.3.1</version>
+  </dependency>
+
+  <dependency>
+   <groupId>javax.servlet</groupId>
+   <artifactId>jstl</artifactId>
+   <version>1.2</version>
+  </dependency>
+
+  <dependency>
+   <groupId>javax.mail</groupId>
+   <artifactId>mail</artifactId>
+   <version>1.4.7</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.freemarker</groupId>
+   <artifactId>freemarker</artifactId>
+   <version>2.3.20</version>
+  </dependency>
+
+  <dependency>
+   <groupId>joda-time</groupId>
+   <artifactId>joda-time</artifactId>
+   <version>2.3</version>
+  </dependency>
+
+  <dependency>
+   <groupId>org.scream3r</groupId>
+   <artifactId>jssc</artifactId>
+   <version>2.8.0</version>
+  </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/...4J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.pom.md5 b/...4J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.pom.md5
@@ -0,0 +1 @@
+77baefc4a70607784c00e8acc2dcd3fb
diff --git a/...J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.pom.sha1 b/...J/modbus4j-maven-local/com/serotonin/serotonin-utils/2.1.7/serotonin-utils-2.1.7.pom.sha1
@@ -0,0 +1 @@
+f74825fc4526593aa462d1d7bda02853ee1d4a6d
diff --git a/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/maven-metadata.xml b/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/maven-metadata.xml
@@ -9,7 +9,8 @@
       <version>2.1.1</version>
       <version>2.1.3</version>
       <version>2.1.4</version>
+      <version>2.1.7</version>
     </versions>
-    <lastUpdated>20140806002025</lastUpdated>
+    <lastUpdated>20141203194952</lastUpdated>
   </versioning>
 </metadata>
diff --git a/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/maven-metadata.xml.md5 b/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/maven-metadata.xml.md5
@@ -1 +1 @@
-f1184ed5bc38945cd36ab21d5f884e04
+6b83af35fde4e02cad3ad957544af2b7
diff --git a/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/maven-metadata.xml.sha1 b/Modbus4J/modbus4j-maven-local/com/serotonin/serotonin-utils/maven-metadata.xml.sha1
@@ -1 +1 @@
-27c7f2bd9134f11770bd9f32a2f216cb8f6ab872
+2b78dc801b09aca2d5a12a05f5f8fd7e9caa5eb9
diff --git a/Modbus4J/pom.xml b/Modbus4J/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.infiniteautomation</groupId>
     <artifactId>modbus4j</artifactId>
-    <version>2.0.6</version>
+    <version>2.0.7</version>
     <name>Modbus4j Library</name>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>com.serotonin</groupId>
             <artifactId>serotonin-utils</artifactId>
-            <version>2.1.6</version>
+            <version>2.1.7</version>
         </dependency>
 
     </dependencies>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f1184ed5bc38945cd36ab21d5f884e04
		6b83af35fde4e02cad3ad957544af2b7
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		27c7f2bd9134f11770bd9f32a2f216cb8f6ab872
		2b78dc801b09aca2d5a12a05f5f8fd7e9caa5eb9