Merge branch 'release-0.9.8.4-rc1' Change-Id: I75f8d5b2a98e3d0ce89d266199d810e6c9a63f59

diff --git a/asterix-opt-bom/pom.xml b/asterix-opt-bom/pom.xml
index c5b049e..ae43491 100644
--- a/asterix-opt-bom/pom.xml
+++ b/asterix-opt-bom/pom.xml

@@ -21,13 +21,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.asterix</groupId>
   <artifactId>asterix-opt-bom</artifactId>
-  <version>0.9.8.4</version>
+  <version>0.9.8-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <parent>
     <groupId>org.apache.asterix.clients</groupId>
     <artifactId>asterix-opt</artifactId>
-    <version>0.9.8.4</version>
+    <version>0.9.8-SNAPSHOT</version>
   </parent>
 
 </project>

diff --git a/asterixdb-jdbc/asterix-jdbc-core/pom.xml b/asterixdb-jdbc/asterix-jdbc-core/pom.xml
index bb8da0e..f6289a1 100644
--- a/asterixdb-jdbc/asterix-jdbc-core/pom.xml
+++ b/asterixdb-jdbc/asterix-jdbc-core/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <artifactId>apache-asterixdb-jdbc</artifactId>
     <groupId>org.apache.asterix</groupId>
-    <version>0.9.8.4</version>
+    <version>0.9.9-SNAPSHOT</version>
   </parent>
   <artifactId>asterix-jdbc-core</artifactId>
 

diff --git a/asterixdb-jdbc/asterix-jdbc-driver/pom.xml b/asterixdb-jdbc/asterix-jdbc-driver/pom.xml
index a9d340c..a32ed79 100644
--- a/asterixdb-jdbc/asterix-jdbc-driver/pom.xml
+++ b/asterixdb-jdbc/asterix-jdbc-driver/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <artifactId>apache-asterixdb-jdbc</artifactId>
     <groupId>org.apache.asterix</groupId>
-    <version>0.9.8.4</version>
+    <version>0.9.9-SNAPSHOT</version>
   </parent>
   <artifactId>asterix-jdbc-driver</artifactId>
 

diff --git a/asterixdb-jdbc/asterix-jdbc-taco/pom.xml b/asterixdb-jdbc/asterix-jdbc-taco/pom.xml
index f04cc0e..1c4e4ee 100644
--- a/asterixdb-jdbc/asterix-jdbc-taco/pom.xml
+++ b/asterixdb-jdbc/asterix-jdbc-taco/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <artifactId>apache-asterixdb-jdbc</artifactId>
     <groupId>org.apache.asterix</groupId>
-    <version>0.9.8.4</version>
+    <version>0.9.9-SNAPSHOT</version>
   </parent>
   <artifactId>asterix-jdbc-taco</artifactId>
   <packaging>jar</packaging>
@@ -53,6 +53,8 @@
     <taco.plugin.table.label>Dataset</taco.plugin.table.label>
     <taco.plugin.jdbc.scheme>jdbc:asterixdb://</taco.plugin.jdbc.scheme>
     <taco.plugin.auth.none><![CDATA[<option value="auth-none" label="No Authentication"/>]]></taco.plugin.auth.none>
+    <taco.plugin.auth.other/>
+    <taco.plugin.auth.userpass.condition/>
     <taco.plugin.fields.custom/>
     <taco.plugin.norm.attributes.custom/>
     <taco.plugin.jdbc.properties.custom/>

diff --git a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml
index dde677d..3a8508e 100644
--- a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml
+++ b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml

@@ -26,17 +26,20 @@
     <selection-group>
       ${taco.plugin.auth.none}
       <option value="auth-user-pass" label="Username and Password"/>
+      ${taco.plugin.auth.other}
     </selection-group>
   </field>
 
   <field name="username" label="Username" category="authentication" value-type="string">
     <conditions>
+      ${taco.plugin.auth.userpass.condition}
       <condition field="authentication" value="auth-user-pass"/>
     </conditions>
   </field>
 
   <field name="password" label="Password" category="authentication" value-type="string" secure="true">
     <conditions>
+      ${taco.plugin.auth.userpass.condition}
       <condition field="authentication" value="auth-user-pass"/>
     </conditions>
   </field>

diff --git a/asterixdb-jdbc/asterix-jdbc-test/pom.xml b/asterixdb-jdbc/asterix-jdbc-test/pom.xml
index 56f5a6f..38165f8 100644
--- a/asterixdb-jdbc/asterix-jdbc-test/pom.xml
+++ b/asterixdb-jdbc/asterix-jdbc-test/pom.xml

@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>asterix-jdbc-test</artifactId>
-  <version>0.9.8.4</version>
+  <version>0.9.9-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
     <groupId>org.apache.asterix</groupId>

diff --git a/asterixdb-jdbc/pom.xml b/asterixdb-jdbc/pom.xml
index 42bc3b5..6b1ab26 100644
--- a/asterixdb-jdbc/pom.xml
+++ b/asterixdb-jdbc/pom.xml

@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.asterix</groupId>
   <artifactId>apache-asterixdb-jdbc</artifactId>
-  <version>0.9.8.4</version>
+  <version>0.9.9-SNAPSHOT</version>
   <packaging>pom</packaging>
   <parent>
     <groupId>org.apache</groupId>

diff --git a/pom.xml b/pom.xml
index b90622a..b8c6bd0 100644
--- a/pom.xml
+++ b/pom.xml

@@ -21,12 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.asterix.clients</groupId>
   <artifactId>asterix-opt</artifactId>
-  <version>0.9.8.4</version>
+  <version>0.9.8-SNAPSHOT</version>
   <packaging>pom</packaging>
   <parent>
     <groupId>org.apache.asterix</groupId>
     <artifactId>apache-asterixdb</artifactId>
-    <version>0.9.9</version>
+    <version>0.9.8-SNAPSHOT</version>
   </parent>
   <modules>
     <module>asterixdb-jdbc</module>