You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2018/06/29 06:03:30 UTC
svn commit: r1834651 - in /jackrabbit/oak/branches/1.8: ./
oak-blob-cloud/pom.xml
oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
oak-run/pom.xml
Author: amitj
Date: Fri Jun 29 06:03:29 2018
New Revision: 1834651
URL: http://svn.apache.org/viewvc?rev=1834651&view=rev
Log:
OAK-7536: Update aws java sdk version to 1.11.330
OAK-7594: datastorecheck command in oak-run for S3 needs jackson-annotations dependency
- Merge r1833308, r1834648, r1834649 from trunk
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml
jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
jackrabbit/oak/branches/1.8/oak-run/pom.xml
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 29 06:03:29 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1834648-1834649
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml?rev=1834651&r1=1834650&r2=1834651&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml Fri Jun 29 06:03:29 2018
@@ -30,6 +30,12 @@
<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>
+ <jackson.version>2.9.5</jackson.version>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -118,7 +124,49 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
- <version>1.11.24</version>
+ <version>${aws.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.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/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java?rev=1834651&r1=1834650&r2=1834651&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java Fri Jun 29 06:03:29 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/branches/1.8/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/pom.xml?rev=1834651&r1=1834650&r2=1834651&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-run/pom.xml Fri Jun 29 06:03:29 2018
@@ -35,13 +35,14 @@
<groovy.version>2.4.7</groovy.version>
<!--
Size History:
+ + 51 MB AWS java sdk update (OAK-7536)
+ 48 MB Transitive dependencies needed for aws-java-sdk (OAK-6899)
+ 47 MB release profile build slightly bigger jar (OAK-6252)
+ 46 MB re-introduced the ServerCommand and required dependencies (OAK-6252)
+ 41 MB build failing on the release profile (OAK-6250)
+ 38 MB. Initial value. Current 35MB plus a 10%
-->
- <max.jar.size>48000000</max.jar.size>
+ <max.jar.size>51000000</max.jar.size>
</properties>
<build>