Skip to content

Commit 9e8fb51

Browse files
RaysmondRaysmond
committed
Update spring boot to version 1.5.9-RELEASE
1 parent 03168e6 commit 9e8fb51

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+398
-534
lines changed

‎build.gradle‎

Lines changed: 29 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'java'
22
apply plugin: 'idea'
33
apply plugin: 'eclipse'
4-
apply plugin: 'spring-boot'
4+
apply plugin: 'org.springframework.boot'
55

6+
group = 'com.raysmond.blog'
7+
version = '0.0.1-SNAPSHOT'
68
sourceCompatibility = 1.8
7-
targetCompatibility = 1.8
8-
9-
version = '0.1'
109

1110
repositories {
1211
mavenLocal()
@@ -21,37 +20,28 @@ bootRun {
2120
systemProperties = System.properties
2221
}
2322

24-
configurations {
25-
compile.exclude module: "spring-boot-starter-tomcat"
26-
all*.exclude module: 'spring-boot-starter-logging'
23+
buildscript {
24+
ext {
25+
springBootVersion = '1.5.9.RELEASE'
26+
}
27+
repositories {
28+
mavenLocal()
29+
jcenter()
30+
mavenCentral()
31+
}
32+
dependencies {
33+
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
34+
}
2735
}
2836

2937
dependencies {
3038
// spring boot
31-
compile "org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE"
32-
compile "org.springframework.boot:spring-boot-starter-jetty:1.4.0.RELEASE"
33-
compile "org.springframework.boot:spring-boot-starter-thymeleaf:1.4.0.RELEASE"
39+
compile "org.springframework.boot:spring-boot-starter-web"
40+
compile "org.springframework.boot:spring-boot-starter-thymeleaf"
3441
compile "com.domingosuarez.boot:spring-boot-starter-jade4j:0.3.1"
35-
compile "org.springframework.boot:spring-boot-starter-redis:1.4.0.RELEASE"
36-
compile(group: 'org.springframework.boot', name: 'spring-boot-starter', version:'1.4.0.RELEASE') {
37-
exclude(module: 'spring-boot-starter-logging')
38-
}
39-
compile 'org.springframework.boot:spring-boot-starter-log4j:1.3.7.RELEASE'
40-
compile 'org.springframework.boot:spring-boot-starter-data-jpa:1.4.0.RELEASE'
41-
compile 'org.springframework.boot:spring-boot-starter-security:1.4.0.RELEASE'
42-
43-
// spring framework
44-
compile 'org.springframework:spring-context:4.2.7.RELEASE'
45-
compile 'org.springframework:spring-webmvc:4.2.7.RELEASE'
46-
compile 'org.springframework.security:spring-security-config:3.2.7.RELEASE'
47-
compile 'org.springframework.security:spring-security-web:3.2.7.RELEASE'
48-
49-
//persistence
50-
compile 'com.zaxxer:HikariCP:+'
51-
compile 'org.springframework:spring-orm:4.2.7.RELEASE'
52-
compile 'org.hibernate:hibernate-entitymanager:4.3.11.Final'
53-
compile 'javax.el:javax.el-api:+'
54-
compile 'org.hsqldb:hsqldb:+'
42+
compile "org.springframework.boot:spring-boot-starter-redis:1.4.7.RELEASE"
43+
compile 'org.springframework.boot:spring-boot-starter-data-jpa'
44+
compile 'org.springframework.boot:spring-boot-starter-security'
5545

5646
// view
5747
compile 'de.neuland-bfi:spring-jade4j:0.4.2'
@@ -61,35 +51,21 @@ dependencies {
6151
compile 'org.python:jython-standalone:2.7.0'
6252
compile 'org.pygments:pygments:2.0.2'
6353

64-
// spring data
65-
compile 'org.springframework.data:spring-data-jpa:1.10.0.RELEASE'
66-
67-
// cache
68-
compile 'org.springframework.data:spring-data-redis:1.7.0.RELEASE'
69-
compile 'redis.clients:jedis:2.7.3'
70-
71-
// MySQL
54+
// mysql/hibernate
7255
compile 'mysql:mysql-connector-java:+'
73-
74-
// Validation
75-
compile 'org.hibernate:hibernate-validator:4.3.2.Final'
76-
77-
// Logging
78-
compile 'ch.qos.logback:logback-classic:1.1.3'
79-
compile 'org.slf4j:slf4j-api:+'
80-
compile 'org.apache.commons:commons-lang3:+'
81-
82-
// @Inject
83-
compile 'javax.inject:javax.inject:+'
56+
compile "org.hibernate:hibernate-core:5.2.12.Final"
57+
compile "org.hibernate:hibernate-entitymanager:5.2.12.Final"
58+
compile "org.hibernate:hibernate-validator"
8459

8560
// JSON
8661
compile 'com.fasterxml.jackson.core:jackson-databind:2.4.1.3'
8762
compile 'com.fasterxml.jackson.core:jackson-annotations:2.4.1'
8863

8964
// Utilities
9065
compile 'com.google.guava:guava:+'
91-
compile 'org.modelmapper:modelmapper:0.7.5'
92-
compile 'org.projectlombok:lombok:1.16.6'
66+
compile 'org.modelmapper:modelmapper:+'
67+
compile 'org.projectlombok:lombok:+'
68+
compile 'org.apache.commons:commons-lang3:+'
9369
//compile 'com.qiniu:qiniu-java-sdk:7.0.+'
9470

9571
// static resources, ref. http://www.webjars.org/
@@ -99,34 +75,8 @@ dependencies {
9975
compile 'org.webjars:ace:1.2.0'
10076

10177
// test
102-
testCompile("org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE")
10378
testCompile 'junit:junit:+'
104-
testCompile 'org.mockito:mockito-core:+'
105-
testCompile 'org.assertj:assertj-core:+'
106-
testCompile 'org.hamcrest:hamcrest-core:+'
107-
testCompile 'org.hamcrest:hamcrest-library:+'
108-
testCompile 'org.objenesis:objenesis:+'
109-
testCompile 'org.springframework:spring-test:+'
110-
79+
testCompile('org.springframework.boot:spring-boot-starter-test')
80+
testCompile('org.springframework.security:spring-security-test')
11181
}
11282

113-
114-
buildscript {
115-
ext {
116-
springBootVersion = '1.2.6.RELEASE'
117-
}
118-
119-
repositories {
120-
mavenLocal()
121-
jcenter()
122-
mavenCentral()
123-
124-
maven { url "http://repo.spring.io/release" }
125-
maven { url "http://repo.spring.io/milestone" }
126-
// maven { url "http://repo.spring.io/snapshot" }
127-
}
128-
129-
dependencies {
130-
classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
131-
}
132-
}

‎gradle/wrapper/gradle-wrapper.jar‎

1.05 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Sep 27 13:55:48 CST 2015
1+
#Thu Jan 18 22:04:34 CST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip

‎gradlew‎

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
50-
# Attempt to set APP_HOME
51-
# Resolve links: $0 may be a link
52-
PRG="$0"
53-
# Need this for relative symlinks.
54-
while [ -h "$PRG" ] ; do
55-
ls=`ls -ld "$PRG"`
56-
link=`expr "$ls" : '.*-> \(.*\)$'`
57-
if expr "$link" : '/.*' > /dev/null; then
58-
PRG="$link"
59-
else
60-
PRG=`dirname "$PRG"`"/$link"
61-
fi
62-
done
63-
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
65-
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
67-
6867
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6968

7069
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
9089
fi
9190

9291
# Increase the maximum file descriptors if we can.
93-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
9493
MAX_FD_LIMIT=`ulimit -H -n`
9594
if [ $? -eq 0 ] ; then
9695
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
114113
if $cygwin ; then
115114
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116115
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117117

118118
# We build the pattern for arguments to be converted via cygpath
119119
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save ( ) {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
160161
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
163171

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

‎gradlew.bat‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1411
set DIRNAME=%~dp0
1512
if "%DIRNAME%" == "" set DIRNAME=.
1613
set APP_BASE_NAME=%~n0
1714
set APP_HOME=%DIRNAME%
1815

16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

@@ -46,10 +46,9 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5352

5453
:win9xME_args
5554
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
6059
if "x%~1" == "x" goto execute
6160

6261
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6862

6963
:execute
7064
@rem Setup the command line

‎src/main/java/com/raysmond/blog/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.raysmond.blog;
22

33
/**
4-
* @author: Raysmond<i@raysmond.com>
4+
* @author: Raysmond
55
*/
66
public final class Constants {
77

0 commit comments

Comments
 (0)