Author: amitj
Date: Fri Jun 29 08:13:28 2018
New Revision: 1834655
URL: http://svn.apache.org/viewvc?rev=1834655&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
- Updated oak-run instructions
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-blob-cloud/pom.xml
jackrabbit/oak/branches/1.6/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
jackrabbit/oak/branches/1.6/oak-run/README.md
jackrabbit/oak/branches/1.6/oak-run/pom.xml
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 29 08:13:28 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262
,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1821847,1822850,1823172,1825471,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829569,1829987,1830019,1830160,1830748,1831374,1832379,1832535
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262
,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1821847,1822850,1823172,1825471,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829569,1829987,1830019,1830160,1830748,1831374,1832379,1832535,1833308,1834648-1834649
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-blob-cloud/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-blob-cloud/pom.xml?rev=1834655&r1=1834654&r2=1834655&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-blob-cloud/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-blob-cloud/pom.xml Fri Jun 29 08:13:28 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>
@@ -113,7 +119,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.6/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.6/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java?rev=1834655&r1=1834654&r2=1834655&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/Utils.java
Fri Jun 29 08:13:28 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.6/oak-run/README.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/README.md?rev=1834655&r1=1834654&r2=1834655&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-run/README.md (original)
+++ jackrabbit/oak/branches/1.6/oak-run/README.md Fri Jun 29 08:13:28 2018
@@ -860,11 +860,11 @@ The following options are available:
Note:
For using S3DataStore the following additional jars have to be downloaded
-
[commons-logging-1.1.3.jar](http://central.maven.org/maven2/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar)
- -
[aws-java-sdk-osgi-1.11.24.jar](http://central.maven.org/maven2/com/amazonaws/aws-java-sdk-osgi/1.11.24/aws-java-sdk-osgi-1.11.24.jar)
+ -
[aws-java-sdk-osgi-1.11.330.jar](http://central.maven.org/maven2/com/amazonaws/aws-java-sdk-osgi/1.11.330/aws-java-sdk-osgi-1.11.330.jar)
The command to be executed for S3DataStore
- java -classpath
oak-run-*.jar:aws-java-sdk-osgi-1.11.24.jar:commons-logging-1.1.3.jar \
+ java -classpath
oak-run-*.jar:aws-java-sdk-osgi-1.11.330.jar:commons-logging-1.1.3.jar \
org.apache.jackrabbit.oak.run.Main \
datastorecheck --id --ref --consistency \
--store <path>|<mongo_uri> \
Modified: jackrabbit/oak/branches/1.6/oak-run/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/pom.xml?rev=1834655&r1=1834654&r2=1834655&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-run/pom.xml Fri Jun 29 08:13:28 2018
@@ -421,15 +421,15 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-aws-ext</artifactId>
- <version>${jackrabbit.version}</version>
+ <artifactId>oak-blob-cloud</artifactId>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-blob-cloud</artifactId>
- <version>${project.version}</version>
+ <artifactId>jackrabbit-aws-ext</artifactId>
+ <version>${jackrabbit.version}</version>
<optional>true</optional>
</dependency>
