Updating gaffer version 1.7.0-RC2

.travis.yml

@@ -12,6 +12,10 @@ addons:
   apt:
     packages:
       - python3
+matrix:
+  fast_finish: true
+
+if: (branch == master && type == push) || (branch == develop && type == push) || (branch != master && type == pull_request)
 
 env:
   matrix:

NOTICES

@@ -20,7 +20,7 @@ Gaffer tools is built using maven. This process will automatically pull in depen
  projects below.
 
 
-Gaffer (uk.gov.gchq.gaffer:gaffer2:1.6.0):
+Gaffer (uk.gov.gchq.gaffer:gaffer2:1.7.0-RC2):
 
 - Apache License, Version 2.0
 
@@ -124,4 +124,4 @@ jtblin/angular-chart.js (angular-chart.js)
 
 chart.js/Chartjs (Chart.js)
 
-- MIT Licence
+- MIT Licence

cd/deploy.sh

@@ -51,12 +51,14 @@ if [ "$RELEASE" == 'true' ] && [ "$TRAVIS_BRANCH" == 'master' ] && [ "$TRAVIS_PU
         echo "--------------------------------------"
         mvn -q clean install -Pquick -Dskip.jar-with-dependencies=true -Dshaded.jar.phase=true
         mvn -q javadoc:javadoc -Pquick
+        rm -rf travis_wait*
         git checkout gh-pages
         rm -rf uk
         mv target/site/apidocs/* .
         git add .
         git commit -a -m "Updated javadoc - $RELEASE_VERSION"
         git push
+        rm -rf travis_wait*
         git checkout master
 
         echo ""
@@ -76,6 +78,7 @@ if [ "$RELEASE" == 'true' ] && [ "$TRAVIS_BRANCH" == 'master' ] && [ "$TRAVIS_PU
         echo "--------------------------------------"
         echo "Merging into develop and updating pom version"
         echo "--------------------------------------"
+        rm -rf travis_wait*
         git checkout develop
         git pull
         git merge master

cd/install.sh

@@ -2,12 +2,14 @@
 
 set -e
 
-if [ "$RELEASE" != 'true' ] && [ "$TRAVIS_PULL_REQUEST" != 'false' ]; then
-    if [ "$MODULES" == '' ] || [[ $MODULES == *'!'* ]]; then
-        echo "Running install script: mvn -q install -P quick,travis,build-extras -B -V"
-        mvn -q install -P quick,travis,build-extras -B -V
-    else
-        echo "Running install script: mvn -q install -P quick,travis,build-extras -B -V -pl $MODULES -am"
-        mvn -q install -P quick,travis,build-extras -B -V -pl $MODULES -am
+if [ "$RELEASE" != 'true' ]; then
+    if [ "$TRAVIS_BRANCH" == 'develop' ] || [ "$TRAVIS_PULL_REQUEST" != 'false' ]; then
+        if [ "$MODULES" == '' ] || [[ $MODULES == *'!'* ]]; then
+            echo "Running install script: mvn -q install -P quick,travis,build-extras -B -V"
+            mvn -q install -P quick,travis,build-extras -B -V
+        else
+            echo "Running install script: mvn -q install -P quick,travis,build-extras -B -V -pl $MODULES -am"
+            mvn -q install -P quick,travis,build-extras -B -V -pl $MODULES -am
+        fi
     fi
 fi

pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer2</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0-RC2</version>
     </parent>
 
     <artifactId>gaffer-tools</artifactId>
@@ -38,7 +38,7 @@
     </modules>
 
     <properties>
-        <gaffer.version>1.6.0</gaffer.version>
+        <gaffer.version>1.7.0-RC2</gaffer.version>
         <scm.url>
             https://github.com/gchq/gaffer-tools
         </scm.url>

python-shell/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.6.0"
+__version__ = "1.7.0-RC2"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

python-shell/src/gafferpy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.6.0"
+__version__ = "1.7.0-RC2"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

python-shell/src/gafferpy/gaffer_operations.py

@@ -2486,7 +2486,7 @@ def to_json(self):
 
 
 class ToSingletonList(Operation):
-    CLASS = 'uk.gov.gchq.gaffer.operation.impl.ToSingletonList'
+    CLASS = 'uk.gov.gchq.gaffer.operation.impl.output.ToSingletonList'
 
     def __init__(self, input=None, options=None):
         super().__init__(_class_name=self.CLASS, options=options)

python-shell/src/test/test_gaffer_operations.py

@@ -4968,7 +4968,7 @@ class GafferOperationsTest(unittest.TestCase):
         [
             '''
             {
-                "class" : "uk.gov.gchq.gaffer.operation.impl.ToSingletonList",
+                "class" : "uk.gov.gchq.gaffer.operation.impl.output.ToSingletonList",
                 "input" : [{
                     "class" : "uk.gov.gchq.gaffer.data.element.Edge",
                     "group" : "testEdge",

ui/src/main/webapp/app/settings/settings-service.js

@@ -19,7 +19,7 @@
 angular.module('app').factory('settings', ['$q', 'config', 'events', function($q, config, events) {
     var settings = {};
 
-    var resultLimit = 100;
+    var resultLimit = 1000;
     var defaultOpOptions = {};
     var opOptionKeys;
     var defaultOpOptionsUpdateListeners = [];

ui/src/test/webapp/app/graph/graph-service-spec.js

@@ -164,7 +164,7 @@ describe("The Graph Service", function() {
                         class: 'uk.gov.gchq.gaffer.operation.OperationChain',
                         operations: [
                             expectedOp,
-                            { class: 'uk.gov.gchq.gaffer.operation.impl.Limit', resultLimit: 100, options: {  } },
+                            { class: 'uk.gov.gchq.gaffer.operation.impl.Limit', resultLimit: 1000, options: {  } },
                             { class: 'uk.gov.gchq.gaffer.operation.impl.output.ToSet', options: {  } }
                         ],
                         options: {  }