launchdarkly · LaunchDarklyCI · Apr 22, 2020 · Mar 13, 2019 · Mar 21, 2019 · Mar 21, 2019
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id "java-library"
     id "checkstyle"
     id "signing"
-    id "com.github.johnrengelman.shadow" version "4.0.4"
+    id "com.github.johnrengelman.shadow" version "5.2.0"
     id "maven-publish"
     id "de.marcphilipp.nexus-publish" version "0.3.0"
     id "io.codearte.nexus-staging" version "0.21.2"
@@ -38,13 +38,13 @@ configurations.all {
 allprojects {
     group = 'com.launchdarkly'
     version = "${version}"
+    archivesBaseName = 'launchdarkly-java-server-sdk'
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 }
 
 ext {
     sdkBasePackage = "com.launchdarkly.client"
-    sdkBaseName = "launchdarkly-java-server-sdk"
 
     // List any packages here that should be included in OSGi imports for the SDK, if they cannot
     // be discovered by looking in our explicit dependencies.
@@ -53,23 +53,34 @@ ext {
 
 ext.libraries = [:]
 
+ext.versions = [
+    "commonsCodec": "1.10",
+    "gson": "2.7",
+    "guava": "19.0",
+    "jodaTime": "2.9.3",
+    "okhttpEventsource": "1.11.0",
+    "slf4j": "1.7.21",
+    "snakeyaml": "1.19",
+    "jedis": "2.9.0"
+]
+
 // Add dependencies to "libraries.internal" that are not exposed in our public API. These
 // will be completely omitted from the "thin" jar, and will be embedded with shaded names
 // in the other two SDK jars.
 libraries.internal = [
-    "commons-codec:commons-codec:1.10",
-    "com.google.guava:guava:19.0",
-    "joda-time:joda-time:2.9.3",
-    "com.launchdarkly:okhttp-eventsource:1.10.2",
-    "org.yaml:snakeyaml:1.19",
-    "redis.clients:jedis:2.9.0"
+    "commons-codec:commons-codec:${versions.commonsCodec}",
+    "com.google.guava:guava:${versions.guava}",
+    "joda-time:joda-time:${versions.jodaTime}",
+    "com.launchdarkly:okhttp-eventsource:${versions.okhttpEventsource}",
+    "org.yaml:snakeyaml:${versions.snakeyaml}",
+    "redis.clients:jedis:${versions.jedis}"
 ]
 
 // Add dependencies to "libraries.external" that are exposed in our public API, or that have
 // global state that must be shared between the SDK and the caller.
 libraries.external = [
-    "com.google.code.gson:gson:2.7",
-    "org.slf4j:slf4j-api:1.7.21"
+    "com.google.code.gson:gson:${versions.gson}",
+    "org.slf4j:slf4j-api:${versions.slf4j}"
 ]
 
 // Add dependencies to "libraries.test" that are used only in unit tests.
@@ -84,25 +95,26 @@ libraries.test = [
 
 dependencies {
     implementation libraries.internal
-    compileClasspath libraries.external
-    runtime libraries.internal, libraries.external
+    api libraries.external
     testImplementation libraries.test, libraries.internal, libraries.external
 
     // Unlike what the name might suggest, the "shadow" configuration specifies dependencies that
     // should *not* be shaded by the Shadow plugin when we build our shaded jars.
     shadow libraries.external
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.10.2'
+configurations {
+    // We need to define "internal" as a custom configuration that contains the same things as
+    // "implementation", because "implementation" has special behavior in Gradle that prevents us
+    // from referencing it the way we do in shadeDependencies().
+    internal.extendsFrom implementation
 }
 
 checkstyle {
 	configFile file("${project.rootDir}/checkstyle.xml")
 }
 
 jar {
-    baseName = sdkBaseName
     // thin classifier means that the non-shaded non-fat jar is still available
     // but is opt-in since users will have to specify it.
     classifier = 'thin'
@@ -118,8 +130,6 @@ jar {
 // This builds the default uberjar that contains all of our dependencies except Gson and
 // SLF4j, in shaded form. The user is expected to provide Gson and SLF4j.
 shadowJar {
-    baseName = sdkBaseName
-
     // No classifier means that the shaded jar becomes the default artifact
     classifier = ''
 
@@ -141,12 +151,11 @@ shadowJar {
 // This builds the "-all"/"fat" jar, which is the same as the default uberjar except that
 // Gson and SLF4j are bundled and exposed (unshaded).
 task shadowJarAll(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
-    baseName = sdkBaseName
     classifier = 'all'
     group = "shadow"
     description = "Builds a Shaded fat jar including SLF4J"
     from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)
-    configurations = [project.configurations.runtime]
+    configurations = [project.configurations.runtimeClasspath]
     exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA')
 
     // doFirst causes the following steps to be run during Gradle's execution phase rather than the
@@ -228,7 +237,7 @@ def shadeDependencies(jarTask) {
     def excludePackages = getAllSdkPackages() +
         configurations.shadow.collectMany { getPackagesInDependencyJar(it)}
     def topLevelPackages =
-        configurations.runtime.collectMany {
+        configurations.internal.collectMany {
             getPackagesInDependencyJar(it).collect { it.contains(".") ? it.substring(0, it.indexOf(".")) : it }
         }.
             unique()
@@ -325,7 +334,6 @@ test {
 idea {
     module {
         downloadJavadoc = true
-
         downloadSources = true
     }
 }
@@ -367,7 +375,6 @@ publishing {
         shadow(MavenPublication) { publication ->
             project.shadow.component(publication)
 
-            artifactId = sdkBaseName
             artifact jar
             artifact sourcesJar
             artifact javadocJar
@@ -422,7 +429,7 @@ tasks.withType(Sign) {
 // dependencies of the SDK, so they can be put on the classpath as needed during tests.
 task exportDependencies(type: Copy, dependsOn: compileJava) {
     into "packaging-test/temp/dependencies-all"
-    from configurations.runtime.resolvedConfiguration.resolvedArtifacts.collect { it.file }
+    from configurations.runtimeClasspath.resolvedConfiguration.resolvedArtifacts.collect { it.file }
 }
 
 gitPublish {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,8 @@
-version=4.12.1
+version=4.12.2
 # The following empty ossrh properties are used by LaunchDarkly's internal integration testing framework
 # and should not be needed for typical development purposes (including by third-party developers).
 ossrhUsername=
 ossrhPassword=
+
+# See https://github.com/gradle/gradle/issues/11308 regarding the following property
+systemProp.org.gradle.internal.publish.checksums.insecure=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
diff --git a/packaging-test/Makefile b/packaging-test/Makefile
@@ -18,39 +18,31 @@ SDK_DEFAULT_JAR=$(SDK_JARS_DIR)/launchdarkly-java-server-sdk-$(SDK_VERSION).jar
 SDK_ALL_JAR=$(SDK_JARS_DIR)/launchdarkly-java-server-sdk-$(SDK_VERSION)-all.jar
 SDK_THIN_JAR=$(SDK_JARS_DIR)/launchdarkly-java-server-sdk-$(SDK_VERSION)-thin.jar
 
-TEMP_DIR=$(BASE_DIR)/temp
-TEMP_OUTPUT=$(TEMP_DIR)/test.out
+export TEMP_DIR=$(BASE_DIR)/temp
+export TEMP_OUTPUT=$(TEMP_DIR)/test.out
 
 # Build product of the project in ./test-app; can be run as either a regular app or an OSGi bundle
 TEST_APP_JAR=$(TEMP_DIR)/test-app.jar
 
-# SLF4j implementation - we need to download this separately because it's not in the SDK dependencies
-SLF4J_SIMPLE_JAR=$(TEMP_DIR)/test-slf4j-simple.jar
-SLF4J_SIMPLE_JAR_URL=https://oss.sonatype.org/content/groups/public/org/slf4j/slf4j-simple/1.7.21/slf4j-simple-1.7.21.jar
-
 # Felix OSGi container
-FELIX_ARCHIVE=org.apache.felix.main.distribution-6.0.3.tar.gz
-FELIX_ARCHIVE_URL=http://mirrors.ibiblio.org/apache//felix/$(FELIX_ARCHIVE)
-FELIX_DIR=$(TEMP_DIR)/felix
-FELIX_JAR=$(FELIX_DIR)/bin/felix.jar
-TEMP_BUNDLE_DIR=$(TEMP_DIR)/bundles
+export FELIX_DIR=$(TEMP_DIR)/felix
+export FELIX_JAR=$(FELIX_DIR)/lib/felix.jar
+export FELIX_BASE_BUNDLE_DIR=$(FELIX_DIR)/base-bundles
+export TEMP_BUNDLE_DIR=$(FELIX_DIR)/app-bundles
 
 # Lists of jars to use as a classpath (for the non-OSGi runtime test) or to install as bundles (for
 # the OSGi test). Note that we're assuming that all of the SDK's dependencies have built-in support
 # for OSGi, which is currently true; if that weren't true, we would have to do something different
 # to put them on the system classpath in the OSGi test.
-RUN_JARS_test-all-jar=$(TEST_APP_JAR) $(SDK_ALL_JAR) \
-	$(SLF4J_SIMPLE_JAR)
+RUN_JARS_test-all-jar=$(TEST_APP_JAR) $(SDK_ALL_JAR)
 RUN_JARS_test-default-jar=$(TEST_APP_JAR) $(SDK_DEFAULT_JAR) \
-	$(shell ls $(TEMP_DIR)/dependencies-external/*.jar) \
-	$(SLF4J_SIMPLE_JAR)
+	$(shell ls $(TEMP_DIR)/dependencies-external/*.jar)
 RUN_JARS_test-thin-jar=$(TEST_APP_JAR) $(SDK_THIN_JAR) \
 	$(shell ls $(TEMP_DIR)/dependencies-internal/*.jar) \
-	$(shell ls $(TEMP_DIR)/dependencies-external/*.jar) \
-	$(SLF4J_SIMPLE_JAR)
+	$(shell ls $(TEMP_DIR)/dependencies-external/*.jar)
 
 # The test-app displays this message on success
-SUCCESS_MESSAGE="@@@ successfully created LD client @@@"
+export SUCCESS_MESSAGE=@@@ successfully created LD client @@@
 
 classes_prepare=echo "  checking $(1)..." && jar tf $(1) | grep '\.class$$' >$(TEMP_OUTPUT)
 classes_should_contain=echo "    should contain $(2)" && grep $(1) $(TEMP_OUTPUT) >/dev/null
@@ -73,21 +65,12 @@ clean:
 # SECONDEXPANSION is needed so we can use "$@" inside a variable in the prerequisite list of the test targets
 .SECONDEXPANSION:
 
-test-all-jar test-default-jar test-thin-jar: $$(RUN_JARS_$$@) $(TEST_APP_JAR) $(FELIX_JAR) get-sdk-dependencies $$@-classes
+test-all-jar test-default-jar test-thin-jar: $$@-classes get-sdk-dependencies $$(RUN_JARS_$$@) $(TEST_APP_JAR) $(FELIX_DIR)
 	@$(call caption,$@)
-	@echo "  non-OSGi runtime test"
-	@java -classpath $(shell echo "$(RUN_JARS_$@)" | sed -e 's/ /:/g') testapp.TestApp | tee $(TEMP_OUTPUT)
-	@grep $(SUCCESS_MESSAGE) $(TEMP_OUTPUT) >/dev/null
+	./run-non-osgi-test.sh $(RUN_JARS_$@)
 # Can't currently run the OSGi test for the thin jar, because some of our dependencies aren't available as OSGi bundles.
 	@if [ "$@" != "test-thin-jar" ]; then \
-	  echo ""; \
-	  echo "  OSGi runtime test"; \
-	  rm -rf $(TEMP_BUNDLE_DIR); \
-	  mkdir -p $(TEMP_BUNDLE_DIR); \
-	  cp $(RUN_JARS_$@) $(FELIX_DIR)/bundle/*.jar $(TEMP_BUNDLE_DIR); \
-	  rm -rf $(FELIX_DIR)/felix-cache; \
-	  cd $(FELIX_DIR) && echo "sleep 3;exit 0" | java -jar $(FELIX_JAR) -b $(TEMP_BUNDLE_DIR) | tee $(TEMP_OUTPUT); \
-	  grep $(SUCCESS_MESSAGE) $(TEMP_OUTPUT) >/dev/null; \
+	  ./run-osgi-test.sh $(RUN_JARS_$@); \
 	fi
 
 test-all-jar-classes: $(SDK_ALL_JAR) $(TEMP_DIR)
@@ -144,13 +127,21 @@ $(TEMP_DIR)/dependencies-internal: $(TEMP_DIR)/dependencies-all
 	cp $(TEMP_DIR)/dependencies-all/*.jar $@
 	rm $@/gson*.jar $@/slf4j*.jar
 
-$(SLF4J_SIMPLE_JAR): | $(TEMP_DIR)
-	curl -f -L $(SLF4J_SIMPLE_JAR_URL) >$@
-
-$(FELIX_JAR): | $(TEMP_DIR)
-	curl -f -L $(FELIX_ARCHIVE_URL) >$(TEMP_DIR)/$(FELIX_ARCHIVE)
-	cd $(TEMP_DIR) && tar xfz $(FELIX_ARCHIVE) && rm $(FELIX_ARCHIVE)
-	cd $(TEMP_DIR) && mv `ls -d felix*` felix
+$(FELIX_JAR): $(FELIX_DIR)
+
+$(FELIX_DIR):
+	mkdir -p $(FELIX_DIR)
+	mkdir -p $(FELIX_DIR)/lib
+	mkdir -p $(FELIX_BASE_BUNDLE_DIR)
+	cd test-app && ../../gradlew createOsgi
+	@# createOsgi is a target provided by the osgi-run Gradle plugin; it downloads the Felix container and
+	@# puts it in build/osgi along with related bundles and a config file.
+	cp -r test-app/build/osgi/conf $(FELIX_DIR)
+	echo "felix.shutdown.hook=false" >>$(FELIX_DIR)/conf/config.properties
+	@# setting felix.shutdown.hook to false allows our test app to use System.exit()
+	cp test-app/build/osgi/system-libs/org.apache.felix.main-*.jar $(FELIX_JAR)
+	cp test-app/build/osgi/bundle/* $(FELIX_BASE_BUNDLE_DIR)
+	cd $(FELIX_BASE_BUNDLE_DIR) && rm -f launchdarkly-*.jar gson-*.jar
 
 $(TEMP_DIR):
 	[ -d $@ ] || mkdir -p $@
diff --git a/packaging-test/run-non-osgi-test.sh b/packaging-test/run-non-osgi-test.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo ""
+echo "  non-OSGi runtime test"
+java -classpath $(echo "$@" | sed -e 's/ /:/g') testapp.TestApp | tee ${TEMP_OUTPUT}
+grep "${SUCCESS_MESSAGE}" ${TEMP_OUTPUT} >/dev/null
diff --git a/packaging-test/run-osgi-test.sh b/packaging-test/run-osgi-test.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+echo ""
+echo "  OSGi runtime test"
+rm -rf ${TEMP_BUNDLE_DIR}
+mkdir -p ${TEMP_BUNDLE_DIR}
+cp $@ ${FELIX_BASE_BUNDLE_DIR}/* ${TEMP_BUNDLE_DIR}
+rm -rf ${FELIX_DIR}/felix-cache
+rm -f ${TEMP_OUTPUT}
+touch ${TEMP_OUTPUT}
+
+cd ${FELIX_DIR} && java -jar ${FELIX_JAR} -b ${TEMP_BUNDLE_DIR} | tee ${TEMP_OUTPUT}
+
+grep "${SUCCESS_MESSAGE}" ${TEMP_OUTPUT} >/dev/null
diff --git a/packaging-test/test-app/build.gradle b/packaging-test/test-app/build.gradle
@@ -1,5 +1,17 @@
-apply plugin: "java"
-apply plugin: "osgi"
+
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+
+plugins {
+    id "java"
+    id "java-library"
+    id "biz.aQute.bnd.builder" version "5.0.1"
+    id "com.athaydes.osgi-run" version "1.6.0"
+}
 
 repositories {
     mavenCentral()
@@ -8,32 +20,26 @@ repositories {
 allprojects {
     group = "com.launchdarkly"
     version = "1.0.0"
+    archivesBaseName = 'test-app-bundle'
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 }
 
 dependencies {
     // Note, the SDK build must have already been run before this, since we're using its product as a dependency
-    compileClasspath fileTree(dir: "../../build/libs", include: "launchdarkly-java-server-sdk-*-thin.jar")
-    compileClasspath "com.google.code.gson:gson:2.7"
-    compileClasspath "org.slf4j:slf4j-api:1.7.21"
-    compileClasspath "org.osgi:osgi_R4_core:1.0"
+    implementation fileTree(dir: "../../build/libs", include: "launchdarkly-java-server-sdk-*-thin.jar")
+    implementation "com.google.code.gson:gson:2.7"
+    implementation "org.slf4j:slf4j-api:1.7.22"
+    implementation "org.osgi:osgi_R4_core:1.0"
+    osgiRuntime "org.slf4j:slf4j-simple:1.7.22"
 }
 
 jar {
-    baseName = 'test-app-bundle'
-    manifest {
-        instruction 'Bundle-Activator', 'testapp.TestAppOsgiEntryPoint'
-    }
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.10.2'
+    bnd(
+        'Bundle-Activator': 'testapp.TestAppOsgiEntryPoint'
+    )
 }
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-    }
+runOsgi {
+    bundles = [ ]  // we don't need a CLI or anything like that - just the SLF4j dependency shown above
 }
diff --git a/packaging-test/test-app/settings.gradle b/packaging-test/test-app/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'test-app-bundle'
diff --git a/packaging-test/test-app/src/main/java/testapp/TestAppOsgiEntryPoint.java b/packaging-test/test-app/src/main/java/testapp/TestAppOsgiEntryPoint.java
@@ -8,9 +8,10 @@ public void start(BundleContext context) throws Exception {
     System.out.println("@@@ starting test bundle @@@");
 
     TestApp.main(new String[0]);
+
+    System.exit(0);
   }
 
   public void stop(BundleContext context) throws Exception {
-    System.out.println("@@@ stopping test bundle @@@");
   }
 }