Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
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
DEMO
spring-boot
Commits
ccf9b1b9
Commit
ccf9b1b9
authored
Aug 13, 2019
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.1.x'
Closes gh-17854
parents
463f9493
7aea432e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
pom.xml
spring-boot-project/spring-boot-dependencies/pom.xml
+6
-0
pom.xml
spring-boot-project/spring-boot-parent/pom.xml
+0
-6
No files found.
spring-boot-project/spring-boot-dependencies/pom.xml
View file @
ccf9b1b9
...
...
@@ -53,6 +53,7 @@
<commons-pool2.version>
2.7.0
</commons-pool2.version>
<couchbase-client.version>
2.7.9
</couchbase-client.version>
<couchbase-cache-client.version>
2.1.0
</couchbase-cache-client.version>
<dependency-management-plugin.version>
1.0.8.RELEASE
</dependency-management-plugin.version>
<derby.version>
10.14.2.0
</derby.version>
<dropwizard-metrics.version>
4.1.0
</dropwizard-metrics.version>
<ehcache.version>
2.10.6
</ehcache.version>
...
...
@@ -1158,6 +1159,11 @@
<artifactId>
jest
</artifactId>
<version>
${jest.version}
</version>
</dependency>
<dependency>
<groupId>
io.spring.gradle
</groupId>
<artifactId>
dependency-management-plugin
</artifactId>
<version>
${dependency-management-plugin.version}
</version>
</dependency>
<dependency>
<groupId>
io.undertow
</groupId>
<artifactId>
undertow-core
</artifactId>
...
...
spring-boot-project/spring-boot-parent/pom.xml
View file @
ccf9b1b9
...
...
@@ -28,7 +28,6 @@
<spock.version>
1.0-groovy-2.4
</spock.version>
<testcontainers.version>
1.10.6
</testcontainers.version>
<testng.version>
6.14.3
</testng.version>
<dependency-management-plugin.version>
1.0.8.RELEASE
</dependency-management-plugin.version>
<spring-doc-resources.version>
0.1.2.RELEASE
</spring-doc-resources.version>
</properties>
<scm>
...
...
@@ -80,11 +79,6 @@
<artifactId>
android-json
</artifactId>
<version>
0.0.20131108.vaadin1
</version>
</dependency>
<dependency>
<groupId>
io.spring.gradle
</groupId>
<artifactId>
dependency-management-plugin
</artifactId>
<version>
${dependency-management-plugin.version}
</version>
</dependency>
<dependency>
<groupId>
jline
</groupId>
<artifactId>
jline
</artifactId>
...
...
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