Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
401093b4
Commit
401093b4
authored
Aug 27, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/base-modify' into base-modify
parents
921aca6c
4aa03d3b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
pom.xml
ace-common/pom.xml
+4
-4
No files found.
ace-common/pom.xml
View file @
401093b4
...
@@ -209,7 +209,7 @@
...
@@ -209,7 +209,7 @@
<artifactId>
spring-boot
</artifactId>
<artifactId>
spring-boot
</artifactId>
<version>
2.1.3.RELEASE
</version>
<version>
2.1.3.RELEASE
</version>
</dependency>
</dependency>
<!--
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
<version>
2.1.0.RELEASE
</version>
<version>
2.1.0.RELEASE
</version>
...
@@ -226,12 +226,12 @@
...
@@ -226,12 +226,12 @@
<artifactId>
feign-core
</artifactId>
<artifactId>
feign-core
</artifactId>
<version>
10.1.0
</version>
<version>
10.1.0
</version>
<scope>
compile
</scope>
<scope>
compile
</scope>
</dependency>
-->
</dependency>
<dependency>
<!--
<dependency>
<groupId>org.springframework.cloud</groupId>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<scope>compile</scope>
<scope>compile</scope>
</dependency>
</dependency>
-->
</dependencies>
</dependencies>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment