Merge pull request #335 from lostsnow/release/v1.7.4

bump version to 1.7.4
HXSecurity · Jul 15, 2022 · bd56d3f · bd56d3f
2 parents 8417960 + 4e4fa37
commit bd56d3f
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 37 deletions.
diff --git a/dongtai-agent/pom.xml b/dongtai-agent/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.dongtai.iast</groupId>
         <artifactId>iast</artifactId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <artifactId>dongtai-agent</artifactId>
     <name>dongtai-agent</name>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>1.7.2</version>
+            <version>${dongtai.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>

diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/Constant.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/Constant.java
@@ -4,7 +4,7 @@
  * @author [email protected]
  */
 public class Constant {
-    public static final String AGENT_VERSION_VALUE = "v1.7.2";
+    public static final String AGENT_VERSION_VALUE = "v1.7.4";
     public static final String LANGUAGE = "JAVA";
 
     public final static String API_AGENT_REGISTER = "/api/v1/agent/register";

diff --git a/dongtai-agent/src/main/resources/iast.properties b/dongtai-agent/src/main/resources/iast.properties
@@ -1,6 +1,6 @@
-iast.name=dongtai-Enterprise 1.7.2
+iast.name=dongtai-Enterprise 1.7.4
 iast.response.name=dongtai
-iast.response.value=1.7.2
+iast.response.value=1.7.4
 iast.server.url=https://iast.io/openapi
 iast.server.token=39133a96f5735c253edd908078846c1051824edc
 iast.allhook.enable=false

diff --git a/dongtai-agent/src/main/resources/iast.properties.example b/dongtai-agent/src/main/resources/iast.properties.example
@@ -1,7 +1,7 @@
 # iast.properties file example
-iast.name=dongtai-Enterprise 1.7.2
+iast.name=dongtai-Enterprise 1.7.4
 iast.response.name=dongtai
-iast.response.value=1.7.2
+iast.response.value=1.7.4
 iast.server.url=https://iast.io/openapi
 iast.server.token=39133a96f5735c253edd908078846c1051824edc
 iast.allhook.enable=false

diff --git a/dongtai-api/pom.xml b/dongtai-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>cn.huoxian.iast</groupId>
             <artifactId>dongtai-spring-api</artifactId>
-            <version>1.7.2</version>
+            <version>${dongtai.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>1.7.2</version>
+            <version>${dongtai.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/dongtai-api/src/main/java/io/dongtai/api/jakarta/JakartaResponseWrapper.java b/dongtai-api/src/main/java/io/dongtai/api/jakarta/JakartaResponseWrapper.java
@@ -9,9 +9,7 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author owefsad
@@ -23,7 +21,7 @@ public class JakartaResponseWrapper extends HttpServletResponseWrapper implement
 
     public JakartaResponseWrapper(HttpServletResponse response) {
         super(response);
-        response.addHeader("DongTai", "v1.7.2");
+        response.addHeader("DongTai", "v1.7.4");
     }
 
     @Override

diff --git a/dongtai-api/src/main/java/io/dongtai/api/servlet2/ServletResponseWrapper.java b/dongtai-api/src/main/java/io/dongtai/api/servlet2/ServletResponseWrapper.java
@@ -6,12 +6,8 @@
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.io.*;
+import java.util.*;
 
 public class ServletResponseWrapper extends HttpServletResponseWrapper implements DongTaiResponse {
 
@@ -21,7 +17,7 @@ public class ServletResponseWrapper extends HttpServletResponseWrapper implement
 
     public ServletResponseWrapper(HttpServletResponse response) {
         super(response);
-        response.addHeader("DongTai", "v1.7.2");
+        response.addHeader("DongTai", "v1.7.4");
     }
 
     private String getLine() {

diff --git a/dongtai-common/pom.xml b/dongtai-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dongtai-core/pom.xml b/dongtai-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.dongtai.iast</groupId>
         <artifactId>iast</artifactId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <artifactId>dongtai-core</artifactId>
     <name>dongtai-core</name>
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-spy</artifactId>
-            <version>1.7.2</version>
+            <version>${dongtai.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -224,7 +224,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>1.7.2</version>
+            <version>${dongtai.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>

diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/utils/Constants.java b/dongtai-core/src/main/java/io/dongtai/iast/core/utils/Constants.java
@@ -4,7 +4,7 @@
  * @author [email protected]
  */
 public class Constants {
-    public static final String AGENT_VERSION_VALUE = "v1.7.2";
+    public static final String AGENT_VERSION_VALUE = "v1.7.4";
     public final static String API_REPORT_UPLOAD = "/api/v1/report/upload";
     public final static String SERVER_ADDRESS = "/api/v1/agent/update";
     public final static String API_HOOK_PROFILE = "/api/v1/profiles";

diff --git a/dongtai-log/pom.xml b/dongtai-log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dongtai-plugins/dongtai-grpc/pom.xml b/dongtai-plugins/dongtai-grpc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dongtai-plugins</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dongtai-plugins/pom.xml b/dongtai-plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-core</artifactId>
-            <version>1.7.2</version>
+            <version>${dongtai.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/dongtai-spring-api/pom.xml b/dongtai-spring-api/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.huoxian.iast</groupId>
     <artifactId>dongtai-spring-api</artifactId>
-    <version>1.7.2</version>
+    <version>1.7.4</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>1.7.2</version>
+            <version>${dongtai.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/dongtai-spy/pom.xml b/dongtai-spy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -17,6 +17,7 @@
         <sun.tools.systempath>${java.home}/../lib/tools.jar</sun.tools.systempath>
         <nanoxml.version>2.2.3</nanoxml.version>
 
+        <dongtai.version>1.7.4</dongtai.version>
         <!-- java 1.6 最高可用版本-->
         <logback-classic.version>1.2.1</logback-classic.version>
         <commons-lang3.version>3.4</commons-lang3.version>
@@ -41,7 +42,7 @@
 
     <groupId>io.dongtai.iast</groupId>
     <artifactId>iast</artifactId>
-    <version>1.7.2</version>
+    <version>1.7.4</version>
     <packaging>pom</packaging>
 
     <name>dongtai-agent-java</name>
@@ -118,12 +119,12 @@
             <dependency>
                 <groupId>io.dongtai.iast</groupId>
                 <artifactId>dongtai-spy</artifactId>
-                <version>1.7.2</version>
+                <version>${dongtai.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.dongtai.iast</groupId>
                 <artifactId>dongtai-core</artifactId>
-                <version>1.7.2</version>
+                <version>${dongtai.version}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>