From 043383eab0b47d18821acb77ac791de620367601 Mon Sep 17 00:00:00 2001
From: Alexandre Jasmin <ajasmin@transtex-llc.com>
Date: Thu, 26 Mar 2020 22:12:45 -0400
Subject: [PATCH 1/3] Add descriptor.proto to protobuf-javalite

---
 java/lite/generate-sources-build.xml | 1 +
 java/lite/pom.xml                    | 1 +
 2 files changed, 2 insertions(+)

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..d8be4268b55b4 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -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>

From 425986f01b9fe271bcf4c634641443b060636547 Mon Sep 17 00:00:00 2001
From: Alexandre Jasmin <ajasmin@transtex-llc.com>
Date: Thu, 26 Mar 2020 22:29:06 -0400
Subject: [PATCH 2/3] Esmart version

---
 java/bom/pom.xml  | 2 +-
 java/lite/pom.xml | 2 +-
 java/pom.xml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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/pom.xml b/java/lite/pom.xml
index d8be4268b55b4..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>
diff --git a/java/pom.xml b/java/pom.xml
index f82dd0f20d5af..574fd33272661 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>

From 76656b04bb1f07b79ea68ed982153c8903b09f6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 00:12:23 +0000
Subject: [PATCH 3/3] Bump junit from 4.12 to 4.13.1 in /java

Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index 574fd33272661..d0779dedbbc27 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -75,7 +75,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.12</version>
+        <version>4.13.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>