AWS SDK for Java 1.11.394

.travis.yml

@@ -7,16 +7,13 @@ addons:
 jdk:
   - openjdk7
   - oraclejdk7
-  - openjdk6
   - oraclejdk8
 env:
   - MODULES_TO_SKIP=\!aws-java-sdk-osgi MAVEN_OPTS=-XX:MaxPermSize=256m
   - MODULES_TO_SKIP=\!aws-java-sdk-osgi,\!aws-java-sdk-code-generator,\!aws-java-sdk-codegen-maven-plugin,\!aws-java-sdk-opensdk MAVEN_OPTS=-XX:MaxPermSize=256m
 # Exclude certain items in the matrix as some modules only build with Java8
 matrix:
   exclude:
-    - jdk: openjdk6
-      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi MAVEN_OPTS=-XX:MaxPermSize=256m
     - jdk: openjdk7
       env: MODULES_TO_SKIP=\!aws-java-sdk-osgi MAVEN_OPTS=-XX:MaxPermSize=256m
     - jdk: oraclejdk7
@@ -30,4 +27,4 @@ notifications:
 install: /bin/true
 sudo: required
 dist: precise
-script: mvn install -pl ${MODULES_TO_SKIP}
+script: mvn install -Dhttps.protocols=TLSv1.2 -pl ${MODULES_TO_SKIP}

CHANGELOG.md

