|
@@ -16,9 +16,9 @@
|
|
|
</properties>
|
|
|
<repositories>
|
|
|
<repository>
|
|
|
- <id>SagaCloud</id>
|
|
|
- <name>SagaCloud</name>
|
|
|
- <url>http://47.93.33.207:8082/repository/SagaCloud/</url>
|
|
|
+ <id>persagy</id>
|
|
|
+ <name>releases Repository</name>
|
|
|
+ <url>http://47.93.132.139:8081/nexus/content/repositories/persagy/</url>
|
|
|
<snapshots>
|
|
|
<enabled>true</enabled>
|
|
|
</snapshots>
|
|
@@ -27,14 +27,15 @@
|
|
|
</releases>
|
|
|
</repository>
|
|
|
<repository>
|
|
|
- <id>persagy</id>
|
|
|
- <name>releases Repository</name>
|
|
|
- <url>http://47.93.132.139:8081/nexus/content/repositories/persagy/</url>
|
|
|
- </repository>
|
|
|
- <repository>
|
|
|
<id>integrated</id>
|
|
|
<name>releases Repository</name>
|
|
|
<url>http://47.93.132.139:8081/nexus/content/repositories/integrated/</url>
|
|
|
+ <snapshots>
|
|
|
+ <enabled>true</enabled>
|
|
|
+ </snapshots>
|
|
|
+ <releases>
|
|
|
+ <enabled>true</enabled>
|
|
|
+ </releases>
|
|
|
</repository>
|
|
|
<repository>
|
|
|
<id>Persagy</id>
|
|
@@ -52,11 +53,6 @@
|
|
|
<name>aliyun maven</name>
|
|
|
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
|
|
|
</repository>
|
|
|
- <repository>
|
|
|
- <id>spring-milestones</id>
|
|
|
- <name>Spring Milestones</name>
|
|
|
- <url>https://repo.spring.io/milestone</url>
|
|
|
- </repository>
|
|
|
</repositories>
|
|
|
<dependencies>
|
|
|
<dependency>
|
|
@@ -76,11 +72,11 @@
|
|
|
<groupId>com.persagy</groupId>
|
|
|
<artifactId>integrated-config-client</artifactId>
|
|
|
</dependency>
|
|
|
-<!-- <dependency>-->
|
|
|
-<!-- <groupId>org.springframework.boot</groupId>-->
|
|
|
-<!-- <artifactId>spring-boot-starter-test</artifactId>-->
|
|
|
-<!-- <scope>test</scope>-->
|
|
|
-<!-- </dependency>-->
|
|
|
+ <!-- <dependency>-->
|
|
|
+ <!-- <groupId>org.springframework.boot</groupId>-->
|
|
|
+ <!-- <artifactId>spring-boot-starter-test</artifactId>-->
|
|
|
+ <!-- <scope>test</scope>-->
|
|
|
+ <!-- </dependency>-->
|
|
|
|
|
|
<dependency>
|
|
|
<groupId>com.persagy</groupId>
|
|
@@ -94,6 +90,11 @@
|
|
|
</exclusions>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
+ <groupId>com.persagy</groupId>
|
|
|
+ <artifactId>fm-common</artifactId>
|
|
|
+ <version>3.0.1</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
<groupId>org.apache.velocity</groupId>
|
|
|
<artifactId>velocity-engine-core</artifactId>
|
|
|
<version>2.3</version>
|
|
@@ -162,28 +163,28 @@
|
|
|
<groupId>com.sagacloud</groupId>
|
|
|
<artifactId>zillion-util</artifactId>
|
|
|
<version>2.1.3</version>
|
|
|
- <!-- <exclusions>
|
|
|
- <exclusion>
|
|
|
- <groupId>org.apache.httpcomponents</groupId>
|
|
|
- <artifactId>httpclient</artifactId>
|
|
|
- </exclusion>
|
|
|
- <exclusion>
|
|
|
- <groupId>org.apache.httpcomponents</groupId>
|
|
|
- <artifactId>httpcore</artifactId>
|
|
|
- </exclusion>
|
|
|
- </exclusions>-->
|
|
|
+ <!-- <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>org.apache.httpcomponents</groupId>
|
|
|
+ <artifactId>httpclient</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>org.apache.httpcomponents</groupId>
|
|
|
+ <artifactId>httpcore</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>-->
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>com.sagacloud</groupId>
|
|
|
<artifactId>json-lib-zillion</artifactId>
|
|
|
<version>1.0</version>
|
|
|
<type>jar</type>
|
|
|
-<!-- <exclusions>
|
|
|
- <exclusion>
|
|
|
- <groupId>com.google.guava</groupId>
|
|
|
- <artifactId>guava</artifactId>
|
|
|
- </exclusion>
|
|
|
- </exclusions>-->
|
|
|
+ <!-- <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>com.google.guava</groupId>
|
|
|
+ <artifactId>guava</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>-->
|
|
|
</dependency>
|
|
|
<!-- 映入JSON -->
|
|
|
<dependency>
|