From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index a0c4c75..f1078c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,11 +224,11 @@
<version>${netty.version}</version>
</dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>${okhttp.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.squareup.okhttp3</groupId>-->
+ <!--<artifactId>okhttp</artifactId>-->
+ <!--<version>${okhttp.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>com.aliyun.oss</groupId>
@@ -276,13 +276,58 @@
<artifactId>httpmime</artifactId>
<version>4.3.5</version>
</dependency>
+ <!-- submail邮件 end -->
+
+ <dependency>
+ <groupId>ripple</groupId>
+ <artifactId>ripple</artifactId>
+ <version>0.0.1</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/ripple-core-0.0.1-SNAPSHOT.jar</systemPath>
+ </dependency>
+
+ <dependency>
+ <groupId>taobao</groupId>
+ <artifactId>taobao-sdk</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/taobao-sdk-java.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>ztron-sdk</groupId>
+ <artifactId>ztron-sdk</artifactId>
+ <version>0.0.1</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/tron-sdk.jar</systemPath>
+ </dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>13.0</version>
<scope>compile</scope>
</dependency>
- <!-- submail邮件 end -->
+ <dependency>
+ <groupId>com.github.ki5fpl.tronj</groupId>
+ <artifactId>abi</artifactId>
+ <version>0.4.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/abi-0.4.0.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.github.ki5fpl.tronj</groupId>
+ <artifactId>client</artifactId>
+ <version>0.4.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/client-0.4.0.jar</systemPath>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.ki5fpl.tronj</groupId>
+ <artifactId>utils</artifactId>
+ <version>0.4.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/utils-0.4.0.jar</systemPath>
+ </dependency>
</dependencies>
<build>
--
Gitblit v1.9.1