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
401fcbea
Commit
401fcbea
authored
May 30, 2018
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.5.x' into 2.0.x
parents
587df6a0
2bfcefa4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
0 deletions
+22
-0
pom.xml
spring-boot-project/spring-boot-parent/pom.xml
+4
-0
pom.xml
spring-boot-samples/pom.xml
+18
-0
No files found.
spring-boot-project/spring-boot-parent/pom.xml
View file @
401fcbea
...
@@ -581,6 +581,9 @@
...
@@ -581,6 +581,9 @@
<executions>
<executions>
<execution>
<execution>
<phase>
validate
</phase>
<phase>
validate
</phase>
<configuration>
<skip>
${disable.checks}
</skip>
</configuration>
<goals>
<goals>
<goal>
validate
</goal>
<goal>
validate
</goal>
</goals>
</goals>
...
@@ -595,6 +598,7 @@
...
@@ -595,6 +598,7 @@
<id>
checkstyle-validation
</id>
<id>
checkstyle-validation
</id>
<phase>
validate
</phase>
<phase>
validate
</phase>
<configuration>
<configuration>
<skip>
${disable.checks}
</skip>
<configLocation>
src/checkstyle/checkstyle.xml
</configLocation>
<configLocation>
src/checkstyle/checkstyle.xml
</configLocation>
<suppressionsLocation>
src/checkstyle/checkstyle-suppressions.xml
</suppressionsLocation>
<suppressionsLocation>
src/checkstyle/checkstyle-suppressions.xml
</suppressionsLocation>
<includeTestSourceDirectory>
true
</includeTestSourceDirectory>
<includeTestSourceDirectory>
true
</includeTestSourceDirectory>
...
...
spring-boot-samples/pom.xml
View file @
401fcbea
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<main.basedir>
${basedir}/..
</main.basedir>
<main.basedir>
${basedir}/..
</main.basedir>
<java.version>
1.8
</java.version>
<java.version>
1.8
</java.version>
<spring-javaformat.version>
0.0.2
</spring-javaformat.version>
<spring-javaformat.version>
0.0.2
</spring-javaformat.version>
<disable.checks>
false
</disable.checks>
</properties>
</properties>
<modules>
<modules>
<module>
spring-boot-sample-ant
</module>
<module>
spring-boot-sample-ant
</module>
...
@@ -182,6 +183,9 @@
...
@@ -182,6 +183,9 @@
<executions>
<executions>
<execution>
<execution>
<phase>
validate
</phase>
<phase>
validate
</phase>
<configuration>
<skip>
${disable.checks}
</skip>
</configuration>
<goals>
<goals>
<goal>
validate
</goal>
<goal>
validate
</goal>
</goals>
</goals>
...
@@ -209,6 +213,7 @@
...
@@ -209,6 +213,7 @@
<id>
checkstyle-validation
</id>
<id>
checkstyle-validation
</id>
<phase>
validate
</phase>
<phase>
validate
</phase>
<configuration>
<configuration>
<skip>
${disable.checks}
</skip>
<configLocation>
../spring-boot-parent/src/checkstyle/checkstyle.xml
</configLocation>
<configLocation>
../spring-boot-parent/src/checkstyle/checkstyle.xml
</configLocation>
<suppressionsLocation>
../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
</suppressionsLocation>
<suppressionsLocation>
../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
</suppressionsLocation>
<includeTestSourceDirectory>
true
</includeTestSourceDirectory>
<includeTestSourceDirectory>
true
</includeTestSourceDirectory>
...
@@ -275,4 +280,17 @@
...
@@ -275,4 +280,17 @@
</plugin>
</plugin>
</plugins>
</plugins>
</build>
</build>
<profiles>
<profile>
<id>
fast
</id>
<activation>
<property>
<name>
fast
</name>
</property>
</activation>
<properties>
<disable.checks>
true
</disable.checks>
</properties>
</profile>
</profiles>
</project>
</project>
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