Upgrade project dependencies #231

fizz-bootstrap/pom.xml

@@ -17,11 +17,13 @@
     <properties>
         <java.version>1.8</java.version>
         <spring-framework.version>5.2.15.RELEASE</spring-framework.version>
-        <reactor-bom.version>Dysprosium-SR20</reactor-bom.version>
+        <spring-session-bom.version>Dragonfruit-SR3</spring-session-bom.version>
+        <reactor-bom.version>Dysprosium-SR21</reactor-bom.version>
         <lettuce.version>5.3.7.RELEASE</lettuce.version>
         <netty.version>4.1.65.Final</netty.version>
         <httpcore.version>4.4.14</httpcore.version>
-        <log4j2.version>2.13.3</log4j2.version>
+        <log4j2.version>2.14.1</log4j2.version>
+        <slf4j.version>1.7.31</slf4j.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <lombok.version>1.18.20</lombok.version>
         <apache.dubbo.version>2.7.5</apache.dubbo.version>
@@ -29,6 +31,7 @@
         <mockito.version>3.4.6</mockito.version>
         <curator.version>4.0.1</curator.version>
         <zookeeper.version>3.5.9</zookeeper.version>
+        <commons-codec.version>1.15</commons-codec.version>
     </properties>
 
     <dependencies>

fizz-common/pom.xml

@@ -58,11 +58,6 @@
             <artifactId>spring-session-data-redis</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
@@ -98,6 +93,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
     </dependencies>
 
     <repositories>

fizz-core/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-bom</artifactId>
-            <version>Dragonfruit-RELEASE</version>
+            <version>Dragonfruit-SR3</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -153,6 +153,12 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>error_prone_annotations</artifactId>
+                    <groupId>com.google.errorprone</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -253,13 +259,18 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
         </dependency>
     </dependencies>
 

fizz-plugin/pom.xml

@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-bom</artifactId>
-            <version>Dragonfruit-RELEASE</version>
+            <version>Dragonfruit-SR3</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -245,13 +245,18 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
         </dependency>
     </dependencies>
 

fizz-spring-boot-starter/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-bom</artifactId>
-            <version>Dragonfruit-RELEASE</version>
+            <version>Dragonfruit-SR3</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -227,11 +227,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
@@ -255,6 +250,16 @@
             <groupId>com.fizzgate</groupId>
             <artifactId>fizz-plugin</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

pom.xml

@@ -7,12 +7,13 @@
 		<!--<java.version>1.8</java.version>-->
 		<spring-boot.version>2.2.13.RELEASE</spring-boot.version>
 		<spring-framework.version>5.2.15.RELEASE</spring-framework.version>
-		<reactor-bom.version>Dysprosium-SR20</reactor-bom.version>
+		<reactor-bom.version>Dysprosium-SR21</reactor-bom.version>
 		<lettuce.version>5.3.7.RELEASE</lettuce.version>
 		<nacos.cloud.version>2.2.5.RELEASE</nacos.cloud.version>
 		<netty.version>4.1.65.Final</netty.version>
 		<httpcore.version>4.4.14</httpcore.version>
-		<log4j2.version>2.13.3</log4j2.version>
+		<log4j2.version>2.14.1</log4j2.version>
+		<slf4j.version>1.7.31</slf4j.version>
 		<apache.dubbo.version>2.7.5</apache.dubbo.version>
 		<grpc.version>1.16.1</grpc.version>
 		<mockito.version>3.4.6</mockito.version>
@@ -86,7 +87,7 @@
 			<dependency>
 				<groupId>org.springframework.session</groupId>
 				<artifactId>spring-session-bom</artifactId>
-				<version>Dragonfruit-RELEASE</version>
+				<version>Dragonfruit-SR3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -129,7 +130,7 @@
 			<dependency>
 				<groupId>io.projectreactor</groupId>
 				<artifactId>reactor-test</artifactId>
-				<version>3.3.17.RELEASE</version>
+				<version>3.3.18.RELEASE</version>
 				<scope>test</scope>
 			</dependency>
 
@@ -342,12 +343,6 @@
 				<scope>test</scope>
 			</dependency>
 
-			<dependency>
-				<groupId>commons-codec</groupId>
-				<artifactId>commons-codec</artifactId>
-				<version>1.15</version>
-			</dependency>
-
 			<dependency>
 				<groupId>org.bouncycastle</groupId>
 				<artifactId>bcpkix-jdk15on</artifactId>
@@ -359,6 +354,18 @@
 			    <artifactId>kxml2</artifactId>
 			    <version>2.3.0</version>
 			</dependency>
+
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>21.0</version>
+			</dependency>
+
+			<dependency>
+				<groupId>commons-codec</groupId>
+				<artifactId>commons-codec</artifactId>
+				<version>1.15</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>