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
655bffb8
Commit
655bffb8
authored
Nov 30, 2016
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.5.x'
parents
4a97b385
740d2857
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
12 deletions
+10
-12
pom.xml
spring-boot-dependencies/pom.xml
+10
-0
pom.xml
spring-boot-parent/pom.xml
+0
-10
pom.xml
spring-boot-samples/pom.xml
+0
-1
pom.xml
spring-boot-samples/spring-boot-sample-custom-layout/pom.xml
+0
-1
No files found.
spring-boot-dependencies/pom.xml
View file @
655bffb8
...
@@ -2356,6 +2356,11 @@
...
@@ -2356,6 +2356,11 @@
<artifactId>
maven-eclipse-plugin
</artifactId>
<artifactId>
maven-eclipse-plugin
</artifactId>
<version>
2.10
</version>
<version>
2.10
</version>
</plugin>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-enforcer-plugin
</artifactId>
<version>
1.4
</version>
</plugin>
<plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-failsafe-plugin
</artifactId>
<artifactId>
maven-failsafe-plugin
</artifactId>
...
@@ -2366,6 +2371,11 @@
...
@@ -2366,6 +2371,11 @@
<artifactId>
maven-install-plugin
</artifactId>
<artifactId>
maven-install-plugin
</artifactId>
<version>
2.5.2
</version>
<version>
2.5.2
</version>
</plugin>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-invoker-plugin
</artifactId>
<version>
1.10
</version>
</plugin>
<plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-help-plugin
</artifactId>
<artifactId>
maven-help-plugin
</artifactId>
...
...
spring-boot-parent/pom.xml
View file @
655bffb8
...
@@ -288,16 +288,6 @@
...
@@ -288,16 +288,6 @@
</dependency>
</dependency>
</dependencies>
</dependencies>
</plugin>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-invoker-plugin
</artifactId>
<version>
1.10
</version>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-enforcer-plugin
</artifactId>
<version>
1.4
</version>
</plugin>
<plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-failsafe-plugin
</artifactId>
<artifactId>
maven-failsafe-plugin
</artifactId>
...
...
spring-boot-samples/pom.xml
View file @
655bffb8
...
@@ -153,7 +153,6 @@
...
@@ -153,7 +153,6 @@
<plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-enforcer-plugin
</artifactId>
<artifactId>
maven-enforcer-plugin
</artifactId>
<version>
1.4
</version>
<executions>
<executions>
<execution>
<execution>
<id>
enforce-rules
</id>
<id>
enforce-rules
</id>
...
...
spring-boot-samples/spring-boot-sample-custom-layout/pom.xml
View file @
655bffb8
...
@@ -41,7 +41,6 @@
...
@@ -41,7 +41,6 @@
<plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-invoker-plugin
</artifactId>
<artifactId>
maven-invoker-plugin
</artifactId>
<version>
1.10
</version>
<configuration>
<configuration>
<cloneProjectsTo>
${project.build.directory}/it
</cloneProjectsTo>
<cloneProjectsTo>
${project.build.directory}/it
</cloneProjectsTo>
<settingsFile>
src/it/settings.xml
</settingsFile>
<settingsFile>
src/it/settings.xml
</settingsFile>
...
...
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