Skip to content

Guava upgrade in Salesforce #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Guava upgrade in Salesforce #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
748dd34
Changed guava scope
Krish-cloudsufi Aug 14, 2025
d175fd0
added guava changes
Krish-cloudsufi Aug 20, 2025
cf5e7e9
Skipped etl tests
Krish-cloudsufi Aug 21, 2025
3ef7a7e
Merge branch 'data-integrations:develop' into guava-moss
Krish-cloudsufi Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 73 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,25 @@
</repository>
</repositories>



<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.13</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>13.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.3-jre</version>
</dependency>
<dependency>
<groupId>io.cdap.cdap</groupId>
<artifactId>cdap-api</artifactId>
Expand All @@ -117,6 +130,12 @@
<groupId>io.cdap.plugin</groupId>
<artifactId>hydrator-common</artifactId>
<version>${hydrator.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand Down Expand Up @@ -321,6 +340,14 @@
<version>${cdap.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>io.cdap.cdap</groupId>
<artifactId>cdap-formats</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.twill</groupId>
<artifactId>twill-core</artifactId>
Expand Down Expand Up @@ -370,6 +397,12 @@
<artifactId>cdap-data-pipeline2_2.11</artifactId>
<version>${cdap.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
Expand Down Expand Up @@ -412,6 +445,12 @@
<artifactId>cdap-data-streams2_2.11</artifactId>
<version>${cdap.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -481,6 +520,36 @@
<testSourceDirectory>${testSourceLocation}</testSourceDirectory>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>shade-old-guava</id>
<!-- run only during test-compile phase -->
<phase>test-compile</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<!-- only shade the old Guava -->
<include>com.google.guava:guava:31.1-jre</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>shadow.guava31.com.google.common</shadedPattern>
</relocation>
</relocations>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.cdap</groupId>
<artifactId>cdap-maven-plugin</artifactId>
Expand Down Expand Up @@ -539,6 +608,7 @@
</includes>
<excludes>
<exclude>**/*TestRun.java</exclude>
<exclude>io/cdap/plugin/salesforce/etl/**</exclude>
</excludes>
</configuration>
</plugin>
Expand Down Expand Up @@ -755,11 +825,12 @@
</build>
<dependencyManagement>
<dependencies>
<!-- Guava with test scope -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<scope>compile</scope>
<version>13.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/io/cdap/plugin/salesforce/etl/BaseSalesforceBatchSourceETLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
/**
* {@inheritDoc}
*/
public abstract class BaseSalesforceBatchSourceETLTest extends BaseSalesforceETLTest {
public abstract class
BaseSalesforceBatchSourceETLTest extends BaseSalesforceETLTest {

@ClassRule
public static final TestConfiguration CONFIG = new TestConfiguration("explore.enabled", false);
Expand Down
182 changes: 0 additions & 182 deletions src/test/java/io/cdap/plugin/salesforce/etl/SalesforceBatchSinkSchemaValidation.java
View file
Open in desktop

This file was deleted.

Loading