diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index f499bd132b0bf..d74647ccd77b5 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.11.4</version>
+  <version>3.11.4-esmart</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>
diff --git a/java/lite/generate-sources-build.xml b/java/lite/generate-sources-build.xml
index 74d96a2f10538..af4dc2d5ba525 100644
--- a/java/lite/generate-sources-build.xml
+++ b/java/lite/generate-sources-build.xml
@@ -6,6 +6,7 @@
         <arg value="--proto_path=${protobuf.source.dir}"/>
         <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
+        <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/duration.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/empty.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/field_mask.proto"/>
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index 47bc1219f0c93..7e61094f2e276 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.11.4</version>
+    <version>3.11.4-esmart</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>
@@ -52,6 +52,7 @@
         <includes>
           <include>google/protobuf/any.proto</include>
           <include>google/protobuf/api.proto</include>
+          <include>google/protobuf/descriptor.proto</include>
           <include>google/protobuf/empty.proto</include>
           <include>google/protobuf/field_mask.proto</include>
           <include>google/protobuf/source_context.proto</include>
diff --git a/java/pom.xml b/java/pom.xml
index f82dd0f20d5af..6623c40315c7b 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.11.4</version>
+  <version>3.11.4-esmart</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>
@@ -93,7 +93,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>28.1-android</version>
+        <version>29.0-android</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>