[Update] : release 2.0.0

zhouhailin · May 30, 2023 · 88d2a50 · 88d2a50
1 parent 516c670
commit 88d2a50
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -1,16 +1,21 @@
 # FreeSWITCH ESL ALL
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/23fb13f7487f4ccd985f09c96341dfab)](https://app.codacy.com/gh/zhouhailin/freeswitch-esl-all?utm_source=github.com&utm_medium=referral&utm_content=zhouhailin/freeswitch-esl-all&utm_campaign=Badge_Grade_Settings)
-[![Jdk Version](https://img.shields.io/badge/JDK-1.8-green.svg)](https://img.shields.io/badge/JDK-1.8-green.svg)
-[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![Jdk Version](https://img.shields.io/badge/JDK-17-green.svg)](https://img.shields.io/badge/JDK-17-green.svg)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Maven Central](https://img.shields.io/maven-central/v/link.thingscloud/freeswitch-esl-all)](https://mvnrepository.com/artifact/link.thingscloud/freeswitch-esl-all)
 [![Gitter](https://badges.gitter.im/freeswitch-esl-all/community.svg)](https://gitter.im/freeswitch-esl-all/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
+## 版本说明
+
+    1.x 版本, JDK 1.8, spring boot 2.x
+    2.x 版本, JDK 17,  spring boot 3.x
+
 ## 特性
 
     1、支持连接FreeSWITCH大规模集群
     2、更易于集成使用
-    4、与spring boot 2.x深度整合，提供 starter
+    4、与spring boot 3.x深度整合，提供 starter
     5、可动态配置
 
 ## 模块说明
@@ -25,7 +30,7 @@
 
 ### 3.[freeswitch-esl-spring-boot-starter](freeswitch-esl-spring-boot-starter/README.md)
 
-    基于 Spring boot 2.3.x, freeswitch-esl 客户端(详细信息，移步至子模块）
+    基于 Spring boot 3.x.x, freeswitch-esl 客户端(详细信息，移步至子模块）
 
     application.properties
 
@@ -108,4 +113,4 @@
 
 ## LICENSE
 
-[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) Copyright (C) Apache Software Foundation
+[Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) Copyright (C) Apache Software Foundation
diff --git a/freeswitch-esl-example/README.md b/freeswitch-esl-example/README.md
@@ -1,6 +1,6 @@
 # FreeSWITCH ESL Example
 
 [![Jdk Version](https://img.shields.io/badge/JDK-1.8-green.svg)](https://img.shields.io/badge/JDK-1.8-green.svg)
-[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Maven Central](https://img.shields.io/maven-central/v/link.thingscloud/freeswitch-esl-example)](https://mvnrepository.com/artifact/link.thingscloud/freeswitch-esl-example)
 
diff --git a/freeswitch-esl-example/pom.xml b/freeswitch-esl-example/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>freeswitch-esl-all</artifactId>
         <groupId>link.thingscloud</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/freeswitch-esl-spring-boot-starter-example/README.md b/freeswitch-esl-spring-boot-starter-example/README.md
@@ -1,6 +1,6 @@
 # FreeSWITCH ESL Spring Boot Starter Example
 
 [![Jdk Version](https://img.shields.io/badge/JDK-1.8-green.svg)](https://img.shields.io/badge/JDK-1.8-green.svg)
-[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Maven Central](https://img.shields.io/maven-central/v/link.thingscloud/freeswitch-esl-spring-boot-starter-example)](https://mvnrepository.com/artifact/link.thingscloud/freeswitch-esl-spring-boot-starter-example)
 
diff --git a/freeswitch-esl-spring-boot-starter-example/pom.xml b/freeswitch-esl-spring-boot-starter-example/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>freeswitch-esl-all</artifactId>
         <groupId>link.thingscloud</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>freeswitch-esl-spring-boot-starter-example</artifactId>
@@ -40,11 +40,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>link.thingscloud</groupId>
-            <artifactId>spring-boot-common-aop</artifactId>
-            <version>1.0.0-RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>

diff --git a/...ink/thingscloud/freeswitch/esl/spring/boot/starter/example/ReScheduleEslEventHandler.java b/...ink/thingscloud/freeswitch/esl/spring/boot/starter/example/ReScheduleEslEventHandler.java
@@ -24,7 +24,6 @@
 import link.thingscloud.freeswitch.esl.spring.boot.starter.handler.AbstractEslEventHandler;
 import link.thingscloud.freeswitch.esl.transport.event.EslEvent;
 import link.thingscloud.freeswitch.esl.transport.message.EslMessage;
-import link.thingscloud.spring.boot.common.aop.Logging;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -46,7 +45,6 @@ public class ReScheduleEslEventHandler extends AbstractEslEventHandler {
     /**
      * {@inheritDoc}
      */
-    @Logging
     @Override
     public void handle(String addr, EslEvent event) {
         log.info("ReScheduleEslEventHandler handle addr[{}] EslEvent[{}].", addr, event);

diff --git a/freeswitch-esl-spring-boot-starter/README.md b/freeswitch-esl-spring-boot-starter/README.md
@@ -1,7 +1,7 @@
 # FreeSWITCH ESL Spring Boot Starter
 
 [![Jdk Version](https://img.shields.io/badge/JDK-1.8-green.svg)](https://img.shields.io/badge/JDK-1.8-green.svg)
-[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Maven Central](https://img.shields.io/maven-central/v/link.thingscloud/freeswitch-esl-spring-boot-starter)](https://mvnrepository.com/artifact/link.thingscloud/freeswitch-esl-spring-boot-starter)
 
 ## 配置

diff --git a/freeswitch-esl-spring-boot-starter/pom.xml b/freeswitch-esl-spring-boot-starter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>freeswitch-esl-all</artifactId>
         <groupId>link.thingscloud</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/freeswitch-esl-spring-boot-starter/src/main/resources/META-INF/spring.factories b/freeswitch-esl-spring-boot-starter/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+link.thingscloud.freeswitch.esl.spring.boot.starter.config.FreeswitchEslAutoConfiguration
diff --git a/freeswitch-esl/README.md b/freeswitch-esl/README.md
@@ -1,7 +1,7 @@
 # FreeSWITCH ESL
 
 [![Jdk Version](https://img.shields.io/badge/JDK-1.8-green.svg)](https://img.shields.io/badge/JDK-1.8-green.svg)
-[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Maven Central](https://img.shields.io/maven-central/v/link.thingscloud/freeswitch-esl)](https://mvnrepository.com/artifact/link.thingscloud/freeswitch-esl)
 
     FreeSWITCH Event Socket 客户端，基于 Netty 4.1.x

diff --git a/freeswitch-esl/pom.xml b/freeswitch-esl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>freeswitch-esl-all</artifactId>
         <groupId>link.thingscloud</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <groupId>link.thingscloud</groupId>
     <artifactId>freeswitch-esl-all</artifactId>
     <packaging>pom</packaging>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>2.0.0</version>
 
     <name>freeswitch-esl-all-${project.version}</name>
     <description>freeswitch event socket library on netty 4.1</description>
@@ -39,24 +39,37 @@
     </modules>
 
     <properties>
+        <java.version>17</java.version>
+
+        <netty.version>4.1.92.Final</netty.version>
+        <spring-boot.version>3.1.0</spring-boot.version>
+
+        <slf4j.version>2.0.7</slf4j.version>
+        <logback.version>1.4.7</logback.version>
+
+        <lombok.version>1.18.26</lombok.version>
+        <junit.version>4.13.2</junit.version>
+
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <netty.version>4.1.89.Final</netty.version>
-        <spring-boot.version>2.7.9</spring-boot.version>
-
-        <java.version>1.8</java.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
 
-        <!-- Compiler settings properties -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <versions-maven-plugin.version>2.15.0</versions-maven-plugin.version>
+        <git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>
+        <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
     </properties>
 
     <scm>
         <url>https://github.com/zhouhailin/freeswitch-esl-all</url>
         <connection>scm:git:https://github.com/zhouhailin/freeswitch-esl-all.git</connection>
         <developerConnection>scm:git:https://github.com/zhouhailin/freeswitch-esl-all.git</developerConnection>
-        <tag>1.7.0-SNAPSHOT</tag>
+        <tag>2.0.0</tag>
     </scm>
     <licenses>
         <license>
@@ -104,17 +117,17 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.36</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.4.5</version>
+                <version>${logback.version}</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.4.5</version>
+                <version>${logback.version}</version>
             </dependency>
 
             <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
@@ -138,13 +151,13 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -154,12 +167,12 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.7</version>
+                <version>${versions-maven-plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
@@ -169,7 +182,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>${maven-javadoc-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -204,7 +217,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
+                        <version>${maven-source-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>oss</id>
@@ -232,7 +245,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>oss</id>
@@ -246,7 +259,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.8</version>
+                        <version>1.6.13</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>oss</serverId>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		link.thingscloud.freeswitch.esl.spring.boot.starter.config.FreeswitchEslAutoConfiguration