Merge pull request #7 from jerrybowman/master

Version 2.3.1 with fix for graph reader with thread safety issues.
TheLastCheck · Jul 9, 2016 · 8ccdf24 · 8ccdf24
2 parents 507defb + 605257f
commit 8ccdf24
Show file tree

Hide file tree

Showing 33 changed files with 1,735 additions and 1,384 deletions.
diff --git a/tlc-commons-project/pom.xml b/tlc-commons-project/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.thelastcheck</groupId>
     <artifactId>tlc-open-parent</artifactId>
-    <version>2</version>
+    <version>3</version>
   </parent>
   <groupId>com.thelastcheck.commons</groupId>
   <artifactId>tlc-commons-project</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1</version>
   <packaging>pom</packaging>
   <name>tlc-commons-project</name>
   <description>
@@ -60,7 +60,7 @@
     <commons-cli-version>1.2</commons-cli-version>
     <commons-configuration-version>1.8</commons-configuration-version>
     <commons-digester-version>2.1</commons-digester-version>
-    <tlc-version>2.3.0</tlc-version>
+    <tlc-version>${project.version}</tlc-version>
     <guava-version>16.0.1</guava-version>
     <jai-version>1.1.3</jai-version>
     <junit-version>4.12</junit-version>
@@ -157,4 +157,54 @@
         <artifactId>junit</artifactId>
       </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>1.9</version>
+        <configuration>
+          <licenseMerges>
+            <licenseMerge>Apache Software License, Version 2.0|The Apache Software License, Version 2.0|Apache License, Version 2.0|
+              ASF 2.0|AL 2.0|Apache Public License 2.0|Apache 2|Apache 2.0|Apache License|
+              Apache License 2.0|Apache License, version 2.0|
+              Similar to Apache License but with the acknowledgment clause removed|
+              Apache License, Version 2.0 and Common Development And Di
+              stribution License (CDDL) Version 1.0
+            </licenseMerge>
+            <licenseMerge>BSD License|BSD|New BSD License|BSD style|BSD-like|The BSD License</licenseMerge>
+            <licenseMerge>Common Development And Distribution License, Version 1.0|CDDL 1.1|
+              Common Development and Distribution License|
+              Common Development And Distribution License (CDDL) Version 1.0|
+              Common Development and Distribution License (CDDL) v1.0
+            </licenseMerge>
+            <licenseMerge>Common Public License, Version 1.0|CPL|Common Public License 1.0</licenseMerge>
+            <licenseMerge>Eclipse Public License, Version 1.0|Eclipse Public License (EPL), Version 1.0|
+              Eclipse Public License - v 1.0|Eclipse Distribution License (EDL), Version 1.0</licenseMerge>
+            <licenseMerge>GNU Lesser General Public License, Version 2.1|
+              GNU Lesser General Public License Version 2.1, February 1999|GNU Lesser General Public License|
+              GNU Lesser Public License|LGPL 2.1
+            </licenseMerge>
+            <licenseMerge>Public Domain|Public Domain, per Creative Commons CC0</licenseMerge>
+            <licenseMerge>Mozilla Public License, Version 1.1|MPL 1.1</licenseMerge>
+          </licenseMerges>
+          <includeTransitiveDependencies>true</includeTransitiveDependencies>
+          <useMissingFile>true</useMissingFile>
+          <excludedScopes>test,system,provided,optional</excludedScopes>
+          <excludedGroups>(org\.jboss\.spec\.javax.*)</excludedGroups>
+          <!--<excludedLicenses>GPL2 w/ CPE</excludedLicenses>-->
+          <excludedArtifacts>hamcrest-all</excludedArtifacts>
+          <sortArtifactByName>true</sortArtifactByName>
+          <!--suppress MavenModelInspection -->
+          <!--<fileTemplate>${session.executionRootDirectory}/src/main/license/license-output.ftl</fileTemplate>-->
+          <fileTemplate>org/codehaus/mojo/license/third-party-file-groupByLicense.ftl</fileTemplate>
+        </configuration>
+        <executions>
+          <execution>
+            <id>add-third-party</id>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/tlc-commons-project/tlc-commons-base/pom.xml b/tlc-commons-project/tlc-commons-base/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.thelastcheck.commons</groupId>
     <artifactId>tlc-commons-project</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
   </parent>
   <artifactId>tlc-commons-base</artifactId>
   <packaging>jar</packaging>

