Merge pull request #148 from data-integrations/bump-deps

Bump CDAP and Hadoop dependencies

Author: dli357

pom.xml

@@ -58,13 +58,13 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- version properties -->
     <avro.version>1.7.7</avro.version>
-    <cdap.version>6.8.0-SNAPSHOT</cdap.version>
+    <cdap.version>6.8.0</cdap.version>
     <junit.version>4.12</junit.version>
     <commons.io.version>2.6</commons.io.version>
     <commons.lang.version>2.6</commons.lang.version>
-    <hadoop.version>2.3.0</hadoop.version>
+    <hadoop.version>2.10.2</hadoop.version>
     <spark2.version>2.1.3</spark2.version>
-    <hydrator.version>2.10.0-SNAPSHOT</hydrator.version>
+    <hydrator.version>2.10.0</hydrator.version>
     <commons.version>3.8.1</commons.version>
     <salesforce.api.version>53.0.0</salesforce.api.version>
     <cometd.java.client.version>4.0.0</cometd.java.client.version>
@@ -374,6 +374,10 @@
           <groupId>org.apache.hbase</groupId>
           <artifactId>hbase-common</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
       </exclusions>
       <scope>test</scope>
     </dependency>
@@ -503,8 +507,8 @@
                 Plugins use the new macro substitution that supports object, which is introduced in 6.4.0.
                 The cdap API version that this project depends on is still 6.2.0 since there is no new API needed.
               -->
-              <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.8.0,7.0.0-SNAPSHOT)</parent>
+              <parent>system:cdap-data-streams[6.8.0,7.0.0-SNAPSHOT)</parent>
             </cdapArtifacts>
           </configuration>
           <executions>
@@ -779,7 +783,7 @@
         <dependency>
           <groupId>io.cdap.tests.e2e</groupId>
           <artifactId>cdap-e2e-framework</artifactId>
-          <version>0.0.1-SNAPSHOT</version>
+          <version>0.1.0-SNAPSHOT</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

src/e2e-test/resources/errorMessage.properties

@@ -9,4 +9,4 @@ invalid.authentication.property=Error encountered while establishing connection:
 invalid.soql.starquery=Invalid SOQL query ' SELECT * FROM Account' : Star queries are not supported: *
 #Invalid SObject specification
 invalid.sobjectnames=Invalid SObject name
-invalid.sobjectname.error=Error encountered while configuring the stage: 'Cannot establish connection to Salesforce to describe SObject:
+invalid.sobjectname.error=Error encountered while configuring the stage: 'Cannot establish connection to Salesforce to describe SObject:

src/test/java/io/cdap/plugin/salesforce/plugin/source/batch/SalesforceMultiSourceConfigBuilder.java renamed to src/main/java/io/cdap/plugin/salesforce/plugin/source/batch/SalesforceMultiSourceConfigBuilder.java

@@ -17,6 +17,9 @@
 
 import io.cdap.plugin.salesforce.plugin.OAuthInfo;
 
+/**
+ * Helper class to simplify {@link SalesforceMultiSourceConfig} class creation.
+ */
 public class SalesforceMultiSourceConfigBuilder {
 
   private String referenceName;