Merge branch 'develop' into httpPluginErrorMang

pom.xml

@@ -77,14 +77,13 @@
   <properties>
     <awaitility.version>3.1.6</awaitility.version>
     <cdap.version>6.11.0-SNAPSHOT</cdap.version>
+    <cdap.plugin.version>2.13.0-SNAPSHOT</cdap.plugin.version>
     <commons.version>3.9</commons.version>
     <common.codec.version>1.12</common.codec.version>
     <gson.version>2.8.5</gson.version>
     <googleauth.version>0.4.0</googleauth.version>
     <hadoop.version>3.3.6</hadoop.version>
     <httpcomponents.version>4.5.9</httpcomponents.version>
-    <hydrator.version>2.13.0-SNAPSHOT</hydrator.version>
-    <cdap.plugin.version>2.12.0</cdap.plugin.version>
     <jackson.version>2.13.0</jackson.version>
     <junit.version>4.11</junit.version>
     <jython.version>2.7.1</jython.version>
@@ -125,7 +124,7 @@
     <dependency>
       <groupId>io.cdap.plugin</groupId>
       <artifactId>hydrator-common</artifactId>
-      <version>${hydrator.version}</version>
+      <version>${cdap.plugin.version}</version>
     </dependency>
     <dependency>
       <groupId>io.cdap.plugin</groupId>
@@ -601,8 +600,8 @@
         <version>1.1.0</version>
         <configuration>
           <cdapArtifacts>
-            <parent>system:cdap-data-pipeline[6.8.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
-            <parent>system:cdap-data-streams[6.8.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
+            <parent>system:cdap-data-pipeline[6.11.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
+            <parent>system:cdap-data-streams[6.11.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
           </cdapArtifacts>
         </configuration>
         <executions>