@@ -1,3 +1,28 @@
+# __1.11.394__ __2018-08-23__
+## __AWS Elemental MediaLive__
+  - ### Features
+    - Adds two APIs for working with Channel Schedules: BatchUpdateSchedule and DescribeSchedule. These APIs allow scheduling actions for SCTE-35 message insertion and for static image overlays.
+
+## __AWS IoT__
+  - ### Features
+    - This release adds support for IoT Thing Group Indexing and Searching functionality.
+
+## __AWS IoT Analytics__
+  - ### Features
+    - AWS IoT Analytics announces three new features:  (1) Bring Your Custom Container - import your custom authored code containers. (2) Automate Container Execution - lets you automate the execution of containers hosting custom authored analytical code or Jupyter Notebooks to perform continuous analysis. (3) Incremental Data Capture with Customizable Time Windows - enables users to perform analysis on new incremental data captured since the last analysis.
+
+## __AWS SDK for Java__
+  - ### Features
+    - Add support for setting the protocol/scheme to use when connecting to a proxy via `ClientConfiguration#withProxyProtocol`; previously the client always used `http`. This allows customers to connect to an HTTP proxy over TLS if the proxy supports it. Fixes [#1709](https://github.com/aws/aws-sdk-java/issues/1709)
+
+## __Amazon Lex Model Building Service__
+  - ### Features
+    - Amazon Lex builds bot in two stages. After the first it sets status to READY_BASIC_TESTING. In this state the bot will match user inputs that exactly match the utterances configured for the bot's intents and values in the slot types. 
+
+## __Amazon Rekognition__
+  - ### Features
+    - This release introduces a new API called DescribeCollection to Amazon Rekognition.  You can use DescribeCollection to get information about an existing face collection. Given the ID for a face collection, DescribeCollection returns the following information: the number of faces indexed into the collection, the version of the face detection model used by the collection, the Amazon Resource Name (ARN) of the collection and the creation date/time of the collection.
+
 # __1.11.393__ __2018-08-22__
 ## __Amazon Import/Export Snowball__
   - ### Features

README.md

@@ -45,7 +45,7 @@ dependencies.
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-bom</artifactId>
-      <version>1.11.393</version>
+      <version>1.11.394</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

aws-java-sdk-acm/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-acm</artifactId>

aws-java-sdk-acmpca/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-acmpca</artifactId>

aws-java-sdk-alexaforbusiness/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-alexaforbusiness</artifactId>

aws-java-sdk-api-gateway/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-api-gateway</artifactId>

aws-java-sdk-applicationautoscaling/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-applicationautoscaling</artifactId>

aws-java-sdk-appstream/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-appstream</artifactId>

aws-java-sdk-appsync/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-appsync</artifactId>

aws-java-sdk-athena/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-athena</artifactId>

aws-java-sdk-autoscaling/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-autoscaling</artifactId>

aws-java-sdk-autoscalingplans/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-autoscalingplans</artifactId>

aws-java-sdk-batch/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-batch</artifactId>

aws-java-sdk-bom/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-bom</artifactId>

aws-java-sdk-budgets/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-budgets</artifactId>

aws-java-sdk-bundle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-pom</artifactId>
-        <version>1.11.394-SNAPSHOT</version>
+        <version>1.11.394</version>
     </parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-bundle</artifactId>
@@ -24,7 +24,7 @@
         <artifactId>aws-java-sdk</artifactId>
         <groupId>com.amazonaws</groupId>
         <optional>false</optional>
-        <version>1.11.394-SNAPSHOT</version>
+        <version>1.11.394</version>
     </dependency>
 </dependencies>
 

aws-java-sdk-cloud9/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloud9</artifactId>

aws-java-sdk-clouddirectory/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-clouddirectory</artifactId>

aws-java-sdk-cloudformation/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudformation</artifactId>

aws-java-sdk-cloudfront/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudfront</artifactId>

aws-java-sdk-cloudhsm/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudhsm</artifactId>

aws-java-sdk-cloudhsmv2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudhsmv2</artifactId>

aws-java-sdk-cloudsearch/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudsearch</artifactId>

aws-java-sdk-cloudtrail/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudtrail</artifactId>

aws-java-sdk-cloudwatch/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudwatch</artifactId>

aws-java-sdk-cloudwatchmetrics/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>

aws-java-sdk-code-generator/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-code-generator</artifactId>

aws-java-sdk-code-generator/src/main/resources/templates/common/SyncClientBuilder.ftl

@@ -8,6 +8,8 @@ import com.amazonaws.SdkClientException;
 import com.amazonaws.annotation.NotThreadSafe;
 import com.amazonaws.client.builder.AwsSyncClientBuilder;
 import com.amazonaws.client.AwsSyncClientParams;
+import com.amazonaws.endpointdiscovery.EndpointDiscoveryProviderChain;
+import com.amazonaws.endpointdiscovery.DefaultEndpointDiscoveryProviderChain;
 
 /**
  * Fluent builder for {@link ${metadata.packageName + "." + metadata.syncInterface}}. Use of the
@@ -21,7 +23,10 @@ public final class ${metadata.syncClientBuilderClassName}
     private static final ClientConfigurationFactory CLIENT_CONFIG_FACTORY = new ${clientConfigFactory}();
 
     <#if endpointOperation?has_content>
+    private static final EndpointDiscoveryProviderChain DEFAULT_ENDPOINT_DISCOVERY_PROVIDER = new DefaultEndpointDiscoveryProviderChain();
+
     private boolean endpointDiscoveryEnabled = true;
+    private boolean endpointDiscoveryDisabled = false;
     </#if>
 
     /**
@@ -52,7 +57,7 @@ public final class ${metadata.syncClientBuilderClassName}
 
     <#if endpointOperation?has_content>
     public ${metadata.syncClientBuilderClassName} disableEndpointDiscovery() {
-        this.endpointDiscoveryEnabled = false;
+        this.endpointDiscoveryDisabled = true;
         return this;
     }
     </#if>
@@ -66,7 +71,10 @@ public final class ${metadata.syncClientBuilderClassName}
     @Override
     protected ${metadata.syncInterface} build(AwsSyncClientParams params) {
         <#if endpointOperation?has_content>
-         if (endpointDiscoveryEnabled && getEndpoint() == null) {
+        if (getEndpoint() != null || endpointDiscoveryDisabled) {
+            return new ${metadata.syncClient}(params);
+        }
+        if (endpointDiscoveryEnabled || DEFAULT_ENDPOINT_DISCOVERY_PROVIDER.endpointDiscoveryEnabled()) {
             return new ${metadata.syncClient}(params, endpointDiscoveryEnabled);
         }
         </#if>

aws-java-sdk-code-generator/src/main/resources/templates/endpoint-discovery/Cache.ftl

@@ -1,7 +1,7 @@
 ${fileHeader}
 package ${metadata.packageName}.endpointdiscovery;
 
-import com.amazonaws.cache.EndpointDiscoveryRefreshCache;
+import com.amazonaws.endpointdiscovery.EndpointDiscoveryRefreshCache;
 import com.amazonaws.endpointdiscovery.Constants;
 import ${metadata.packageName}.${metadata.syncInterface};
 import org.apache.commons.logging.Log;

aws-java-sdk-codebuild/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codebuild</artifactId>

aws-java-sdk-codecommit/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codecommit</artifactId>

aws-java-sdk-codedeploy/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codedeploy</artifactId>

aws-java-sdk-codegen-maven-plugin/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codegen-maven-plugin</artifactId>

aws-java-sdk-codepipeline/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codepipeline</artifactId>

aws-java-sdk-codestar/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.394-SNAPSHOT</version>
+    <version>1.11.394</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codestar</artifactId>