diff --git a/tlc-commons-project/tlc-commons-base/src/license/THIRD-PARTY.properties b/tlc-commons-project/tlc-commons-base/src/license/THIRD-PARTY.properties
@@ -0,0 +1,19 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License, Version 1.0
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU Lesser General Public License, Version 2.1
+# - MIT License
+# - Mozilla Public License, Version 1.1
+# - Public Domain
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Mon Jun 13 18:02:12 CDT 2016
+javax.media.jai--com.springsource.javax.media.jai.codec--1.1.3=
+javax.media.jai--com.springsource.javax.media.jai.core--1.1.3=
diff --git a/...ject/tlc-commons-base/src/main/java/com/thelastcheck/commons/base/utils/ToXmlBuilder.java b/...ject/tlc-commons-base/src/main/java/com/thelastcheck/commons/base/utils/ToXmlBuilder.java
@@ -16,7 +16,9 @@
 
 package com.thelastcheck.commons.base.utils;
 
-public class ToXmlBuilder {
+import org.apache.commons.lang3.builder.Builder;
+
+public class ToXmlBuilder implements Builder<String> {
 
 	private String elementName;
 	private boolean useAttributes;
@@ -69,4 +71,9 @@ public String toString() {
 		}
 		return sb.toString();
 	}
+
+	@Override
+	public String build() {
+		return this.toString();
+	}
 }
diff --git a/tlc-commons-project/tlc-commons-buffer/pom.xml b/tlc-commons-project/tlc-commons-buffer/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.thelastcheck.commons</groupId>
     <artifactId>tlc-commons-project</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
   </parent>
   <artifactId>tlc-commons-buffer</artifactId>
   <name>tlc-commons-buffer</name>

diff --git a/...s-project/tlc-commons-buffer/src/main/java/com/thelastcheck/commons/buffer/ByteArray.java b/...s-project/tlc-commons-buffer/src/main/java/com/thelastcheck/commons/buffer/ByteArray.java
@@ -249,7 +249,9 @@ public Object clone() throws CloneNotSupportedException {
     /**
      * Creates a new ByteArray backed by the same buffer, but with a different
      * slice or view of the data based on the specified displacement and length
-     * into this ByteArray.
+     * into this ByteArray. Changes to this ByteArray's content will be visible
+     * in the new array, and vice versa; the two arrays' position, limit, and mark
+     * values will be independent.
      * 
      * @param displacement
      * @param length
@@ -268,6 +270,17 @@ public ByteArray slice(int displacement, int length) {
         return newByteArray;
     }
 
+    /**
+     * Creates a new ByteArray backed by the same buffer. Changes to this ByteArray's
+     * content will be visible in the new array, and vice versa; the two arrays'
+     * position, limit, and mark values will be independent.
+     *
+     * @return A new ByteArray backed by the same data.
+     */
+    public ByteArray duplicate() {
+        return new ByteArray(value, encoding);
+    }
+
     /**
      * Returns a boolean value indicating if all of the bits in the mask are
      * currently set to 1. If any of the bits in the mask are not set in the

diff --git a/tlc-commons-project/tlc-io-base/pom.xml b/tlc-commons-project/tlc-io-base/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.thelastcheck.commons</groupId>
     <artifactId>tlc-commons-project</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
   </parent>
   <artifactId>tlc-io-base</artifactId>
   <name>tlc-io-base</name>

diff --git a/tlc-commons-project/tlc-io-base/src/license/THIRD-PARTY.properties b/tlc-commons-project/tlc-io-base/src/license/THIRD-PARTY.properties
@@ -0,0 +1,19 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License, Version 1.0
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU Lesser General Public License, Version 2.1
+# - MIT License
+# - Mozilla Public License, Version 1.1
+# - Public Domain
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Mon Jun 13 18:02:12 CDT 2016
+javax.media.jai--com.springsource.javax.media.jai.codec--1.1.3=
+javax.media.jai--com.springsource.javax.media.jai.core--1.1.3=