prepping for beta 2 release

paxtonhare · paxtonhare · commit d764b4240919 · 2016-04-05T16:20:54.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ environment.properties
 assetInstallTime.properties
 /quick-start/input
 /quick-start/plugins
+flow.properties
diff --git a/marklogic-data-hub/gradle.properties b/marklogic-data-hub/gradle.properties
@@ -8,4 +8,4 @@ mlPassword=admin
 mlHost=localhost
 mlAppName=data-hub
 auth=digest
-version=1.0.0-beta.1
+version=1.0.0-beta.2
diff --git a/marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java b/marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java
@@ -89,7 +89,7 @@ public class DataHub {
     private final static int DEFAULT_FINAL_REST_PORT = 8011;
 
     public DataHub(HubConfig config) {
-        this(config.getHost(), config.getAdminUsername(), config.getAdminPassword());
+        this(config.getHost(), config.getStagingPort(), config.getFinalPort(), config.getAdminUsername(), config.getAdminPassword());
     }
 
     public DataHub(String host, String username, String password) {
diff --git a/marklogic-data-hub/src/test/java/com/marklogic/hub/EndToEndTestXqyXml.java b/marklogic-data-hub/src/test/java/com/marklogic/hub/EndToEndTestXqyXml.java
@@ -17,7 +17,6 @@
 
 import com.marklogic.client.io.DOMHandle;
 import com.marklogic.client.io.Format;
-import com.marklogic.client.io.StringHandle;
 import com.marklogic.hub.flow.Flow;
 import com.marklogic.hub.flow.FlowType;
 
diff --git a/ml-data-hub-plugin/build.gradle b/ml-data-hub-plugin/build.gradle
@@ -9,6 +9,7 @@ buildscript {
 }
 
 plugins {
+    id 'net.saliman.properties' version '1.4.4'
     id "groovy"
     id "maven-publish"
     id "eclipse"
@@ -64,7 +65,7 @@ bintray {
 
 pluginBundle {
     website = 'http://www.gradle.org/'
-    vcsUrl = 'https://github.com/marklogic/marklogic-data-hub.git'
+    vcsUrl = 'git@github.com:marklogic/marklogic-data-hub.git'
     description = 'ml-data-hub-plugin A gradle plugin for Data Hub tasks'
     tags = ['marklogic']
 
@@ -74,11 +75,6 @@ pluginBundle {
             displayName = 'Gradle tasks for MarkLogic Data Hub'
             description = 'Gradle plugin for configuring and deploying the MarkLogic Data Hub'
             tags = ['marklogic']
-            version = "0.0.9"
         }
     }
-
-    mavenCoordinates {
-        version = "0.0.9"
-    }
 }
diff --git a/ml-data-hub-plugin/gradle.properties b/ml-data-hub-plugin/gradle.properties
@@ -1,2 +1,2 @@
-version=1.0.0-beta.1
+version=1.0.0-beta.2
 group=com.marklogic
diff --git a/quick-start/gradle.properties b/quick-start/gradle.properties
@@ -1 +1 @@
-version=1.0.0-beta.1
+version=1.0.0-beta.2

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public class DataHub {`
`89`	`89`	`private final static int DEFAULT_FINAL_REST_PORT = 8011;`
`90`	`90`
`91`	`91`	`public DataHub(HubConfig config) {`
`92`		`- this(config.getHost(), config.getAdminUsername(), config.getAdminPassword());`
	`92`	`+ this(config.getHost(), config.getStagingPort(), config.getFinalPort(), config.getAdminUsername(), config.getAdminPassword());`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public DataHub(String host, String username, String password) {`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`plugins {`
	`12`	`+ id 'net.saliman.properties' version '1.4.4'`
`12`	`13`	`id "groovy"`
`13`	`14`	`id "maven-publish"`
`14`	`15`	`id "eclipse"`
`@@ -64,7 +65,7 @@ bintray {`
`64`	`65`
`65`	`66`	`pluginBundle {`
`66`	`67`	`website = 'http://www.gradle.org/'`
`67`		`- vcsUrl = 'https://github.com/marklogic/marklogic-data-hub.git'`
	`68`	`+ vcsUrl = 'git@github.com:marklogic/marklogic-data-hub.git'`
`68`	`69`	`description = 'ml-data-hub-plugin A gradle plugin for Data Hub tasks'`
`69`	`70`	`tags = ['marklogic']`
`70`	`71`
`@@ -74,11 +75,6 @@ pluginBundle {`
`74`	`75`	`displayName = 'Gradle tasks for MarkLogic Data Hub'`
`75`	`76`	`description = 'Gradle plugin for configuring and deploying the MarkLogic Data Hub'`
`76`	`77`	`tags = ['marklogic']`
`77`		`- version = "0.0.9"`
`78`	`78`	`}`
`79`	`79`	`}`
`80`		`-`
`81`		`- mavenCoordinates {`
`82`		`- version = "0.0.9"`
`83`		`- }`
`84`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-version=1.0.0-beta.1`
	`1`	`+version=1.0.0-beta.2`
`2`	`2`	`group=com.marklogic`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version=1.0.0-beta.1`
	`1`	`+version=1.0.0-beta.2`