gh-25 - Updated gaffer to 0.4.7

.travis.yml

@@ -4,5 +4,5 @@ cache:
   - $HOME/.m2
 jdk:
   - oraclejdk8
-install: travis_wait git clone https://github.com/gchq/Gaffer.git gafferTmp && cd gafferTmp && git checkout gaffer2-0.4.6 && mvn -q clean install -Pquick && cd ../ && rm -rf gafferTmp
+install: travis_wait git clone https://github.com/gchq/Gaffer.git gafferTmp && cd gafferTmp && git checkout gaffer2-0.4.7 && mvn -q clean install -Pquick && cd ../ && rm -rf gafferTmp
 script: mvn install -PreducedMemory -Dfindbugs.skip=true && mvn findbugs:findbugs && mvn javadoc:javadoc

NOTICES

@@ -20,7 +20,7 @@ Gaffer tools is built using maven. This process will automatically pull in depen
  projects below.
 
 
-Gaffer (gaffer:gaffer2:0.4.6):
+Gaffer (gaffer:gaffer2:0.4.7):
 
 - Apache License, Version 2.0
 

README.md

@@ -22,6 +22,6 @@ In order to use these tools you will first need to have the relevant version of
 ```bash
 git clone https://github.com/gchq/Gaffer.git
 cd Gaffer
-git checkout gaffer2-0.4.6
+git checkout gaffer2-0.4.7
 mvn clean install -Pquick
 ```

graffer-ql/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
 
     <parent>
         <groupId>gaffer</groupId>
@@ -28,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>gaffer</groupId>
-            <artifactId>example</artifactId>
+            <artifactId>example-graph</artifactId>
             <version>${gaffer.version}</version>
         </dependency>
     </dependencies>

mini-accumulo-cluster/pom.xml

@@ -15,7 +15,8 @@
   ~ limitations under the License.
   -->
 
-<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">
+<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>
     <parent>
         <groupId>gaffer</groupId>
@@ -36,11 +37,6 @@
             <artifactId>accumulo-store</artifactId>
             <version>${gaffer.version}</version>
         </dependency>
-        <dependency>
-            <groupId>gaffer</groupId>
-            <artifactId>example</artifactId>
-            <version>${gaffer.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-minicluster</artifactId>

pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>gaffer</groupId>
         <artifactId>gaffer2</artifactId>
-        <version>0.4.6</version>
+        <version>0.4.7</version>
     </parent>
 
     <artifactId>gaffer-tools</artifactId>
@@ -35,7 +35,7 @@
     </modules>
 
     <properties>
-        <gaffer.version>0.4.6</gaffer.version>
+        <gaffer.version>0.4.7</gaffer.version>
         <scm.url>
             https://github.com/gchq/gaffer-tools
         </scm.url>

python-shell/README.md

@@ -59,7 +59,7 @@ This creates a distributable Python wheel which can installed locally to provide
 The wheel file is install using pip:
 
 ```bash
-pip3 install gaffer_shell-0.4.6-py2.py3-none-any.whl
+pip3 install gaffer_shell-0.4.7-py2.py3-none-any.whl
 ```
 
 After installation the shell can be imported into an application as below:

python-shell/src/__init__.py

@@ -2,7 +2,7 @@
 from gafferpy import gaffer_connector
 from gafferpy import gaffer_connector_pki
 
-__version__ = "0.4.6"
+__version__ = "0.4.7"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

python-shell/src/gafferpy/__init__.py

@@ -2,7 +2,7 @@
 from . import gaffer_connector
 from . import gaffer_connector_pki
 
-__version__ = "0.4.6"
+__version__ = "0.4.7"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

road-traffic/README.md

@@ -22,7 +22,7 @@ To run the demo you will first need to build the corresponding version of Gaffer
 ```bash
 git clone https://github.com/gchq/Gaffer.git
 cd Gaffer
-git checkout gaffer2-0.4.6
+git checkout gaffer2-0.4.7
 mvn clean install -Pquick
 ```