Skip to content
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

Jump to bottom

[PLUGIN-1683] Upgrade aws-java-sdk-s3 to 1.12.522, maven-bundle-plugin 3.5.0 #180

Merged
merged 4 commits into from
Sep 21, 2023
Merged

[PLUGIN-1683] Upgrade aws-java-sdk-s3 to 1.12.522, maven-bundle-plugin 3.5.0 #180

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6766a6
Upgrade aws-java-sdk-s3 to 1.12.522, maven-bundle-plugin 3.5.0
priyanshu-beep Sep 20, 2023
15e020b
Updated common-logging version from 1.1.1 to 1.1.3
priyanshu-beep Sep 20, 2023
c0c8de9
Add comments to pom.xml
priyanshu-beep Sep 20, 2023
e467a8f
Excluded log4j from commons-logging
priyanshu-beep Sep 20, 2023
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
36 changes: 26 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.cdap.plugin</groupId>
Expand Down Expand Up @@ -80,7 +80,9 @@
<data.pipeline.parent>system:cdap-data-pipeline[6.8.0, 7.0.0-SNAPSHOT)</data.pipeline.parent>
<data.stream.parent>system:cdap-data-streams[6.8.0, 7.0.0-SNAPSHOT)</data.stream.parent>
<hadoop.version>2.10.2</hadoop.version>
<aws.sdk.version>1.11.133</aws.sdk.version>
<aws.sdk.version>1.12.552</aws.sdk.version>
<commons.logging.version>1.1.3</commons.logging.version>
<httpclient.version>4.5.14</httpclient.version>
<main.basedir>${project.basedir}</main.basedir>
</properties>

Expand Down Expand Up @@ -249,16 +251,30 @@
</exclusion>
</exclusions>
</dependency>
<!-- Conflict arose from hadoop-mapreduce-client-core.
Added version 1.1.3 to resolve conflicts.-->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws.sdk.version}</version>
<groupId>commons-logging</groupId>
priyanshu-beep marked this conversation as resolved.
Show resolved Hide resolved
priyanshu-beep marked this conversation as resolved.
Show resolved Hide resolved
priyanshu-beep marked this conversation as resolved.
Show resolved Hide resolved
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</exclusions>
</dependency>
<!-- Conflict arose from hadoop-common.
Added version 4.5.14 to resolve conflicts.-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
priyanshu-beep marked this conversation as resolved.
Show resolved Hide resolved
priyanshu-beep marked this conversation as resolved.
Show resolved Hide resolved
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws.sdk.version}</version>
</dependency>
</dependencies>

Expand All @@ -278,7 +294,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.4</version>
<version>3.5.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down