diff --git a/build.gradle b/build.gradle
index 7e198783..3762584f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ subprojects {
 		testImplementation "org.springframework:spring-test:${springVersion}"
 
 		// Forcing Spring to use logback instead of commons-logging
-		testImplementation "ch.qos.logback:logback-classic:1.5.19"
+		testImplementation "ch.qos.logback:logback-classic:1.5.21"
 		testImplementation 'org.slf4j:jcl-over-slf4j:2.0.17'
 		testImplementation 'org.slf4j:slf4j-api:2.0.17'
 	}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java
index f77b102b..1be2869e 100644
--- a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java
+++ b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java
@@ -22,7 +22,10 @@
  * Generates Entity Services model artifacts based on model definitions. This is implemented as a command, though it's
  * not likely to be invoked as part of e.g. an "mlDeploy" call in ml-gradle. But implementing it as a command does
  * allow for that possibility, and it's also easy to invoke by itself in ml-gradle too.
+ *
+ * @deprecated since 6.2.0
  */
+@Deprecated
 public class GenerateModelArtifactsCommand extends AbstractCommand {
 
 	// Should be very rare to need to override this, but just in case
diff --git a/ml-app-deployer/src/test/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsTest.java b/ml-app-deployer/src/test/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsTest.java
index f8bb01d4..fd6f9947 100644
--- a/ml-app-deployer/src/test/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsTest.java
+++ b/ml-app-deployer/src/test/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsTest.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@Deprecated
 public class GenerateModelArtifactsTest extends AbstractAppDeployerTest {
 
 	@AfterEach
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/CodeGenerationRequest.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/CodeGenerationRequest.java
index 52d94b7d..50a318d4 100644
--- a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/CodeGenerationRequest.java
+++ b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/CodeGenerationRequest.java
@@ -3,6 +3,10 @@
  */
 package com.marklogic.client.ext.es;
 
+/**
+ * @deprecated since 6.2.0
+ */
+@Deprecated
 public class CodeGenerationRequest {
 
 	private boolean generateDatabaseProperties = true;
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/EntityServicesManager.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/EntityServicesManager.java
index 58d7c36a..9a3d5569 100644
--- a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/EntityServicesManager.java
+++ b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/EntityServicesManager.java
@@ -16,7 +16,9 @@
 
 /**
  * Handles loading a model and then making calls to generate code for it.
+ * @deprecated since 6.2.0
  */
+@Deprecated
 public class EntityServicesManager {
 
 	private String modelCollection = "http://marklogic.com/entity-services/models";
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/GeneratedCode.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/GeneratedCode.java
index 48cfc302..10883879 100644
--- a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/GeneratedCode.java
+++ b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/es/GeneratedCode.java
@@ -3,6 +3,10 @@
  */
 package com.marklogic.client.ext.es;
 
+/**
+ * @deprecated since 6.2.0
+ */
+@Deprecated
 public class GeneratedCode {
 
 	private String title;
diff --git a/ml-javaclient-util/src/test/java/com/marklogic/client/ext/es/EntityServicesTest.java b/ml-javaclient-util/src/test/java/com/marklogic/client/ext/es/EntityServicesTest.java
index cc249cc6..e9675ef4 100644
--- a/ml-javaclient-util/src/test/java/com/marklogic/client/ext/es/EntityServicesTest.java
+++ b/ml-javaclient-util/src/test/java/com/marklogic/client/ext/es/EntityServicesTest.java
@@ -12,6 +12,7 @@
 /**
  * Tests against the default Documents database. Doesn't clear it out before or after.
  */
+@Deprecated
 public class EntityServicesTest extends AbstractIntegrationTest {
 
 	private final static String MODEL = "{\n" +