From 5b692daa3e50a9c9668476b29ed2b4d91061a1dd Mon Sep 17 00:00:00 2001
From: "Dr. Bill Adams" <wjladams@gmail.com>
Date: Tue, 27 Nov 2018 13:13:41 -0500
Subject: [PATCH 01/12] Change framework/pom.xml to use uncommons maths 1.2.2a

Previous version 1.2.2 will no longer compile (it requires
jfreechart 1.0.8 which no longer exists in the maven repo).
---
 framework/pom.xml | 2 +-
 swing/pom.xml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/pom.xml b/framework/pom.xml
index 51ecd7bd..97bbf27b 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>org.uncommons.maths</groupId>
 			<artifactId>uncommons-maths</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.2a</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.collections</groupId>
diff --git a/swing/pom.xml b/swing/pom.xml
index 690f0dba..910a7a3f 100644
--- a/swing/pom.xml
+++ b/swing/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.uncommons.maths</groupId>
 			<artifactId>uncommons-maths</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.2a</version>
 		</dependency>
 		<dependency>
 			<groupId>jfree</groupId>
@@ -60,4 +60,4 @@
 		<sourceDirectory>src/java/main</sourceDirectory>
 		<testSourceDirectory>src/java/test</testSourceDirectory>
 	</build>
-</project>
\ No newline at end of file
+</project>

From b0d509aed2103a165626c4bdd2ddc911079edce5 Mon Sep 17 00:00:00 2001
From: "Dr. Bill Adams" <wjladams@gmail.com>
Date: Tue, 27 Nov 2018 16:57:03 -0500
Subject: [PATCH 02/12] Adding Releasable support to
 GenerationalEvolutionEngine

Now when the GenerationalEvolutionEngine is done with a chromosome,
and the chromosome implements the Releasable interface, it calls
chromosome.release().  This effectively allows that chromosome to
be reused if that behavior is desired.
---
 .../GenerationalEvolutionEngine.java          |  14 ++
 .../watchmaker/framework/Releasable.java      |   5 +
 .../watchmaker/framework/ReleasablePool.java  | 112 +++++++++++++
 .../watchmaker/framework/ReleasableTest.java  | 150 ++++++++++++++++++
 4 files changed, 281 insertions(+)
 create mode 100644 framework/src/java/main/org/uncommons/watchmaker/framework/Releasable.java
 create mode 100644 framework/src/java/main/org/uncommons/watchmaker/framework/ReleasablePool.java
 create mode 100644 framework/src/java/test/org/uncommons/watchmaker/framework/ReleasableTest.java

