Merge branch 'master' into add-dependabot

Author: yeikel

.gitignore

@@ -7,4 +7,5 @@ dependency-reduced-pom.xml
 .settings/
 .checkstyle
 .classpath
-.project
+.project
+.java-version

canteen/canteen-maven-plugin/pom.xml

@@ -24,25 +24,25 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.3.9</version>
+            <version>3.8.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.0</version>
+            <version>3.8.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-shared-utils</artifactId>
-            <version>3.0.0</version>
+            <version>3.3.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.4</version>
+            <version>3.6.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

contrib/pom.xml

@@ -61,13 +61,13 @@
         <!-- Dependency Versions -->
         <grpc.version>1.24.0</grpc.version>
         <protoc.version>3.9.1</protoc.version> <!-- Same version as grpc-proto -->
-        <slf4j.version>1.7.21</slf4j.version>
+        <slf4j.version>1.7.32</slf4j.version>
         <gson.version>2.7</gson.version> <!-- Same version as grpc-proto -->
         <mustache-java.version>0.9.4</mustache-java.version>
-        <spring.version>4.2.0.RELEASE</spring.version>
+        <spring.version>4.3.30.RELEASE</spring.version>
 
         <!-- Test Dependency Versions -->
-        <junit.version>4.13.1</junit.version>
+        <junit.version>4.13.2</junit.version>
         <assertj.version>3.6.2</assertj.version>
         <commons-lang.version>2.6</commons-lang.version>
         <awaitility.version>2.0.0</awaitility.version>

jprotoc/jprotoc-test/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>jprotoc-parent</artifactId>
         <groupId>com.salesforce.servicelibs</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jprotoc/jprotoc/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>jprotoc-parent</artifactId>
         <groupId>com.salesforce.servicelibs</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jprotoc/pom.xml

@@ -14,7 +14,7 @@
     <groupId>com.salesforce.servicelibs</groupId>
     <artifactId>jprotoc-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
 
     <name>jProtoc</name>
     <description>A library for writing protobuf plugins in Java</description>
@@ -60,7 +60,7 @@
         <!-- Dependency Versions -->
         <protoc.version>3.15.8</protoc.version>
         <gson.version>2.8.9</gson.version>
-        <mustache-java.version>0.9.4</mustache-java.version>
+        <mustache-java.version>0.9.10</mustache-java.version>
 
         <!-- Test Dependency Versions -->
         <contrib.version>0.8.1</contrib.version>