From 057f980b63135e1db3512b25cb1a5c40b44c5e0a Mon Sep 17 00:00:00 2001
From: egan <egzosn@gmail.com>
Date: Sun, 10 Dec 2017 11:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.0.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pay-java-ali/pom.xml                          |  2 +-
 .../pay/ali/bean/AliTransactionType.java      |  1 -
 .../ali/before/bean/AliTransactionType.java   |  1 -
 pay-java-common/pom.xml                       |  3 +--
 pay-java-demo/pom.xml                         |  2 +-
 pay-java-fuiou/pom.xml                        |  2 +-
 pay-java-union/pom.xml                        |  2 +-
 pay-java-wx-youdian/pom.xml                   |  2 +-
 pay-java-wx/pom.xml                           |  2 +-
 pom.xml                                       | 22 ++++++++++++++-----
 10 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml
index eb98e07..33c79ec 100644
--- a/pay-java-ali/pom.xml
+++ b/pay-java-ali/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-ali</artifactId>
diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/AliTransactionType.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/AliTransactionType.java
index 57c4ea2..56f0899 100644
--- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/AliTransactionType.java
+++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/AliTransactionType.java
@@ -7,7 +7,6 @@ import com.egzosn.pay.common.bean.TransactionType;
  * <pre>
  * 说明交易类型主要用于支付接口调用参数所需
  * {@link #APP 新版app支付}
- * {@link #UNAWARE  不知道交易类型，主要用于回调通知，回调后不清楚交易类型，以此定义}
  *
  *
  *
diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/bean/AliTransactionType.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/bean/AliTransactionType.java
index f178979..0570aa3 100644
--- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/bean/AliTransactionType.java
+++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/bean/AliTransactionType.java
@@ -7,7 +7,6 @@ import com.egzosn.pay.common.bean.TransactionType;
  * <pre>
  * 说明交易类型主要用于支付接口调用参数所需
  * {@link #APP 新版app支付}
- * {@link #UNAWARE  不知道交易类型，主要用于回调通知，回调后不清楚交易类型，以此定义}
  *
  *
  *
diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml
index 7b13c1d..f4b8082 100644
--- a/pay-java-common/pom.xml
+++ b/pay-java-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -40,7 +40,6 @@
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
-            <version>3.3.0</version>
         </dependency>
 
     </dependencies>
diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml
index 43905b5..c56019a 100644
--- a/pay-java-demo/pom.xml
+++ b/pay-java-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml
index 4a5044b..2845640 100644
--- a/pay-java-fuiou/pom.xml
+++ b/pay-java-fuiou/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-fuiou</artifactId>
diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml
index 5bd46e2..b4a2ec5 100644
--- a/pay-java-union/pom.xml
+++ b/pay-java-union/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml
index 200ea43..ca009ac 100644
--- a/pay-java-wx-youdian/pom.xml
+++ b/pay-java-wx-youdian/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-wx-youdian</artifactId>
diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml
index 2fe7396..a23a015 100644
--- a/pay-java-wx/pom.xml
+++ b/pay-java-wx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-wx</artifactId>
diff --git a/pom.xml b/pom.xml
index 4ee3d9f..ed83c47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.egzosn</groupId>
     <artifactId>pay-java-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.6-SNAPSHOT</version>
 
     <name>Pay Java - Parent</name>
     <description>Pay Java Parent</description>
@@ -49,9 +49,12 @@
 
 
     <properties>
-        <httpmime.version>4.5.2</httpmime.version>
+        <pay.version>2.0.6-SNAPSHOT</pay.version>
+        <httpmime.version>4.5.4</httpmime.version>
         <log4j.version>1.2.17</log4j.version>
-        <pay.version>2.0.5-SNAPSHOT</pay.version>
+        <fastjson.version>1.2.41</fastjson.version>
+        <jdom.version>2.0.2</jdom.version>
+        <zxing.version>3.3.1</zxing.version>
     </properties>
 
 
@@ -74,7 +77,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.17</version>
+                <version>${fastjson.version}</version>
             </dependency>
 
 
@@ -88,7 +91,14 @@
             <dependency>
                 <groupId>org.jdom</groupId>
                 <artifactId>jdom</artifactId>
-                <version>2.0.2</version>
+                <version>${jdom.version}</version>
+            </dependency>
+
+
+            <dependency>
+                <groupId>com.google.zxing</groupId>
+                <artifactId>core</artifactId>
+                <version>${zxing.version}</version>
             </dependency>
 
         </dependencies>
@@ -115,7 +125,7 @@
                     <encoding>utf-8</encoding>
                 </configuration>
             </plugin>
-           <!--<plugin>
+         <!--  <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
                 <version>1.6.3</version>