Skip to content

Commit fe31691

Browse files
zhangxd1989zhangxd1989
committed
add spring cloud version
1 parent 6c02c48 commit fe31691

File tree

2 files changed

+3
-163
lines changed

2 files changed

+3
-163
lines changed

‎.gitignore

Lines changed: 0 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -1,156 +1,2 @@
1-
# Created by .ignore support plugin (hsz.mobi)
2-
### Java template
3-
# Compiled class file
4-
*.class
5-
6-
# Log file
7-
*.log
8-
9-
# BlueJ files
10-
*.ctxt
11-
12-
# Mobile Tools for Java (J2ME)
13-
.mtj.tmp/
14-
15-
# Package Files #
16-
*.jar
17-
*.war
18-
*.ear
19-
*.zip
20-
*.tar.gz
21-
*.rar
22-
23-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
24-
hs_err_pid*
25-
### Eclipse template
26-
27-
.metadata
28-
bin/
29-
tmp/
30-
*.tmp
31-
*.bak
32-
*.swp
33-
*~.nib
34-
local.properties
35-
.settings/
36-
.loadpath
37-
.recommenders
38-
39-
# Eclipse Core
40-
.project
41-
42-
# External tool builders
43-
.externalToolBuilders/
44-
45-
# Locally stored "Eclipse launch configurations"
46-
*.launch
47-
48-
# PyDev specific (Python IDE for Eclipse)
49-
*.pydevproject
50-
51-
# CDT-specific (C/C++ Development Tooling)
52-
.cproject
53-
54-
# JDT-specific (Eclipse Java Development Tools)
55-
.classpath
56-
57-
# Java annotation processor (APT)
58-
.factorypath
59-
60-
# PDT-specific (PHP Development Tools)
61-
.buildpath
62-
63-
# sbteclipse plugin
64-
.target
65-
66-
# Tern plugin
67-
.tern-project
68-
69-
# TeXlipse plugin
70-
.texlipse
71-
72-
# STS (Spring Tool Suite)
73-
.springBeans
74-
75-
# Code Recommenders
76-
.recommenders/
77-
78-
# Scala IDE specific (Scala & Java development for Eclipse)
79-
.cache-main
80-
.scala_dependencies
81-
.worksheet
82-
### macOS template
83-
*.DS_Store
84-
.AppleDouble
85-
.LSOverride
86-
87-
# Icon must end with two \r
88-
Icon
89-
90-
91-
# Thumbnails
92-
._*
93-
94-
# Files that might appear in the root of a volume
95-
.DocumentRevisions-V100
96-
.fseventsd
97-
.Spotlight-V100
98-
.TemporaryItems
99-
.Trashes
100-
.VolumeIcon.icns
101-
.com.apple.timemachine.donotpresent
102-
103-
# Directories potentially created on remote AFP share
104-
.AppleDB
105-
.AppleDesktop
106-
Network Trash Folder
107-
Temporary Items
108-
.apdisk
109-
### JetBrains template
110-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
111-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
112-
113-
# User-specific stuff:
114-
.idea/**/workspace.xml
115-
.idea/**/tasks.xml
116-
.idea/dictionaries
117-
118-
# Sensitive or high-churn files:
119-
.idea/**/dataSources/
120-
.idea/**/dataSources.ids
121-
.idea/**/dataSources.xml
122-
.idea/**/dataSources.local.xml
123-
.idea/**/sqlDataSources.xml
124-
.idea/**/dynamic.xml
125-
.idea/**/uiDesigner.xml
126-
127-
# Gradle:
128-
.idea/**/gradle.xml
129-
.idea/**/libraries
130-
131-
# Mongo Explorer plugin:
132-
.idea/**/mongoSettings.xml
133-
134-
## File-based project format:
135-
*.iws
136-
137-
## Plugin-specific files:
138-
139-
# IntelliJ
140-
/out/
141-
142-
# mpeltonen/sbt-idea plugin
143-
.idea_modules/
144-
145-
# JIRA plugin
146-
atlassian-ide-plugin.xml
147-
148-
# Crashlytics plugin (for Android Studio and IntelliJ)
149-
com_crashlytics_export_strings.xml
150-
crashlytics.properties
151-
crashlytics-build.properties
152-
fabric.properties
153-
154-
#customer
1551
.idea/
1562
*.iml

‎pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>1.5.2.RELEASE</version>
16+
<version>1.5.6.RELEASE</version>
1717
<relativePath/>
1818
</parent>
1919

@@ -31,10 +31,10 @@
3131
<properties>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<java.version>1.8</java.version>
34-
<docker.plugin.version>0.4.13</docker.plugin.version>
34+
<docker.plugin.version>1.0.0</docker.plugin.version>
3535
<docker.image.prefix>spring-boot-cloud</docker.image.prefix>
3636
<spring.cloud.version>Dalston.RELEASE</spring.cloud.version>
37-
<spring-boot-admin.version>1.5.0</spring-boot-admin.version>
37+
<spring-boot-admin.version>1.5.4</spring-boot-admin.version>
3838
</properties>
3939

4040
<dependencies>
@@ -46,12 +46,6 @@
4646
<groupId>org.springframework.boot</groupId>
4747
<artifactId>spring-boot-starter-test</artifactId>
4848
<scope>test</scope>
49-
<exclusions>
50-
<exclusion>
51-
<artifactId>asm</artifactId>
52-
<groupId>org.ow2.asm</groupId>
53-
</exclusion>
54-
</exclusions>
5549
</dependency>
5650
</dependencies>
5751

0 commit comments

Comments
 (0)