launchdarkly
diff --git a/‎.circleci/config.yml
+6 b/‎.circleci/config.yml
+6
diff --git a/‎.ldrelease/config.yml
+1-1 b/‎.ldrelease/config.yml
+1-1
diff --git a/‎.ldrelease/publish.sh
+6-1 b/‎.ldrelease/publish.sh
+6-1
diff --git a/‎CHANGELOG.md
+4 b/‎CHANGELOG.md
+4
diff --git a/‎build.gradle
+2-1 b/‎build.gradle
+2-1
diff --git a/‎config/checkstyle/checkstyle.xml
+1-1 b/‎config/checkstyle/checkstyle.xml
+1-1
diff --git a/‎contract-tests/service/build.gradle
+1-1 b/‎contract-tests/service/build.gradle
+1-1
diff --git a/‎contract-tests/service/src/main/java/sdktest/TestService.java
+6-1 b/‎contract-tests/service/src/main/java/sdktest/TestService.java
+6-1
diff --git a/‎gradle/wrapper/gradle-wrapper.jar
333 Bytes b/‎gradle/wrapper/gradle-wrapper.jar
333 Bytes
diff --git a/‎gradle/wrapper/gradle-wrapper.properties
+1-1 b/‎gradle/wrapper/gradle-wrapper.properties
+1-1
@@ -18,11 +18,17 @@ workflows:
           requires:
             - build-linux
       - test-linux:
+          # current LTS version
           name: Java 17 - Linux - OpenJDK
           docker-image: cimg/openjdk:17.0
           with-coverage: true
           requires:
             - build-linux
+      - test-linux:
+          name: Java 19 - Linux - OpenJDK
+          docker-image: cimg/openjdk:19.0
+          requires:
+            - build-linux
       - packaging:
           requires:
             - build-linux
 
@@ -12,7 +12,7 @@ publications:
 
 jobs:
   - docker:
-      image: gradle:6.8.3-jdk11
+      image: gradle:7.6-jdk11
     template:
       name: gradle
 
 
@@ -4,4 +4,9 @@ set -ue
 
 # Publish to Sonatype
 echo "Publishing to Sonatype"
-./gradlew publishToSonatype closeAndReleaseRepository || { echo "Gradle publish/release failed" >&2; exit 1; }
+if [[ -n "${LD_RELEASE_IS_PRERELEASE}" ]]; then
+  ./gradlew publishToSonatype || { echo "Gradle publish/release failed" >&2; exit 1; }	
+else
+  ./gradlew publishToSonatype closeAndReleaseRepository || { echo "Gradle publish/release failed" >&2; exit 1; }
+fi
+
@@ -2,6 +2,10 @@
 
 All notable changes to the LaunchDarkly Java SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [5.10.5] - 2023-01-04
+### Fixed:
+- Fixed vulnerability [CVE-2022-1471](https://nvd.nist.gov/vuln/detail/CVE-2022-1471) which could allow arbitrary code execution if using `FileDataSource` with a YAML file. (Thanks, [antonmos](https://github.com/launchdarkly/java-server-sdk/pull/289)!)
+
 ## [6.0.1] - 2022-12-20
 ### Changed:
 - The internal implementation of the SSE client for streaming updates has been revised to use a single worker thread instead of two worker threads, reducing thread contention and memory usage.
 
@@ -150,7 +150,7 @@ libraries.test = [
     "junit:junit:4.12",
     "com.fasterxml.jackson.core:jackson-core:${versions.jackson}",
     "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}",
-    "com.launchdarkly:test-helpers:1.3.0"
+    "com.launchdarkly:test-helpers:2.0.1"
 ]
 
 configurations {
@@ -173,6 +173,7 @@ dependencies {
 }
 
 checkstyle {
+    toolVersion = "9.3"
     configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")
 }
 
 
@@ -10,7 +10,7 @@
     <module name="JavadocPackage"/>    
     <module name="TreeWalker">
         <module name="JavadocMethod">
-	        <property name="scope" value="public"/>
+	        <property name="accessModifiers" value="public"/>
     	</module>
 	    <module name="JavadocType">
 	        <property name="scope" value="public"/>
 
@@ -30,7 +30,7 @@ ext.versions = [
     "gson": "2.7",
     "logback": "1.1.3",
     "okhttp": "4.5.0",
-    "testHelpers": "1.1.0",
+    "testHelpers": "2.0.1",
     "launchdarklyJavaSdkCommon": project(":sdk").versions["launchdarklyJavaSdkCommon"]
 ]
 
 
@@ -58,7 +58,7 @@ public BadRequestException(String message) {
     }
   }
 
-  public static void main(String[] args) {
+  public static void main(String[] args) throws Exception {
     // ((ch.qos.logback.classic.Logger)LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME)).setLevel(
     //     Level.valueOf(config.logLevel.toUpperCase()));
 
@@ -75,6 +75,11 @@ public static void main(String[] args) {
     server.getRecorder().setEnabled(false); // don't accumulate a request log
 
     System.out.println("Listening on port " + PORT);
+
+    // need to explicitly sleep because HttpServer now starts as a daemon thread
+    while (true) {
+      Thread.sleep(1000);
+    }
   }
 
   private Status getStatus() {
 
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ libraries.test = [`
`150`	`150`	`"junit:junit:4.12",`
`151`	`151`	`"com.fasterxml.jackson.core:jackson-core:${versions.jackson}",`
`152`	`152`	`"com.fasterxml.jackson.core:jackson-databind:${versions.jackson}",`
`153`		`- "com.launchdarkly:test-helpers:1.3.0"`
	`153`	`+ "com.launchdarkly:test-helpers:2.0.1"`
`154`	`154`	`]`
`155`	`155`
`156`	`156`	`configurations {`
`@@ -173,6 +173,7 @@ dependencies {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`checkstyle {`
	`176`	`+ toolVersion = "9.3"`
`176`	`177`	`configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")`
`177`	`178`	`}`
`178`	`179`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ ext.versions = [`
`30`	`30`	`"gson": "2.7",`
`31`	`31`	`"logback": "1.1.3",`
`32`	`32`	`"okhttp": "4.5.0",`
`33`		`- "testHelpers": "1.1.0",`
	`33`	`+ "testHelpers": "2.0.1",`
`34`	`34`	`"launchdarklyJavaSdkCommon": project(":sdk").versions["launchdarklyJavaSdkCommon"]`
`35`	`35`	`]`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public BadRequestException(String message) {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- public static void main(String[] args) {`
	`61`	`+ public static void main(String[] args) throws Exception {`
`62`	`62`	`// ((ch.qos.logback.classic.Logger)LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME)).setLevel(`
`63`	`63`	`// Level.valueOf(config.logLevel.toUpperCase()));`
`64`	`64`
`@@ -75,6 +75,11 @@ public static void main(String[] args) {`
`75`	`75`	`server.getRecorder().setEnabled(false); // don't accumulate a request log`
`76`	`76`
`77`	`77`	`System.out.println("Listening on port " + PORT);`
	`78`	`+`
	`79`	`+ // need to explicitly sleep because HttpServer now starts as a daemon thread`
	`80`	`+ while (true) {`
	`81`	`+ Thread.sleep(1000);`
	`82`	`+ }`
`78`	`83`	`}`
`79`	`84`
`80`	`85`	`private Status getStatus() {`