diff --git a/framework/src/java/main/org/uncommons/watchmaker/framework/GenerationalEvolutionEngine.java b/framework/src/java/main/org/uncommons/watchmaker/framework/GenerationalEvolutionEngine.java
index 3e43915f..46c38385 100644
--- a/framework/src/java/main/org/uncommons/watchmaker/framework/GenerationalEvolutionEngine.java
+++ b/framework/src/java/main/org/uncommons/watchmaker/framework/GenerationalEvolutionEngine.java
@@ -117,6 +117,12 @@ protected List<EvaluatedCandidate<T>> nextEvolutionStep(List<EvaluatedCandidate<
         {
             elite.add(iterator.next().getCandidate());
         }
+	//Setup the list of original candidates
+	List<T> originals = new ArrayList<T>(evaluatedPopulation.size());
+	iterator = evaluatedPopulation.iterator();
+	while (iterator.hasNext()) {
+		originals.add(iterator.next().getCandidate());
+	}
         // Then select candidates that will be operated on to create the evolved
         // portion of the next generation.
         population.addAll(selectionStrategy.select(evaluatedPopulation,
@@ -127,6 +133,14 @@ protected List<EvaluatedCandidate<T>> nextEvolutionStep(List<EvaluatedCandidate<
         population = evolutionScheme.apply(population, rng);
         // When the evolution is finished, add the elite to the population.
         population.addAll(elite);
+	// Now check through the originals, anyone not still there get
+	// released.
+	for(int i=0; i < originals.size(); i++) {
+		T origCand = originals.get(i);
+		if ((origCand instanceof Releasable) && (!population.contains(origCand)))
+			((Releasable)origCand).release();
+	}
+				
         return evaluatePopulation(population);
     }
 }
diff --git a/framework/src/java/main/org/uncommons/watchmaker/framework/Releasable.java b/framework/src/java/main/org/uncommons/watchmaker/framework/Releasable.java
new file mode 100644
index 00000000..6d09ca4d
--- /dev/null
+++ b/framework/src/java/main/org/uncommons/watchmaker/framework/Releasable.java
@@ -0,0 +1,5 @@
+package org.uncommons.watchmaker.framework;
+
+public interface Releasable extends Cloneable {
+	public void release();
+}
diff --git a/framework/src/java/main/org/uncommons/watchmaker/framework/ReleasablePool.java b/framework/src/java/main/org/uncommons/watchmaker/framework/ReleasablePool.java
new file mode 100644
index 00000000..dd35db7b
--- /dev/null
+++ b/framework/src/java/main/org/uncommons/watchmaker/framework/ReleasablePool.java
@@ -0,0 +1,112 @@
+package org.uncommons.watchmaker.framework;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This is a sample implementation of a storage Pool of Releasable objects.
+ * If something is in this Pool, it is available to be reused.  The main functions
+ * are add(T) to add an item and nextOrCreate() which returns the next item in this pool
+ * or creates a new one.
+ *
+ * @param <T> The type of the objects in this pool (must extend Releasable).  It must
+ *           either have an empty constructor, or a constructor with parameter T (to make
+ *           a copy).
+ */
+public class ReleasablePool<T extends Releasable> {
+    private Constructor<T> constructorCopy=null;
+    private Constructor<T> constructorEmpty=null;
+    private List<T> items = new ArrayList<T>();
+    private T prototype;
+
+    /**
+     * The prototype should be an object of the given type.  It is used as the prototype
+     * when we ask for a new object and there are no released objects available.
+     * @param prototype
+     */
+    public ReleasablePool(T prototype) {
+        if (prototype == null)
+            throw new IllegalArgumentException("Prototype cannot be null");
+        this.prototype = prototype;
+        setupConstructors();
+    }
+
+    private void setupConstructors() {
+        try {
+            constructorCopy = (Constructor<T>) prototype.getClass().getConstructor(prototype.getClass());
+        } catch (NoSuchMethodException e) {
+            try {
+                constructorEmpty =  (Constructor<T>) prototype.getClass().getConstructor();
+            } catch (NoSuchMethodException e1) {
+                throw new IllegalArgumentException("Prototype had no empty, nor copy constructor");
+            }
+        }
+    }
+
+    /**
+     * Adds an item to this pool.  Makes sure the item.clearReleased() is called
+     * @param item
+     */
+    public void add(T item) {
+        items.add(item);
+    }
+
+    /**
+     * Gives the next released item from this pool.  If there are no items
+     * that are released in this pool, create a new one from the prototype.
+     * @return
+     */
+    public T nextOrCreate() {
+        if (items.size() > 0)
+            return items.remove(0);
+        //We made it here, we have nothing
+        //We have to create one
+
+        T rval = null;
+        try {
+            rval = createItem();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+        return rval;
+    }
+
+    /**
+     * Used internally to create a new object for the pool, assumed there are no
+     * available items to give.
+     * @return A newly created item using either the new T(T src) constructor or
+     * new T() constructor.
+     */
+    private T createItem() {
+        if (constructorCopy != null) {
+            try {
+                return constructorCopy.newInstance(prototype);
+            } catch (Exception e) {
+                throw new IllegalStateException(e);
+            }
+        } else {
+            try {
+                return constructorEmpty.newInstance();
+            } catch (Exception e) {
+                throw new IllegalStateException(e);
+            }
+        }
+    }
+
+    /**
+     * @return The number of items in this pool.
+     */
+    public int size() {
+        return items.size();
+    }
+
+    /**
+     * Changes the prototype for this pool.
+     * @param prototype
+     */
+    public void setProtoype(T prototype) {
+        this.prototype = prototype;
+        setupConstructors();;
+    }
+}
diff --git a/framework/src/java/test/org/uncommons/watchmaker/framework/ReleasableTest.java b/framework/src/java/test/org/uncommons/watchmaker/framework/ReleasableTest.java
new file mode 100644
index 00000000..cb1d8a5a
--- /dev/null
+++ b/framework/src/java/test/org/uncommons/watchmaker/framework/ReleasableTest.java
@@ -0,0 +1,150 @@
+package org.uncommons.watchmaker.framework;
+
+import org.testng.annotations.Test;
+import org.testng.Assert;
+import org.uncommons.watchmaker.framework.factories.AbstractCandidateFactory;
+import org.uncommons.watchmaker.framework.selection.RouletteWheelSelection;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * Unit tests for the {@link GenerationalEvolutionEngine} class making use of
+ * {@alink Releasable} objects.
+ * @author wjladams@gmail.com
+ */
+public class ReleasableTest {
+
+    /**
+     * Simple test to verify that Releasable objects are being released.
+     */
+    @Test
+    public void testReleaseable() {
+        ReleasablePool<ReleasableInteger> pool = new ReleasablePool<ReleasableInteger>(new ReleasableInteger(0));
+        pool.setProtoype(new ReleasableInteger(pool));
+
+        GenerationalEvolutionEngine<ReleasableInteger> engine2 = new GenerationalEvolutionEngine<ReleasableInteger>(new ReleasableStubFactory(pool),
+                new ReleasableIntegerZeroMaker(pool),
+                new ReleasableIntegerEvaluator(),
+                new RouletteWheelSelection(),
+                FrameworkTestUtils.getRNG());
+        TerminationCondition tc = new TerminationCondition() {
+            int count = 0;
+            @Override
+            public boolean shouldTerminate(PopulationData<?> populationData) {
+                if (count < 20) {
+                    count++;
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+        };
+        int eliteCount=3;
+        int popSize = 10;
+        engine2.evolve(popSize, eliteCount, tc);
+        Assert.assertEquals(pool.size(), popSize - eliteCount);
+    }
+
+    /**
+     * Simple evaluator for ReleasableIntegers
+     * */
+    private static final class ReleasableIntegerEvaluator implements FitnessEvaluator<ReleasableInteger> {
+
+        @Override
+        public double getFitness(ReleasableInteger candidate, List<? extends ReleasableInteger> population) {
+            return candidate.value;
+        }
+
+        @Override
+        public boolean isNatural() {
+            return true;
+        }
+    }
+
+    /**
+     * Simple factory to create all 0 ReleasableInteger's
+     * */
+    private static final class ReleasableStubFactory extends AbstractCandidateFactory<ReleasableInteger> {
+        private ReleasablePool<ReleasableInteger> pool;
+
+        public ReleasableStubFactory(ReleasablePool<ReleasableInteger> pool) {
+            this.pool = pool;
+        }
+
+
+        @Override
+        public ReleasableInteger generateRandomCandidate(Random rng) {
+            ReleasableInteger rval = pool.nextOrCreate();
+            if (rval != null) {
+                return rval;
+            } else {
+                rval = new ReleasableInteger(0);
+                pool.add(rval);
+                return rval;
+            }
+        }
+    }
+    /**
+     * Trivial test operator that mutates all releasable integers into zeroes.
+     */
+    private static final class ReleasableIntegerZeroMaker implements EvolutionaryOperator<ReleasableInteger>
+    {
+        private final ReleasablePool<ReleasableInteger> pool;
+
+        public ReleasableIntegerZeroMaker(ReleasablePool<ReleasableInteger> pool) {
+            this.pool = pool;
+        }
+
+        public List<ReleasableInteger> apply(List<ReleasableInteger> selectedCandidates, Random rng)
+        {
+            List<ReleasableInteger> result = new ArrayList<ReleasableInteger>(selectedCandidates.size());
+            for (int i = 0; i < selectedCandidates.size(); i++)
+            {
+                ReleasableInteger ri = pool.nextOrCreate();
+                if (ri != null) {
+                    result.add(ri);
+                } else {
+                    ri = new ReleasableInteger(0);
+                    pool.add(ri);
+                    result.add(ri);
+                }
+            }
+            return result;
+        }
+    }
+
+    /**
+     * Simple Releasable integer class
+     */
+    private static class ReleasableInteger implements Releasable {
+        public int value;
+        private boolean isReleased = false;
+        private ReleasablePool<ReleasableInteger> pool=null;
+
+        public ReleasableInteger(ReleasablePool<ReleasableInteger> pool) {
+            this.pool = pool;
+            this.value = 0;
+        }
+
+        public ReleasableInteger(ReleasableInteger src) {
+            this.pool = src.pool;
+            this.value = src.value;
+            this.isReleased = false;
+        }
+
+        public ReleasableInteger(int val) {
+            this.value = val;
+        }
+
+        @Override
+        public void release() {
+            if (pool!=null) {
+                pool.add(this);
+            }
+            isReleased = true;
+        }
+
+    }
+}

From f469dc1892636f911e2709133ecd5825bb1c3e15 Mon Sep 17 00:00:00 2001
From: "Dr. Bill Adams" <wjladams@gmail.com>
Date: Mon, 3 Dec 2018 10:20:36 -0500
Subject: [PATCH 03/12] Change based StringCandidate working now

See HelloWorldGeneratorV2 or HelloWorldGneratorV2Test for this working.
---
 .gitignore                                    |   2 +
 .idea/.name                                   |   1 -
 .idea/ant.xml                                 |   7 -
 .idea/compiler.xml                            |  40 ------
 .idea/copyright/profiles_settings.xml         |   5 -
 .idea/encodings.xml                           |  10 --
 .../Maven__com_beust_jcommander_1_12.xml      |  13 --
 ...gle_collections_google_collections_1_0.xml |  13 --
 .../libraries/Maven__jfree_jcommon_1_0_12.xml |  13 --
 .../Maven__jfree_jfreechart_1_0_13.xml        |  13 --
 .../Maven__jfree_jfreechart_1_0_8.xml         |  13 --
 .idea/libraries/Maven__junit_junit_3_8_1.xml  |  13 --
 .../Maven__net_jcip_jcip_annotations_1_0.xml  |  13 --
 .../Maven__org_beanshell_bsh_2_0b4.xml        |  13 --
 ...Maven__org_easytesting_fest_assert_1_2.xml |  13 --
 ...aven__org_easytesting_fest_reflect_1_2.xml |  13 --
 ...aven__org_easytesting_fest_swing_1_2_1.xml |  13 --
 ...Maven__org_easytesting_fest_util_1_1_3.xml |  13 --
 .../Maven__org_testng_testng_6_2_1.xml        |  13 --
 ..._uncommons_maths_uncommons_maths_1_2_2.xml |  13 --
 .../Maven__org_yaml_snakeyaml_1_6.xml         |  13 --
 .idea/misc.xml                                |  22 ---
 .idea/modules.xml                             |  12 --
 .idea/scopes/scope_settings.xml               |   5 -
 .idea/uiDesigner.xml                          | 125 ------------------
 .idea/vcs.xml                                 |   7 -
 framework/framework.iml                       |   2 +-
 27 files changed, 3 insertions(+), 430 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/ant.xml
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/libraries/Maven__com_beust_jcommander_1_12.xml
 delete mode 100644 .idea/libraries/Maven__com_google_collections_google_collections_1_0.xml
 delete mode 100644 .idea/libraries/Maven__jfree_jcommon_1_0_12.xml
 delete mode 100644 .idea/libraries/Maven__jfree_jfreechart_1_0_13.xml
 delete mode 100644 .idea/libraries/Maven__jfree_jfreechart_1_0_8.xml
 delete mode 100644 .idea/libraries/Maven__junit_junit_3_8_1.xml
 delete mode 100644 .idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml
 delete mode 100644 .idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
 delete mode 100644 .idea/libraries/Maven__org_easytesting_fest_assert_1_2.xml
 delete mode 100644 .idea/libraries/Maven__org_easytesting_fest_reflect_1_2.xml
 delete mode 100644 .idea/libraries/Maven__org_easytesting_fest_swing_1_2_1.xml
 delete mode 100644 .idea/libraries/Maven__org_easytesting_fest_util_1_1_3.xml
 delete mode 100644 .idea/libraries/Maven__org_testng_testng_6_2_1.xml
 delete mode 100644 .idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2.xml
 delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/scopes/scope_settings.xml
 delete mode 100644 .idea/uiDesigner.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index ff76151c..eb18a21d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ website
 *.iws
 .idea/workspace.xml
 .DS_Store
+.idea
+target
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 59ccb457..00000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-watchmaker
\ No newline at end of file
diff --git a/.idea/ant.xml b/.idea/ant.xml
deleted file mode 100644
index 313b0c0c..00000000
--- a/.idea/ant.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build.xml" />
-  </component>
-</project>
-
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index c04517b0..00000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="?*.properties" />
-      <entry name="?*.xml" />
-      <entry name="?*.gif" />
-      <entry name="?*.png" />
-      <entry name="?*.jpeg" />
-      <entry name="?*.jpg" />
-      <entry name="?*.html" />
-      <entry name="?*.dtd" />
-      <entry name="?*.tld" />
-      <entry name="?*.ftl" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="watchmaker-examples" />
-        <module name="watchmaker-framework" />
-        <module name="watchmaker-swing" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="watchmaker" target="1.6" />
-      <module name="watchmaker-examples" target="1.6" />
-      <module name="watchmaker-framework" target="1.6" />
-      <module name="watchmaker-swing" target="1.6" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
-
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index 3572571a..00000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="">
-    <module2copyright />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 2a99e956..00000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/examples" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/framework" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/swing" charset="UTF-8" />
-  </component>
-</project>
-
diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_12.xml b/.idea/libraries/Maven__com_beust_jcommander_1_12.xml
deleted file mode 100644
index 2b9ea172..00000000
--- a/.idea/libraries/Maven__com_beust_jcommander_1_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.beust:jcommander:1.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_collections_google_collections_1_0.xml b/.idea/libraries/Maven__com_google_collections_google_collections_1_0.xml
deleted file mode 100644
index 7ed5d20e..00000000
--- a/.idea/libraries/Maven__com_google_collections_google_collections_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.google.collections:google-collections:1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/collections/google-collections/1.0/google-collections-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/collections/google-collections/1.0/google-collections-1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/collections/google-collections/1.0/google-collections-1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jfree_jcommon_1_0_12.xml b/.idea/libraries/Maven__jfree_jcommon_1_0_12.xml
deleted file mode 100644
index 80156ee8..00000000
--- a/.idea/libraries/Maven__jfree_jcommon_1_0_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jfree:jcommon:1.0.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jcommon/1.0.12/jcommon-1.0.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jcommon/1.0.12/jcommon-1.0.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jcommon/1.0.12/jcommon-1.0.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jfree_jfreechart_1_0_13.xml b/.idea/libraries/Maven__jfree_jfreechart_1_0_13.xml
deleted file mode 100644
index c91b3c02..00000000
--- a/.idea/libraries/Maven__jfree_jfreechart_1_0_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jfree:jfreechart:1.0.13">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.13/jfreechart-1.0.13.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.13/jfreechart-1.0.13-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.13/jfreechart-1.0.13-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jfree_jfreechart_1_0_8.xml b/.idea/libraries/Maven__jfree_jfreechart_1_0_8.xml
deleted file mode 100644
index 4e53d165..00000000
--- a/.idea/libraries/Maven__jfree_jfreechart_1_0_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jfree:jfreechart:1.0.8">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.8/jfreechart-1.0.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.8/jfreechart-1.0.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.8/jfreechart-1.0.8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_3_8_1.xml b/.idea/libraries/Maven__junit_junit_3_8_1.xml
deleted file mode 100644
index 71b2993d..00000000
--- a/.idea/libraries/Maven__junit_junit_3_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:3.8.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml b/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml
deleted file mode 100644
index d29c82f6..00000000
--- a/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.jcip:jcip-annotations:1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
deleted file mode 100644
index d6f17aa7..00000000
--- a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.beanshell:bsh:2.0b4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_easytesting_fest_assert_1_2.xml b/.idea/libraries/Maven__org_easytesting_fest_assert_1_2.xml
deleted file mode 100644
index e0eb7e52..00000000
--- a/.idea/libraries/Maven__org_easytesting_fest_assert_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.easytesting:fest-assert:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-assert/1.2/fest-assert-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-assert/1.2/fest-assert-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-assert/1.2/fest-assert-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_easytesting_fest_reflect_1_2.xml b/.idea/libraries/Maven__org_easytesting_fest_reflect_1_2.xml
deleted file mode 100644
index 2d5ea79d..00000000
--- a/.idea/libraries/Maven__org_easytesting_fest_reflect_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.easytesting:fest-reflect:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-reflect/1.2/fest-reflect-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-reflect/1.2/fest-reflect-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-reflect/1.2/fest-reflect-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_easytesting_fest_swing_1_2_1.xml b/.idea/libraries/Maven__org_easytesting_fest_swing_1_2_1.xml
deleted file mode 100644
index 8651372b..00000000
--- a/.idea/libraries/Maven__org_easytesting_fest_swing_1_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.easytesting:fest-swing:1.2.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-swing/1.2.1/fest-swing-1.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-swing/1.2.1/fest-swing-1.2.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-swing/1.2.1/fest-swing-1.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_easytesting_fest_util_1_1_3.xml b/.idea/libraries/Maven__org_easytesting_fest_util_1_1_3.xml
deleted file mode 100644
index f54cc10d..00000000
--- a/.idea/libraries/Maven__org_easytesting_fest_util_1_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.easytesting:fest-util:1.1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-util/1.1.3/fest-util-1.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-util/1.1.3/fest-util-1.1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/easytesting/fest-util/1.1.3/fest-util-1.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_testng_testng_6_2_1.xml b/.idea/libraries/Maven__org_testng_testng_6_2_1.xml
deleted file mode 100644
index 16c6f535..00000000
--- a/.idea/libraries/Maven__org_testng_testng_6_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.testng:testng:6.2.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.2.1/testng-6.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.2.1/testng-6.2.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.2.1/testng-6.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2.xml b/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2.xml
deleted file mode 100644
index 38581b9d..00000000
--- a/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.uncommons.maths:uncommons-maths:1.2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/uncommons/maths/uncommons-maths/1.2.2/uncommons-maths-1.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/uncommons/maths/uncommons-maths/1.2.2/uncommons-maths-1.2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/uncommons/maths/uncommons-maths/1.2.2/uncommons-maths-1.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml
deleted file mode 100644
index 0f8bd198..00000000
--- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.yaml:snakeyaml:1.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 75e1580d..00000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-    <option name="ignoredFiles">
-      <set>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </set>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-</project>
-
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index f314de07..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/book/book.iml" filepath="$PROJECT_DIR$/book/book.iml" />
-      <module fileurl="file://$PROJECT_DIR$/examples/examples.iml" filepath="$PROJECT_DIR$/examples/examples.iml" />
-      <module fileurl="file://$PROJECT_DIR$/framework/framework.iml" filepath="$PROJECT_DIR$/framework/framework.iml" />
-      <module fileurl="file://$PROJECT_DIR$/swing/swing.iml" filepath="$PROJECT_DIR$/swing/swing.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b8..00000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b000203..00000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index c80f2198..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
-
diff --git a/framework/framework.iml b/framework/framework.iml
index 82c64ca4..f0620494 100644
--- a/framework/framework.iml
+++ b/framework/framework.iml
@@ -13,7 +13,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.uncommons.maths:uncommons-maths:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: jfree:jcommon:1.0.12" level="project" />
-    <orderEntry type="library" name="Maven: jfree:jfreechart:1.0.8" level="project" />
+    <orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" />
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />

From 62b2c8eca94c61481799b5ed18bc0d6cbb271ca2 Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Wed, 12 Dec 2018 12:57:02 -0500
Subject: [PATCH 04/12] Fixing failing ItineraryPanelTest

Problem was waiting for UI to sync, a few extra robot.waitForIdle()
did the trick.
---
 .../examples/travellingsalesman/ItineraryPanelTest.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/src/java/test/org/uncommons/watchmaker/examples/travellingsalesman/ItineraryPanelTest.java b/examples/src/java/test/org/uncommons/watchmaker/examples/travellingsalesman/ItineraryPanelTest.java
index 9f2244d1..0ae799f2 100644
--- a/examples/src/java/test/org/uncommons/watchmaker/examples/travellingsalesman/ItineraryPanelTest.java
+++ b/examples/src/java/test/org/uncommons/watchmaker/examples/travellingsalesman/ItineraryPanelTest.java
@@ -62,6 +62,7 @@ public void testSelectAll()
         frame.validate();
         frame.setVisible(true);
         assert itineraryPanel.getSelectedCities().isEmpty() : "Should be no cities selected initially.";
+        robot.waitForIdle();
         frameFixture.button("All").click();
         Collection<String> selectedCities = itineraryPanel.getSelectedCities();
         assert selectedCities.size() == CITIES.getKnownCities().size()
@@ -80,7 +81,9 @@ public void testSelectNone()
         frame.setSize(100, 300);
         frame.validate();
         frame.setVisible(true);
+        robot.waitForIdle();
         frameFixture.button("All").click();
+        robot.waitForIdle();
         Collection<String> selectedCities = itineraryPanel.getSelectedCities();
         assert selectedCities.size() == CITIES.getKnownCities().size()
             : "All cities should be selected after all button click.";

From 4e198d0ce7deee51e70fc01a69294f8d3af42876 Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Wed, 12 Dec 2018 13:32:43 -0500
Subject: [PATCH 05/12] Updating pom's for com.decisionlens branch in maven.

---
 examples/pom.xml  |  4 ++--
 framework/pom.xml |  4 ++--
 pom.xml           | 18 ++++++++++++++++--
 swing/pom.xml     |  4 ++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 773b7d2d..edf85219 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -20,9 +20,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.uncommons.watchmaker</groupId>
+		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.7.2</version>
+		<version>0.7.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>watchmaker-examples</artifactId>
 
diff --git a/framework/pom.xml b/framework/pom.xml
index 97bbf27b..dc88e404 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -20,9 +20,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.uncommons.watchmaker</groupId>
+		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.7.2</version>
+		<version>0.7.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>watchmaker-framework</artifactId>
 
diff --git a/pom.xml b/pom.xml
index 6698f38b..8c557148 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,9 +6,9 @@
 		<artifactId>oss-parent</artifactId>
 		<version>7</version>
 	</parent>
-	<groupId>org.uncommons.watchmaker</groupId>
+	<groupId>com.decisionlens</groupId>
 	<artifactId>watchmaker</artifactId>
-	<version>0.7.2</version>
+	<version>0.7.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>watchmaker</name>
 	<description>Watchmaker Framework - Root Project</description>
@@ -51,6 +51,20 @@
 		<module>examples</module>
 	</modules>
 
+	<distributionManagement>
+		<repository>
+			<id>mvnrepo-releases</id>
+			<name>Release Repository</name>
+			<url> https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+		</repository>
+
+		<snapshotRepository>
+			<id>mvnrepo-snapshots</id>
+			<name>Maven Snapshot Repository</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 	<build>
 		<plugins>
 			<plugin>
diff --git a/swing/pom.xml b/swing/pom.xml
index 910a7a3f..fd4dea92 100644
--- a/swing/pom.xml
+++ b/swing/pom.xml
@@ -20,9 +20,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.uncommons.watchmaker</groupId>
+		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.7.2</version>
+		<version>0.7.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>watchmaker-swing</artifactId>
 

From 63b658d3afb3855c1fc9fdd18ba4f500db2f3ff5 Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Wed, 12 Dec 2018 14:07:17 -0500
Subject: [PATCH 06/12] Updating pom to work with sonatype

Also updating programmers for this branch to just me.  Not sure
if that is the correct protocol, but at the same time I don't want
to volunteer others to be contributors to my branch.
---
 pom.xml | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c557148..58ef6e6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,19 +30,12 @@
 	
 	<developers>
 		<developer>
-			<id>dwdyer</id>
-			<name>Dan Dyer</name>
+			<id>wjladams</id>
+			<name>Dr. William Adams</name>
 			<roles>
 				<role>committer</role>
 			</roles>
 		</developer>
-		<developer>
-			<id>cowwoc</id>
-			<name>Gili Tzabari</name>
-			<roles>
-				<role>contributor</role>
-			</roles>
-		</developer>
 	</developers>
 
 	<modules>
@@ -83,7 +76,31 @@
 					<encoding>${project.build.sourceEncoding}</encoding>
 				</configuration>
 			</plugin>
-		</plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>sign</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.7</version>
+				<extensions>true</extensions>
+				<configuration>
+					<serverId>ossrh</serverId>
+					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+					<autoReleaseAfterClose>true</autoReleaseAfterClose>
+				</configuration>
+			</plugin>		</plugins>
 	</build>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 945dacdb54e493684d86b6fdb38ce59bb686f230 Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Wed, 12 Dec 2018 14:09:50 -0500
Subject: [PATCH 07/12] Updating to version number to 0.1.0 for first official
 release.

---
 examples/pom.xml  | 2 +-
 framework/pom.xml | 2 +-
 pom.xml           | 2 +-
 swing/pom.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index edf85219..17aa3168 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.7.2-SNAPSHOT</version>
+		<version>0.1.0</version>
 	</parent>
 	<artifactId>watchmaker-examples</artifactId>
 
diff --git a/framework/pom.xml b/framework/pom.xml
index dc88e404..f491a41d 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.7.2-SNAPSHOT</version>
+		<version>0.1.0</version>
 	</parent>
 	<artifactId>watchmaker-framework</artifactId>
 
diff --git a/pom.xml b/pom.xml
index 58ef6e6d..20183950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>com.decisionlens</groupId>
 	<artifactId>watchmaker</artifactId>
-	<version>0.7.2-SNAPSHOT</version>
+	<version>0.1.0</version>
 	<packaging>pom</packaging>
 	<name>watchmaker</name>
 	<description>Watchmaker Framework - Root Project</description>
diff --git a/swing/pom.xml b/swing/pom.xml
index fd4dea92..fa60006f 100644
--- a/swing/pom.xml
+++ b/swing/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.7.2-SNAPSHOT</version>
+		<version>0.1.0</version>
 	</parent>
 	<artifactId>watchmaker-swing</artifactId>
 

From 74bf861eb60942219eb88e8aa2e920a017fc652e Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Wed, 12 Dec 2018 14:18:38 -0500
Subject: [PATCH 08/12] UI test failure again, need to wait for component to
 update

This works for now.
---
 .../examples/travellingsalesman/ItineraryPanelTest.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/src/java/test/org/uncommons/watchmaker/examples/travellingsalesman/ItineraryPanelTest.java b/examples/src/java/test/org/uncommons/watchmaker/examples/travellingsalesman/ItineraryPanelTest.java
index 0ae799f2..99c7f578 100644
--- a/examples/src/java/test/org/uncommons/watchmaker/examples/travellingsalesman/ItineraryPanelTest.java
+++ b/examples/src/java/test/org/uncommons/watchmaker/examples/travellingsalesman/ItineraryPanelTest.java
@@ -17,7 +17,8 @@
 
 import java.awt.BorderLayout;
 import java.util.Collection;
-import javax.swing.JFrame;
+import javax.swing.*;
+
 import org.fest.swing.core.BasicRobot;
 import org.fest.swing.core.Robot;
 import org.fest.swing.fixture.FrameFixture;
@@ -64,6 +65,8 @@ public void testSelectAll()
         assert itineraryPanel.getSelectedCities().isEmpty() : "Should be no cities selected initially.";
         robot.waitForIdle();
         frameFixture.button("All").click();
+        SwingUtilities.updateComponentTreeUI(frame);
+        robot.waitForIdle();
         Collection<String> selectedCities = itineraryPanel.getSelectedCities();
         assert selectedCities.size() == CITIES.getKnownCities().size()
             : "All cities should be selected after button click.";
@@ -83,11 +86,13 @@ public void testSelectNone()
         frame.setVisible(true);
         robot.waitForIdle();
         frameFixture.button("All").click();
+        SwingUtilities.updateComponentTreeUI(frame);
         robot.waitForIdle();
         Collection<String> selectedCities = itineraryPanel.getSelectedCities();
         assert selectedCities.size() == CITIES.getKnownCities().size()
             : "All cities should be selected after all button click.";
         frameFixture.button("None").click();
+        SwingUtilities.updateComponentTreeUI(frame);
         assert itineraryPanel.getSelectedCities().isEmpty()
             : "No cities should be selected after clear button is clicked.";
     }

From d2cc23b9a9e71bb36844c29fbb77d462dbe4faa9 Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Wed, 12 Dec 2018 22:53:28 -0500
Subject: [PATCH 09/12] Updating pom configuration, and version 0.1.0 set.

---
 pom.xml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 20183950..0565231e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,17 @@
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.4.3</version>
 				<configuration>
@@ -91,12 +102,23 @@
 				</executions>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
+				<version>1.6.8</version>
 				<extensions>true</extensions>
 				<configuration>
-					<serverId>ossrh</serverId>
+					<serverId>mvnrepo-releases</serverId>
 					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
 					<autoReleaseAfterClose>true</autoReleaseAfterClose>
 				</configuration>
@@ -105,4 +127,4 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-</project>
\ No newline at end of file
+</project>

From 72201e116596e7ad7cfb2a665885c9ba01e04c6c Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Wed, 12 Dec 2018 22:54:30 -0500
Subject: [PATCH 10/12] Version bump to 0.1.1-SNAPSHOT

---
 examples/pom.xml  | 2 +-
 framework/pom.xml | 2 +-
 pom.xml           | 2 +-
 swing/pom.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 17aa3168..87ca6eef 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.1.0</version>
+		<version>0.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>watchmaker-examples</artifactId>
 
diff --git a/framework/pom.xml b/framework/pom.xml
index f491a41d..dfa86cb6 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.1.0</version>
+		<version>0.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>watchmaker-framework</artifactId>
 
diff --git a/pom.xml b/pom.xml
index 0565231e..17ccdf6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>com.decisionlens</groupId>
 	<artifactId>watchmaker</artifactId>
-	<version>0.1.0</version>
+	<version>0.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>watchmaker</name>
 	<description>Watchmaker Framework - Root Project</description>
diff --git a/swing/pom.xml b/swing/pom.xml
index fa60006f..c6ca4b2b 100644
--- a/swing/pom.xml
+++ b/swing/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.decisionlens</groupId>
 		<artifactId>watchmaker</artifactId>
-		<version>0.1.0</version>
+		<version>0.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>watchmaker-swing</artifactId>
 

From ba199b821bb345ca301c853e936b8b020576b6c0 Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Thu, 13 Dec 2018 07:04:56 -0500
Subject: [PATCH 11/12] Added ImprovementTermination termination condition
 checker.

A termination validator that takes into account:
   1. A minimum generation count, before even considering termination
   2. A maximum generation count, once reached we consider it terminated
   3. The history of the fitness function for each generation
If we are between min/max number of generations, we look at the history
of fitness function values for timesMustBeClose before the current
generation.  If each successive value is within closeEnough of the
previous generation for timesMustBeClose, we consider it converged.
---
 .../termination/ImprovementTermination.java   | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 framework/src/java/main/org/uncommons/watchmaker/framework/termination/ImprovementTermination.java

diff --git a/framework/src/java/main/org/uncommons/watchmaker/framework/termination/ImprovementTermination.java b/framework/src/java/main/org/uncommons/watchmaker/framework/termination/ImprovementTermination.java
new file mode 100644
index 00000000..a75c847a
--- /dev/null
+++ b/framework/src/java/main/org/uncommons/watchmaker/framework/termination/ImprovementTermination.java
@@ -0,0 +1,95 @@
+package org.uncommons.watchmaker.framework.termination;
+
+import org.uncommons.watchmaker.framework.PopulationData;
+import org.uncommons.watchmaker.framework.TerminationCondition;
+
+
+/**
+ * A termination validator that takes into account:
+ * 1. A minimum generation count, before even considering termination
+ * 2. A maximum generation count, once reached we consider it terminated
+ * 3. The history of the fitness function for each generation
+ * If we are between min/max number of generations, we look at the history
+ * of fitness function values for timesMustBeClose before the current
+ * generation.  If each successive value is within closeEnough of the
+ * previous generation for timesMustBeClose, we consider it converged.
+ */
+public class ImprovementTermination implements TerminationCondition {
+    final int minGenerationCount;
+    final int maxGenerationCount;
+    int genCount=0;
+    double bestFitness=-1;
+    double closeEnough=1e-5;
+    double closeHistory[];
+    double fitnessHistory[];
+    int timesMustBeClose;
+    private boolean shouldTerminate=false;
+    public ImprovementTermination(int minGenCount, int maxGenCount, double closeEnoughPercent, int timesMustBeClose) {
+        maxGenerationCount=maxGenCount;
+        minGenerationCount=minGenCount;
+        this.closeEnough=closeEnoughPercent;
+        closeHistory=new double[maxGenerationCount];
+        fitnessHistory=new double[maxGenerationCount];
+        this.timesMustBeClose=timesMustBeClose;
+    }
+
+
+    public boolean shouldTerminate(PopulationData<?> arg0) {
+        //First see if shouldTerminate flag set
+        if (shouldTerminate) {
+            //Yes we should terminate, we are done
+            return true;
+        }
+        //Calculate new percent diff
+        double newBest=arg0.getBestCandidateFitness();
+        double perDiff=percentDiff(bestFitness, newBest);
+        if (genCount >= maxGenerationCount) {
+            return true;
+        }
+        closeHistory[genCount]=perDiff;
+        fitnessHistory[genCount]=newBest;
+        bestFitness=newBest;
+        genCount++;
+        if (genCount < minGenerationCount)
+            return false;
+        if (genCount >= timesMustBeClose) {
+            if (closeLongEnough()) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+    private boolean closeLongEnough() {
+        for(int i=(genCount-timesMustBeClose); i<genCount; i++) {
+            if (closeHistory[i] > closeEnough) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public void setTerminate(boolean b) {
+        // TODO Auto-generated method stub
+        this.shouldTerminate=b;
+    }
+
+    /**
+     * A standard percent difference calculation where the first
+     * parameter is assumed to be known.  If that parameter is
+     * zero, then no division by zero occurs.
+     * @param oldV The "correct value", as used by percent difference calculations.
+     * @param newV The "incorrect value", as used by percent difference calculations.
+     * @return absolute value of (newV - oldV)/oldV assuming oldV!=0, or just newV otherwise.
+     */
+    public static double percentDiff(double oldV, double newV) {
+        double diff=Math.abs(newV-oldV);
+        if (oldV==0)
+            return diff;
+        return (diff/Math.abs(oldV));
+    }
+
+
+}

From e37d8ab5453aa0b430cf566ca1aa6b37948174cf Mon Sep 17 00:00:00 2001
From: Bill Adams <wjadams@decisionlens.com>
Date: Thu, 13 Dec 2018 14:33:28 -0500
Subject: [PATCH 12/12] Updated to google guava from google collections

---
 framework/pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/framework/pom.xml b/framework/pom.xml
index dfa86cb6..53858e98 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -32,10 +32,11 @@
 			<artifactId>uncommons-maths</artifactId>
 			<version>1.2.2a</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
 		<dependency>
-			<groupId>com.google.collections</groupId>
-			<artifactId>google-collections</artifactId>
-			<version>1.0</version>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>27.0.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>org.testng</groupId>