Author: amitj
Date: Mon Jun 11 07:59:25 2018
New Revision: 1833308
URL: http://svn.apache.org/viewvc?rev=1833308&view=rev
Log:
OAK-7536: Update aws java sdk version to 1.11.330
- Updated to sdk version 1.11.330
- Changed to have endpoint generation to put a 's3.' prefix which is common to
all regions.
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/pom.xml
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
jackrabbit/oak/trunk/oak-run/pom.xml
Modified: jackrabbit/oak/trunk/oak-blob-cloud/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/pom.xml?rev=1833308&r1=1833307&r2=1833308&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/pom.xml Mon Jun 11 07:59:25 2018
@@ -30,6 +30,11 @@
<name>Oak Cloud Blob Store</name>
<packaging>bundle</packaging>
+ <properties>
+ <netty.version>4.1.17.Final</netty.version>
+ <aws.version>1.11.330</aws.version>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -122,7 +127,44 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
- <version>1.11.24</version>
+ <version>${aws.version}</version>
+ </dependency>
+
+ <!-- Netty -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.version}</version>
</dependency>
<dependency>
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java?rev=1833308&r1=1833307&r2=1833308&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
Mon Jun 11 07:59:25 2018
@@ -115,10 +115,8 @@ public final class Utils {
}
if (DEFAULT_AWS_BUCKET_REGION.equals(region)) {
endpoint = S3 + DOT + AWSDOTCOM;
- } else if (Region.EU_Ireland.toString().equals(region)) {
- endpoint = "s3-eu-west-1" + DOT + AWSDOTCOM;
} else {
- endpoint = S3 + DASH + region + DOT + AWSDOTCOM;
+ endpoint = S3 + DOT + region + DOT + AWSDOTCOM;
}
}
/*
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1833308&r1=1833307&r2=1833308&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Mon Jun 11 07:59:25 2018
@@ -35,6 +35,7 @@
<groovy.version>2.4.7</groovy.version>
<!--
Size History:
+ + 51 MB AWS java sdk update (OAK-7536)
+ 49 MB MongoDB Java driver 3.6.3 is bigger (OAK-7359)
+ 48 MB Transitive dependencies needed for aws-java-sdk (OAK-6899)
+ 47 MB release profile build slightly bigger jar (OAK-6252)
@@ -42,7 +43,7 @@
+ 41 MB build failing on the release profile (OAK-6250)
+ 38 MB. Initial value. Current 35MB plus a 10%
-->
- <max.jar.size>49000000</max.jar.size>
+ <max.jar.size>51000000</max.jar.size>
</properties>
<build>
