prepare 5.6.3 release (#248)

Author: LaunchDarklyReleaseBot

.circleci/config.yml

@@ -9,33 +9,12 @@ workflows:
       - build-linux
       - test-linux:
           name: Java 8 - Linux - OpenJDK
-          docker-image: circleci/openjdk:8
-          requires:
-            - build-linux
-      - test-linux:
-          name: Java 9 - Linux - OpenJDK
-          docker-image: circleci/openjdk:9
-          requires:
-            - build-linux
-      - test-linux:
-          name: Java 10 - Linux - OpenJDK
-          docker-image: circleci/openjdk:10
+          docker-image: cimg/openjdk:8.0
           requires:
             - build-linux
       - test-linux:
           name: Java 11 - Linux - OpenJDK
-          docker-image: circleci/openjdk:11
-          requires:
-            - build-linux
-      - test-linux:
-          name: Java 13 - Linux - OpenJDK
-          docker-image: circleci/openjdk:13-jdk-buster
-          requires:
-            - build-linux
-      - test-linux:
-          name: Java 14 - Linux - OpenJDK
-          docker-image: circleci/openjdk:14-jdk-buster
-          with-coverage: true
+          docker-image: cimg/openjdk:11.0
           requires:
             - build-linux
       - packaging:
@@ -50,7 +29,7 @@ workflows:
 jobs:
   build-linux:
     docker:
-      - image: circleci/openjdk:8u131-jdk # To match the version pre-installed in Ubuntu 16 and used by Jenkins for releasing 
+      - image: cimg/openjdk:8.0
     steps:
       - checkout
       - run: cp gradle.properties.example gradle.properties
@@ -134,7 +113,7 @@ jobs:
 
   packaging:
     docker:
-      - image: circleci/openjdk:8
+      - image: cimg/openjdk:8.0
     steps:
       - run: java -version
       - run: sudo apt-get install make -y -q
@@ -154,7 +133,7 @@ jobs:
 
   benchmarks:
     docker:
-      - image: circleci/openjdk:11
+      - image: cimg/openjdk:11.0
     steps:
       - run: java -version
       - run: sudo apt-get install make -y -q

.ldrelease/config.yml

@@ -1,3 +1,5 @@
+version: 2
+
 repo:
   public: java-server-sdk
   private: java-server-sdk-private
@@ -8,16 +10,19 @@ publications:
   - url: https://javadoc.io/doc/com.launchdarkly/launchdarkly-java-server-sdk
     description: documentation (javadoc.io)
 
-template:
-  name: gradle
+jobs:
+  - docker:
+      image: gradle:6.8.3-jdk11
+    template:
+      name: gradle
 
-releasableBranches:
+branches:
   - name: master
     description: 5.x
   - name: 4.x
 
 documentation:
-  githubPages: true
+  gitHubPages: true
 
 sdk:
   displayName: "Java"

.ldrelease/publish-docs.sh

@@ -448,7 +448,7 @@ It is now possible to inject feature flags into the client from local JSON or YA
 ## [4.0.0] - 2018-05-10
 
 ### Changed:
-- To reduce the network bandwidth used for analytics events, feature request events are now sent as counters rather than individual events, and user details are now sent only at intervals rather than in each event. These behaviors can be modified through the LaunchDarkly UI and with the new configuration option `inlineUsersInEvents`. For more details, see [Analytics Data Stream Reference](https://docs.launchdarkly.com/v2.0/docs/analytics-data-stream-reference).
+- To reduce the network bandwidth used for analytics events, feature request events are now sent as counters rather than individual events, and user details are now sent only at intervals rather than in each event. These behaviors can be modified through the LaunchDarkly UI and with the new configuration option `inlineUsersInEvents`.
 - When sending analytics events, if there is a connection error or an HTTP 5xx response, the client will try to send the events again one more time after a one-second delay.
 - The `LdClient` class is now `final`.
 
@@ -509,7 +509,7 @@ _This release was broken and should not be used._
 
 ## [2.5.0] - 2018-01-08
 ## Added
-- Support for specifying [private user attributes](https://docs.launchdarkly.com/docs/private-user-attributes) in order to prevent user attributes from being sent in analytics events back to LaunchDarkly. See the `allAttributesPrivate` and `privateAttributeNames` methods on `LDConfig.Builder` as well as the `privateX` methods on `LDUser.Builder`.
+- Support for specifying [private user attributes](https://docs.launchdarkly.com/home/users/attributes#creating-private-user-attributes) in order to prevent user attributes from being sent in analytics events back to LaunchDarkly. See the `allAttributesPrivate` and `privateAttributeNames` methods on `LDConfig.Builder` as well as the `privateX` methods on `LDUser.Builder`.
 
 ## [2.4.0] - 2017-12-20
 ## Changed

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Contributing to the LaunchDarkly Server-side SDK for Java
 
-LaunchDarkly has published an [SDK contributor's guide](https://docs.launchdarkly.com/docs/sdk-contributors-guide) that provides a detailed explanation of how our SDKs work. See below for additional information on how to contribute to this SDK.
+LaunchDarkly has published an [SDK contributor's guide](https://docs.launchdarkly.com/sdk/concepts/contributors-guide) that provides a detailed explanation of how our SDKs work. See below for additional information on how to contribute to this SDK.
 
 ## Submitting bug reports and feature requests
 

CONTRIBUTING.md

@@ -5,7 +5,7 @@
 
 ## LaunchDarkly overview
 
-[LaunchDarkly](https://www.launchdarkly.com) is a feature management platform that serves over 100 billion feature flags daily to help teams build better software, faster. [Get started](https://docs.launchdarkly.com/docs/getting-started) using LaunchDarkly today!
+[LaunchDarkly](https://www.launchdarkly.com) is a feature management platform that serves over 100 billion feature flags daily to help teams build better software, faster. [Get started](https://docs.launchdarkly.com/home/getting-started) using LaunchDarkly today!
 
 [![Twitter Follow](https://img.shields.io/twitter/follow/launchdarkly.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/intent/follow?screen_name=launchdarkly)
 
@@ -17,13 +17,13 @@ This version of the LaunchDarkly SDK works with Java 8 and above.
 
 Three variants of the SDK jar are published to Maven:
 
-* The default uberjar - this is accessible as `com.launchdarkly:launchdarkly-java-server-sdk:jar` and is the dependency used in the "[Getting started](https://docs.launchdarkly.com/docs/java-sdk-reference#section-getting-started)" section of the SDK reference guide as well as in the [`hello-java`](https://github.com/launchdarkly/hello-java) sample app. This variant contains the SDK classes, and all of the SDK's dependencies except for SLF4J, which must be provided by the host application. The bundled dependencies have shaded package names (and are not exported in OSGi), so they will not interfere with any other versions of the same packages.
+* The default uberjar - this is accessible as `com.launchdarkly:launchdarkly-java-server-sdk:jar` and is the dependency used in the "[Getting started](https://docs.launchdarkly.com/sdk/server-side/java#getting-started)" section of the SDK reference guide as well as in the [`hello-java`](https://github.com/launchdarkly/hello-java) sample app. This variant contains the SDK classes, and all of the SDK's dependencies except for SLF4J, which must be provided by the host application. The bundled dependencies have shaded package names (and are not exported in OSGi), so they will not interfere with any other versions of the same packages.
 * The extended uberjar - add `<classifier>all</classifier>` in Maven, or `:all` in Gradle. This is the same as the default uberjar except that SLF4J is also bundled, without shading (and is exported in OSGi).
 * The "thin" jar - add `<classifier>thin</classifier>` in Maven, or `:thin` in Gradle. This contains _only_ the SDK classes.
 
 ## Getting started
 
-Refer to the [SDK reference guide](https://docs.launchdarkly.com/docs/java-sdk-reference#section-getting-started) for instructions on getting started with using the SDK.
+Refer to the [SDK reference guide](https://docs.launchdarkly.com/sdk/server-side/java#getting-started) for instructions on getting started with using the SDK.
 
 ## Logging
 
@@ -62,7 +62,7 @@ We encourage pull requests and other contributions from the community. Check out
     * Gradually roll out a feature to an increasing percentage of users, and track the effect that the feature has on key metrics (for instance, how likely is a user to complete a purchase if they have feature A versus feature B?).
     * Turn off a feature that you realize is causing performance problems in production, without needing to re-deploy, or even restart the application with a changed configuration file.
     * Grant access to certain features based on user attributes, like payment plan (eg: users on the ‘gold’ plan get access to more features than users in the ‘silver’ plan). Disable parts of your application to facilitate maintenance, without taking everything offline.
-* LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Check out [our documentation](https://docs.launchdarkly.com/docs) for a complete list.
+* LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Read [our documentation](https://docs.launchdarkly.com/sdk) for a complete list.
 * Explore LaunchDarkly
     * [launchdarkly.com](https://www.launchdarkly.com/ "LaunchDarkly Main Website") for more information
     * [docs.launchdarkly.com](https://docs.launchdarkly.com/  "LaunchDarkly Documentation") for our documentation and SDK reference guides

README.md

@@ -161,7 +161,7 @@ libraries.test = [
     "ch.qos.logback:logback-classic:1.1.7",
     "com.fasterxml.jackson.core:jackson-core:${versions.jackson}",
     "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}",
-    "com.launchdarkly:test-helpers:1.0.0"
+    "com.launchdarkly:test-helpers:1.1.0"
 ]
 
 configurations {

build.gradle

@@ -15,6 +15,8 @@ SDK_VERSION=$(shell grep "version=" $(PROJECT_DIR)/gradle.properties | cut -d '=
 
 export TEMP_DIR=$(BASE_DIR)/temp
 
+JAR=$(if $(shell which jar),jar,$(JAVA_HOME)/bin/jar)
+
 LOCAL_VERSION=99.99.99-SNAPSHOT
 MAVEN_LOCAL_REPO=$(HOME)/.m2/repository
 TEMP_MAVEN_OUTPUT_DIR=$(MAVEN_LOCAL_REPO)/com/launchdarkly/launchdarkly-java-server-sdk/$(LOCAL_VERSION)
@@ -48,7 +50,7 @@ RUN_JARS_test-thin-jar=$(TEST_APP_JAR) $(SDK_THIN_JAR) \
 	$(shell ls $(TEMP_DIR)/dependencies-internal/*.jar 2>/dev/null) \
 	$(shell ls $(TEMP_DIR)/dependencies-external/*.jar 2>/dev/null)
 
-classes_prepare=echo "  checking $(1)..." && jar tf $(1) | grep '\.class$$' >$(TEMP_OUTPUT)
+classes_prepare=echo "  checking $(1)..." && $(JAR) tf $(1) | grep '\.class$$' >$(TEMP_OUTPUT)
 classes_should_contain=echo "    should contain $(2)" && grep "^$(1)/.*\.class$$" $(TEMP_OUTPUT) >/dev/null
 classes_should_not_contain=echo "    should not contain $(2)" && ! grep "^$(1)/.*\.class$$" $(TEMP_OUTPUT)
 

packaging-test/Makefile

@@ -74,7 +74,7 @@ public static DataStoreFactory inMemoryDataStore() {
    * See {@link PersistentDataStoreBuilder} for more on how this method is used.
    * <p>
    * For more information on the available persistent data store implementations, see the reference
-   * guide on <a href="https://docs.launchdarkly.com/sdk/concepts/feature-store">Using a persistent feature store</a>.
+   * guide on <a href="https://docs.launchdarkly.com/sdk/concepts/data-stores">Using a persistent feature store</a>.
    *  
    * @param storeFactory the factory/builder for the specific kind of persistent data store
    * @return a {@link PersistentDataStoreBuilder}
@@ -197,7 +197,7 @@ static PollingDataSourceBuilderImpl pollingDataSourceInternal() {
    * <p>
    * Passing this to {@link LDConfig.Builder#dataSource(DataSourceFactory)} causes the SDK
    * not to retrieve feature flag data from LaunchDarkly, regardless of any other configuration.
-   * This is normally done if you are using the <a href="https://docs.launchdarkly.com/docs/the-relay-proxy">Relay Proxy</a>
+   * This is normally done if you are using the <a href="https://docs.launchdarkly.com/home/relay-proxy">Relay Proxy</a>
    * in "daemon mode", where an external process-- the Relay Proxy-- connects to LaunchDarkly and populates
    * a persistent data store with the feature flag data. The data store could also be populated by
    * another process that is running the LaunchDarkly SDK. If there is no external process updating

src/main/java/com/launchdarkly/sdk/server/Components.java

@@ -13,6 +13,7 @@
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.util.Date;
+import java.util.Locale;
 import java.util.UUID;
 
 import static com.launchdarkly.sdk.server.Util.checkIfErrorIsRecoverableAndLog;
@@ -38,7 +39,8 @@ final class DefaultEventSender implements EventSender {
   private static final String EVENT_SCHEMA_VERSION = "3";
   private static final String EVENT_PAYLOAD_ID_HEADER = "X-LaunchDarkly-Payload-ID";
   private static final MediaType JSON_CONTENT_TYPE = MediaType.parse("application/json; charset=utf-8");
-  private static final SimpleDateFormat HTTP_DATE_FORMAT = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
+  private static final SimpleDateFormat HTTP_DATE_FORMAT = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz",
+      Locale.US); // server dates as defined by RFC-822/RFC-1123 use English day/month names
   private static final Object HTTP_DATE_FORMAT_LOCK = new Object(); // synchronize on this because DateFormat isn't thread-safe
 
   private final OkHttpClient httpClient;