Upgraded dependencies for Manta SDK and Hadoop.

Author: dekobon

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.2] - 2016-10-05
+### Changed
+ - Upgraded Java Manta SDK to 2.4.3.
+ - Upgraded Hadoop to 2.7.3.
+### Fixed
+ - Changed detection of an embedded configuration encryption key 
+   and encryption key file path detection such that embedded keys
+   will not trigger an error condition.
+
 ## [1.0.1] - 2016-06-08
 ### Added
  - We now recursively create missing paths when create() is called.

pom.xml

@@ -61,9 +61,9 @@
         <failsafe.useSystemClassLoader>true</failsafe.useSystemClassLoader>
         <!-- Dependency versions -->
         <dependency.checkstyle.version>6.17</dependency.checkstyle.version>
-        <dependency.java-manta.version>2.4.0</dependency.java-manta.version>
+        <dependency.java-manta.version>2.4.3</dependency.java-manta.version>
         <dependency.testng.version>6.9.9</dependency.testng.version>
-        <dependency.hadoop.version>2.7.2</dependency.hadoop.version>
+        <dependency.hadoop.version>2.7.3</dependency.hadoop.version>
         <dependency.mockito.version>2.0.2-beta</dependency.mockito.version>
 
         <!-- Plugin versions -->
@@ -149,7 +149,7 @@
                             <url>http://www-us.apache.org/dist/hadoop/common/hadoop-${dependency.hadoop.version}/hadoop-${dependency.hadoop.version}.tar.gz</url>
                             <unpack>true</unpack>
                             <outputDirectory>${project.build.directory}/hadoop_home</outputDirectory>
-                            <md5>c442bd89b29cab9151b5987793b94041</md5>
+                            <md5>3455bb57e4b4906bbea67b58cca78fa8</md5>
                         </configuration>
                     </execution>
                 </executions>

src/main/java/com/joyent/hadoop/fs/manta/MantaFileSystem.java

@@ -151,10 +151,21 @@ public void initialize(final URI name, final Configuration conf) throws IOExcept
         ChainedConfigContext chained = new ChainedConfigContext(
                 new EnvVarConfigContext(),
                 new MapConfigContext(System.getProperties()),
-                new HadoopConfigurationContext(conf),
-                new DefaultsConfigContext()
+                new HadoopConfigurationContext(conf)
         );
 
+        final DefaultsConfigContext defaultContext = new DefaultsConfigContext();
+
+        /* Primitive hack to keep configuration from error because private key content
+         * was set at the same time as a key path. */
+        if (chained.getPrivateKeyContent() != null) {
+            final ChainedConfigContext overwritableDefaults = new ChainedConfigContext();
+            overwritableDefaults.setMantaKeyPath(null);
+            chained.overwriteWithContext(overwritableDefaults);
+        } else {
+            chained.overwriteWithContext(defaultContext);
+        }
+
         this.config = chained;
         this.client = new MantaClient(this.config);