Merge branch 'release-1.6.0' into master

Author: thc202

.gitattributes

@@ -0,0 +1,13 @@
+* text=auto
+
+*.java text
+*.properties text
+*.md text
+*.xml text
+*.gradle text
+
+*.bat text eol=crlf
+*.sh text eol=lf
+gradlew text eol=lf
+
+*.jar binary

.travis.yml

@@ -1,6 +1,10 @@
 language: java
 sudo: false
 
+jdk:
+  - oraclejdk8
+  - oraclejdk9
+
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

CHANGES.md

@@ -2,6 +2,16 @@
 
 Summary of the changes done in each version.
 
+## 1.6.0 (2018-04-10)
+
+### Changes
+
+ - Explicitly disable HTTP caching, to always obtain a fresh response from ZAP.
+
+### New APIs
+
+ - WebSockets ("websocket").
+
 ## 1.5.0 (2017-11-30)
 
 ### Updated APIs

README.md

@@ -22,7 +22,7 @@ can be obtained from [Maven Central](http://search.maven.org/) with following co
 
  * GroupId: `org.zaproxy`
  * ArtifactId: `zap-clientapi`
- * Version: `1.5.0`
+ * Version: `1.6.0`
 
 Previous releases are also available, more details can be found in [Maven Central](http://search.maven.org/#search|ga|1|org.zaproxy).
 

build.gradle

@@ -1,17 +1,21 @@
+plugins {
+    id "com.diffplug.gradle.spotless" version "3.10.0" apply false
+}
+
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.2.1'
+    gradleVersion = '4.6'
 }
 
 apply from: "gradle/compile.gradle"
-apply from: "gradle/idea.gradle"
-apply from: "gradle/eclipse.gradle"
 
 subprojects {
     apply plugin: 'java'
+    apply plugin: 'com.diffplug.gradle.spotless'
+
     group = 'org.zaproxy'
 
-    version '1.5.0'
-    ext.versionBC = '1.3.0'
+    version '1.6.0'
+    ext.versionBC = '1.5.0'
 
     repositories {
         mavenLocal()
@@ -20,4 +24,12 @@ subprojects {
 
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
+
+    spotless {
+        java {
+            licenseHeaderFile "$rootDir/gradle/spotless/license.java"
+
+            googleJavaFormat().style('AOSP')
+        }
+    }
 }

gradle/eclipse.gradle

@@ -0,0 +1,19 @@
+/*
+ * Zed Attack Proxy (ZAP) and its related class files.
+ *
+ * ZAP is an HTTP/HTTPS proxy for assessing web application security.
+ *
+ * Copyright $YEAR The ZAP Development Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

gradle/idea.gradle

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip