prepare 4.14.0 release (#192)

Author: LaunchDarklyCI

build.gradle

@@ -249,11 +249,14 @@ def shadeDependencies(jarTask) {
 }
 
 def addOsgiManifest(jarTask, List<Configuration> importConfigs, List<Configuration> exportConfigs) {
+    // For a prerelease build with "-beta", "-rc", etc., the prerelease qualifier has to be
+    // removed from the bundle version because OSGi doesn't understand it.
+    def implementationVersion = version.replaceFirst('-.*$', '')
     jarTask.manifest {
         attributes(
-            "Implementation-Version": version,
+            "Implementation-Version": implementationVersion,
             "Bundle-SymbolicName": "com.launchdarkly.client",
-            "Bundle-Version": version,
+            "Bundle-Version": implementationVersion,
             "Bundle-Name": "LaunchDarkly SDK",
             "Bundle-ManifestVersion": "2",
             "Bundle-Vendor": "LaunchDarkly"
@@ -270,7 +273,7 @@ def addOsgiManifest(jarTask, List<Configuration> importConfigs, List<Configurati
 
         // Similarly, we're adding package exports for every package in whatever libraries we're
         // making publicly available.
-        def sdkExports = getAllSdkPackages().collect { bundleExport(it, version) }
+        def sdkExports = getAllSdkPackages().collect { bundleExport(it, implementationVersion) }
         def exportedDependencies = forEachArtifactAndVisiblePackage(exportConfigs, { a, p ->
             bundleExport(p, a.moduleVersion.id.version)
         })

packaging-test/test-app/build.gradle

@@ -36,6 +36,13 @@ dependencies {
 
 jar {
     bnd(
+        // This consumer-policy directive completely turns off version checking for the test app's
+        // OSGi imports, so for instance if the app uses version 2.x of package P, the import will
+        // just be for p rather than p;version="[2.x,3)". One wouldn't normally do this, but we
+        // need to be able to run the CI tests for snapshot/beta versions, and bnd does not handle
+        // those correctly (5.0.0-beta1 will become "[5.0.0,6)" which will not work because the
+        // beta is semantically *before* 5.0.0).
+        '-consumer-policy': '',
         'Bundle-Activator': 'testapp.TestAppOsgiEntryPoint'
     )
 }

src/main/java/com/launchdarkly/client/Components.java

@@ -7,6 +7,7 @@
 import com.launchdarkly.client.integrations.PollingDataSourceBuilder;
 import com.launchdarkly.client.integrations.StreamingDataSourceBuilder;
 import com.launchdarkly.client.interfaces.DiagnosticDescription;
+import com.launchdarkly.client.interfaces.EventSender;
 import com.launchdarkly.client.interfaces.HttpAuthentication;
 import com.launchdarkly.client.interfaces.HttpConfiguration;
 import com.launchdarkly.client.interfaces.PersistentDataStoreFactory;
@@ -393,12 +394,18 @@ public EventProcessor createEventProcessor(String sdkKey, LDConfig config,
       if (config.offline || !config.deprecatedSendEvents) {
         return new NullEventProcessor();
       }
-      return new DefaultEventProcessor(sdkKey,
+      URI eventsBaseUri = config.deprecatedEventsURI == null ? LDConfig.DEFAULT_EVENTS_URI : config.deprecatedEventsURI;
+      EventSender eventSender = new DefaultEventSender.Factory().createEventSender(
+          sdkKey,
+          config.httpConfig
+          );
+      return new DefaultEventProcessor(
           config,
           new EventsConfiguration(
               config.deprecatedAllAttributesPrivate,
               config.deprecatedCapacity,
-              config.deprecatedEventsURI == null ? LDConfig.DEFAULT_EVENTS_URI : config.deprecatedEventsURI,
+              eventSender,
+              eventsBaseUri,
               config.deprecatedFlushInterval,
               config.deprecatedInlineUsersInEvents,
               config.deprecatedPrivateAttrNames,
@@ -407,7 +414,6 @@ public EventProcessor createEventProcessor(String sdkKey, LDConfig config,
               config.deprecatedUserKeysFlushInterval,
               EventProcessorBuilder.DEFAULT_DIAGNOSTIC_RECORDING_INTERVAL_SECONDS
               ),
-          config.httpConfig,
           diagnosticAccumulator
           );
     }
@@ -667,11 +673,15 @@ public EventProcessor createEventProcessor(String sdkKey, LDConfig config, Diagn
       if (config.offline) {
         return new NullEventProcessor();
       }
-      return new DefaultEventProcessor(sdkKey,
+      EventSender eventSender =
+          (eventSenderFactory == null ? new DefaultEventSender.Factory() : eventSenderFactory)
+          .createEventSender(sdkKey, config.httpConfig);
+      return new DefaultEventProcessor(
           config,
           new EventsConfiguration(
               allAttributesPrivate,
               capacity,
+              eventSender,
               baseURI == null ? LDConfig.DEFAULT_EVENTS_URI : baseURI,
               flushIntervalSeconds,
               inlineUsersInEvents,
@@ -681,7 +691,6 @@ public EventProcessor createEventProcessor(String sdkKey, LDConfig config, Diagn
               userKeysFlushIntervalSeconds,
               diagnosticRecordingIntervalSeconds
               ),
-          config.httpConfig,
           diagnosticAccumulator
           );
     }