Skip to content

Commit 86ad547

Browse files
committed
Bump CDAP and Hadoop dependencies, add log4j exclusions, move config builders to src directory and bump e2e-test dependency to allow e2e-tests to compile, and add a newline to errorMessage.properties to satisfy the linter.
1 parent 2c6916c commit 86ad547

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

pom.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5959
<!-- version properties -->
6060
<avro.version>1.7.7</avro.version>
61-
<cdap.version>6.8.0-SNAPSHOT</cdap.version>
61+
<cdap.version>6.8.0</cdap.version>
6262
<junit.version>4.12</junit.version>
6363
<commons.io.version>2.6</commons.io.version>
6464
<commons.lang.version>2.6</commons.lang.version>
65-
<hadoop.version>2.3.0</hadoop.version>
65+
<hadoop.version>2.10.2</hadoop.version>
6666
<spark2.version>2.1.3</spark2.version>
67-
<hydrator.version>2.10.0-SNAPSHOT</hydrator.version>
67+
<hydrator.version>2.10.0</hydrator.version>
6868
<commons.version>3.8.1</commons.version>
6969
<salesforce.api.version>53.0.0</salesforce.api.version>
7070
<cometd.java.client.version>4.0.0</cometd.java.client.version>
@@ -374,6 +374,10 @@
374374
<groupId>org.apache.hbase</groupId>
375375
<artifactId>hbase-common</artifactId>
376376
</exclusion>
377+
<exclusion>
378+
<groupId>log4j</groupId>
379+
<artifactId>log4j</artifactId>
380+
</exclusion>
377381
</exclusions>
378382
<scope>test</scope>
379383
</dependency>
@@ -503,8 +507,8 @@
503507
Plugins use the new macro substitution that supports object, which is introduced in 6.4.0.
504508
The cdap API version that this project depends on is still 6.2.0 since there is no new API needed.
505509
-->
506-
<parent>system:cdap-data-pipeline[6.8.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
507-
<parent>system:cdap-data-streams[6.8.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
510+
<parent>system:cdap-data-pipeline[6.8.0,7.0.0-SNAPSHOT)</parent>
511+
<parent>system:cdap-data-streams[6.8.0,7.0.0-SNAPSHOT)</parent>
508512
</cdapArtifacts>
509513
</configuration>
510514
<executions>
@@ -779,7 +783,7 @@
779783
<dependency>
780784
<groupId>io.cdap.tests.e2e</groupId>
781785
<artifactId>cdap-e2e-framework</artifactId>
782-
<version>0.0.1-SNAPSHOT</version>
786+
<version>0.1.0-SNAPSHOT</version>
783787
<scope>test</scope>
784788
</dependency>
785789
</dependencies>

src/e2e-test/resources/errorMessage.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ invalid.authentication.property=Error encountered while establishing connection:
99
invalid.soql.starquery=Invalid SOQL query ' SELECT * FROM Account' : Star queries are not supported: *
1010
#Invalid SObject specification
1111
invalid.sobjectnames=Invalid SObject name
12-
invalid.sobjectname.error=Error encountered while configuring the stage: 'Cannot establish connection to Salesforce to describe SObject:
12+
invalid.sobjectname.error=Error encountered while configuring the stage: 'Cannot establish connection to Salesforce to describe SObject:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717

1818
import io.cdap.plugin.salesforce.plugin.OAuthInfo;
1919

20+
/**
21+
* Helper class to simplify {@link SalesforceMultiSourceConfig} class creation.
22+
*/
2023
public class SalesforceMultiSourceConfigBuilder {
2124

2225
private String referenceName;

0 commit comments

Comments
 (0)