From 38252de0560aae6ebdb70598c13063d88279ebf7 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Fri, 18 Nov 2022 19:46:15 +0800
Subject: [PATCH] feat:modify version of jdk.

---
 .github/workflows/codecov17.yml               |  2 +-
 .github/workflows/junit_test17.yml            |  2 +-
 pom.xml                                       | 36 ++++++-------------
 .../endpoint/PolarisRouterEndpointTest.java   |  2 +-
 spring-cloud-tencent-dependencies/pom.xml     | 32 ++---------------
 .../discovery-caller-service/pom.xml          |  4 ---
 6 files changed, 17 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/codecov17.yml b/.github/workflows/codecov17.yml
index 12b4d35ab..f64edc5a0 100644
--- a/.github/workflows/codecov17.yml
+++ b/.github/workflows/codecov17.yml
@@ -1,4 +1,4 @@
-name: Codecov
+name: Codecov 2022.0
 
 on:
   push:
diff --git a/.github/workflows/junit_test17.yml b/.github/workflows/junit_test17.yml
index 5a7b6d747..31e9e6549 100644
--- a/.github/workflows/junit_test17.yml
+++ b/.github/workflows/junit_test17.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Test with Junit
+name: Test with Junit 2022.0
 
 on:
   push:
diff --git a/pom.xml b/pom.xml
index 144cebd70..4743c94e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,9 +102,6 @@
 
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.8</jacoco.version>
-		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
-		<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
-		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 
 		<!--  Checkstyle      -->
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
@@ -163,24 +160,16 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-<!--			<plugin>-->
-<!--				<groupId>org.apache.maven.plugins</groupId>-->
-<!--				<artifactId>maven-checkstyle-plugin</artifactId>-->
-<!--				<executions>-->
-<!--					<execution>-->
-<!--						<id>checkstyle-validation</id>-->
-<!--						<phase>none</phase>-->
-<!--					</execution>-->
-<!--				</executions>-->
-<!--			</plugin>-->
+			<!--			<plugin>-->
+			<!--				<groupId>org.apache.maven.plugins</groupId>-->
+			<!--				<artifactId>maven-checkstyle-plugin</artifactId>-->
+			<!--			</plugin>-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<inherited>true</inherited>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<parameters>true</parameters>
+					<release>17</release>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -188,12 +177,12 @@
 				<artifactId>jacoco-maven-plugin</artifactId>
 				<version>${jacoco.version}</version>
 				<executions>
-					<execution>
-						<id>jacoco-initialize</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
+					<!--					<execution>-->
+					<!--						<id>jacoco-initialize</id>-->
+					<!--						<goals>-->
+					<!--							<goal>prepare-agent</goal>-->
+					<!--						</goals>-->
+					<!--					</execution>-->
 					<execution>
 						<id>jacoco-site</id>
 						<phase>test</phase>
@@ -222,7 +211,6 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
-				<version>${flatten-maven-plugin.version}</version>
 				<configuration>
 					<updatePomFile>true</updatePomFile>
 					<flattenMode>resolveCiFriendliesOnly</flattenMode>
@@ -277,7 +265,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>${maven-source-plugin.version}</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -291,7 +278,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>${maven-gpg-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpointTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpointTest.java
index e400013c1..eee88fb3d 100644
--- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpointTest.java
+++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpointTest.java
@@ -101,7 +101,7 @@ public class PolarisRouterEndpointTest {
 		Map<String, Object> actuator = polarisRouterEndpoint.router(testDestService);
 
 		Assert.assertNotNull(actuator.get("routerRules"));
-		Assert.assertEquals(1, ((List) actuator.get("routerRules")).size());
+		Assert.assertEquals(1, ((List<?>) actuator.get("routerRules")).size());
 	}
 
 	@Test
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index e17d5130d..8480d8ea7 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -74,16 +74,10 @@
 
 		<!-- Dependencies -->
 		<polaris.version>1.9.1</polaris.version>
-		<guava.version>31.0.1-jre</guava.version>
-		<logback.version>1.4.4</logback.version>
-		<mocktio.version>4.5.1</mocktio.version>
-		<byte-buddy.version>1.12.10</byte-buddy.version>
+		<guava.version>31.1-jre</guava.version>
+		<mocktio.version>4.9.0</mocktio.version>
+		<byte-buddy.version>1.12.19</byte-buddy.version>
 		<protobuf-java.version>3.16.1</protobuf-java.version>
-		<bcprov-jdk15on.version>1.69</bcprov-jdk15on.version>
-
-		<!-- Maven Plugin Versions -->
-		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
-		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -204,30 +198,12 @@
 				</exclusions>
 			</dependency>
 
-			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-core</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-classic</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-
 			<dependency>
 				<groupId>com.google.protobuf</groupId>
 				<artifactId>protobuf-java</artifactId>
 				<version>${protobuf-java.version}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>org.bouncycastle</groupId>
-				<artifactId>bcprov-jdk15on</artifactId>
-				<version>${bcprov-jdk15on.version}</version>
-			</dependency>
-
 			<dependency>
 				<groupId>net.bytebuddy</groupId>
 				<artifactId>byte-buddy</artifactId>
@@ -300,7 +276,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>${maven-source-plugin.version}</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -314,7 +289,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>${maven-gpg-plugin.version}</version>
 						<executions>
 							<execution>
 								<phase>verify</phase>
diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml
index 27d228ee1..4df32aa8d 100644
--- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml
+++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml
@@ -13,10 +13,6 @@
 	<artifactId>discovery-caller-service</artifactId>
 	<name>Polaris Discovery Caller Service</name>
 
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>com.tencent.cloud</groupId>