Merge branch 'release-1.1.0' into master

Author: thc202

build.gradle

@@ -10,7 +10,7 @@ allprojects {
     apply plugin: 'java'
     group = 'org.zaproxy'
 
-    version '1.1.0-SNAPSHOT'
+    version '1.1.0'
     ext.versionBC = '1.0.0'
 
     repositories {

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/ActiveScanSubtreeTask.java

@@ -24,12 +24,11 @@
 public class ActiveScanSubtreeTask extends ZapTask {
 
 	private String url;
-	private String apikey;
 
 	@Override
 	public void execute() throws BuildException {
 		try {
-			this.getClientApi().ascan.scan(apikey, url, "true", "false", "", "", "");
+			this.getClientApi().ascan.scan(url, "true", "false", "", "", "");
 
 		} catch (Exception e) {
 			throw new BuildException(e);
@@ -43,12 +42,4 @@ public String getUrl() {
 	public void setUrl(String url) {
 		this.url = url;
 	}
-
-	public String getApikey() {
-		return apikey;
-	}
-
-	public void setApikey(String apikey) {
-		this.apikey = apikey;
-	}
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/ActiveScanUrlTask.java

@@ -24,12 +24,11 @@
 public class ActiveScanUrlTask extends ZapTask {
 
 	private String url;
-	private String apikey;
 
 	@Override
 	public void execute() throws BuildException {
 		try {
-			this.getClientApi().ascan.scan(apikey, url, "false", "false", "", "", "");
+			this.getClientApi().ascan.scan(url, "false", "false", "", "", "");
 
 		} catch (Exception e) {
 			throw new BuildException(e);
@@ -43,12 +42,4 @@ public String getUrl() {
 	public void setUrl(String url) {
 		this.url = url;
 	}
-
-	public String getApikey() {
-		return apikey;
-	}
-
-	public void setApikey(String apikey) {
-		this.apikey = apikey;
-	}
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/AlertTask.java

@@ -39,7 +39,7 @@ public class AlertTask extends Task {
 	 * Gets the name of the alert.
 	 *
 	 * @return the name of the alert
-	 * @since TODO add version
+	 * @since 1.1.0
 	 */
 	public String getName() {
 		return name;
@@ -49,7 +49,7 @@ public String getName() {
 	 * Sets the name of the alert.
 	 *
 	 * @param name the name of the alert
-	 * @since TODO add version
+	 * @since 1.1.0
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -59,7 +59,7 @@ public void setName(String name) {
 	 * Gets the name of the alert.
 	 *
 	 * @return the name of the alert
-	 * @deprecated (TODO add version) Use {@link #getName()} instead.
+	 * @deprecated (1.1.0) Use {@link #getName()} instead.
 	 */
 	@Deprecated
 	public String getAlert() {
@@ -70,7 +70,7 @@ public String getAlert() {
 	 * Sets the name of the alert.
 	 *
 	 * @param name the name of the alert
-	 * @deprecated (TODO add version) Use {@link #setName(String)} instead.
+	 * @deprecated (1.1.0) Use {@link #setName(String)} instead.
 	 */
 	@Deprecated
 	public void setAlert(String name) {

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/LoadSessionTask.java

@@ -24,12 +24,11 @@
 public class LoadSessionTask extends ZapTask {
 
 	private String name;
-	private String apikey;
 
 	@Override
 	public void execute() throws BuildException {
 		try {
-			this.getClientApi().core.loadSession(apikey, name);
+			this.getClientApi().core.loadSession(name);
 
 		} catch (Exception e) {
 			throw new BuildException(e);
@@ -43,12 +42,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
-	public String getApikey() {
-		return apikey;
-	}
-
-	public void setApikey(String apikey) {
-		this.apikey = apikey;
-	}
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/NewSessionTask.java

@@ -24,12 +24,11 @@
 public class NewSessionTask extends ZapTask {
 
 	private String name;
-	private String apikey;
 
 	@Override
 	public void execute() throws BuildException {
 		try {
-			this.getClientApi().core.newSession(apikey, name, "true");
+			this.getClientApi().core.newSession(name, "true");
 
 		} catch (Exception e) {
 			throw new BuildException(e);
@@ -43,12 +42,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
-	public String getApikey() {
-		return apikey;
-	}
-
-	public void setApikey(String apikey) {
-		this.apikey = apikey;
-	}
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/SaveSessionTask.java

@@ -24,12 +24,11 @@
 public class SaveSessionTask extends ZapTask {
 
 	private String name;
-	private String apikey;
 
 	@Override
 	public void execute() throws BuildException {
 		try {
-			this.getClientApi().core.saveSession(apikey, name, "true");
+			this.getClientApi().core.saveSession(name, "true");
 
 		} catch (Exception e) {
 			throw new BuildException(e);
@@ -43,12 +42,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-
-	public String getApikey() {
-		return apikey;
-	}
-
-	public void setApikey(String apikey) {
-		this.apikey = apikey;
-	}
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/SpiderUrlTask.java

@@ -24,12 +24,11 @@
 public class SpiderUrlTask extends ZapTask {
 
 	private String url;
-	private String apikey;
 
 	@Override
 	public void execute() throws BuildException {
 		try {
-			this.getClientApi().spider.scan(apikey, url, "", "", null, null);
+			this.getClientApi().spider.scan(url, "", "", null, null);
 
 		} catch (Exception e) {
 			throw new BuildException(e);
@@ -44,12 +43,4 @@ public void setUrl(String url) {
 		this.url = url;
 	}
 
-	public String getApikey() {
-		return apikey;
-	}
-
-	public void setApikey(String apikey) {
-		this.apikey = apikey;
-	}
-	
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/StopZapTask.java

@@ -23,24 +23,13 @@
 
 public class StopZapTask extends ZapTask {
 
-	private String apikey;
-	
 	@Override
 	public void execute() throws BuildException {
 		try {
-			this.getClientApi().core.shutdown(apikey);
+			this.getClientApi().core.shutdown();
 		} catch (Exception e) {
-			e.printStackTrace();
 			throw new BuildException(e);
 		}
 	}
 
-	public String getApikey() {
-		return apikey;
-	}
-
-	public void setApikey(String apikey) {
-		this.apikey = apikey;
-	}
-	
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/ZapTask.java

@@ -26,9 +26,10 @@ public abstract class ZapTask extends Task {
 	private String zapAddress;
 	private int zapPort;
 	private boolean debug = false;
+	private String apikey;
 
 	protected ClientApi getClientApi() {
-		return new ClientApi(zapAddress, zapPort, debug);
+		return new ClientApi(zapAddress, zapPort, apikey, debug);
 	}
 
 	public String getZapAddress() {
@@ -51,4 +52,12 @@ public boolean isDebug() {
 	public void setDebug(boolean debug) {
 		this.debug = debug;
 	}
+
+	public String getApikey() {
+		return apikey;
+	}
+
+	public void setApikey(String apikey) {
+		this.apikey = apikey;
+	}
 }