Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
e84f61bb
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
e84f61bb
编写于
4月 30, 2014
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Upgraded to Gradle 1.12 and updated several dependencies to latest maintenance releases
上级
adb616b6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
29 deletion
+30
-29
build.gradle
build.gradle
+28
-27
gradle/wrapper/gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.jar
+0
-0
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
未找到文件。
build.gradle
浏览文件 @
e84f61bb
...
...
@@ -20,14 +20,15 @@ configure(allprojects) { project ->
ext
.
hibVal4Version
=
"4.3.1.Final"
ext
.
hibVal5Version
=
"5.1.0.Final"
ext
.
hsqldbVersion
=
"2.3.2"
ext
.
jackson2Version
=
"2.3.
2
"
ext
.
jasperReportsVersion
=
"5.5.1"
ext
.
jackson2Version
=
"2.3.
3
"
ext
.
jasperReportsVersion
=
"5.5.1"
// 5.5.2 has an unresolvable transitive dependency
ext
.
jettyVersion
=
"9.1.4.v20140401"
ext
.
jodaVersion
=
"2.3"
ext
.
junitVersion
=
"4.11"
ext
.
slf4jVersion
=
"1.7.
6
"
ext
.
slf4jVersion
=
"1.7.
7
"
ext
.
tiles2Version
=
"2.2.2"
ext
.
tiles3Version
=
"3.0.3"
ext
.
tomcatVersion
=
"8.0.5"
ext
.
xstreamVersion
=
"1.4.7"
ext
.
gradleScriptDir
=
"${rootProject.projectDir}/gradle"
...
...
@@ -108,7 +109,6 @@ configure(allprojects) { project ->
"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/"
,
"http://ehcache.org/apidocs/"
,
"http://quartz-scheduler.org/api/2.1.7/"
,
"http://jackson.codehaus.org/1.9.4/javadoc/"
,
"http://fasterxml.github.com/jackson-core/javadoc/2.3.0/"
,
"http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/"
,
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs"
...
...
@@ -245,7 +245,7 @@ project("spring-core") {
optional
(
"org.aspectj:aspectjweaver:${aspectjVersion}"
)
optional
(
"net.sf.jopt-simple:jopt-simple:4.6"
)
optional
(
"log4j:log4j:1.2.17"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:
8.0.3
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:
${tomcatVersion}
"
)
testCompile
(
"xmlunit:xmlunit:1.5"
)
testCompile
(
"org.codehaus.woodstox:wstx-asl:3.2.7"
)
{
exclude
group:
"stax"
,
module:
"stax-api"
...
...
@@ -275,7 +275,7 @@ project("spring-beans") {
optional
(
"javax.inject:javax.inject:1"
)
optional
(
"javax.el:javax.el-api:2.2.4"
)
testCompile
(
"log4j:log4j:1.2.17"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:
8.0.0-RC10
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:
${tomcatVersion}
"
)
}
}
...
...
@@ -371,7 +371,7 @@ project("spring-context") {
optional
(
"org.aspectj:aspectjweaver:${aspectjVersion}"
)
optional
(
"org.codehaus.groovy:groovy-all:${groovyVersion}"
)
optional
(
"org.beanshell:bsh:2.0b4"
)
optional
(
"org.jruby:jruby:1.7.1
0
"
)
optional
(
"org.jruby:jruby:1.7.1
2
"
)
testCompile
(
"javax.inject:javax.inject-tck:1"
)
testCompile
(
"commons-dbcp:commons-dbcp:1.4"
)
testCompile
(
"org.slf4j:slf4j-api:${slf4jVersion}"
)
...
...
@@ -412,9 +412,9 @@ project("spring-messaging") {
testCompile
(
"org.eclipse.jetty:jetty-webapp:${jettyVersion}"
)
{
exclude
group:
"javax.servlet"
,
module:
"javax.servlet-api"
}
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:
8.0.3
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-websocket:
8.0.3
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-logging-juli:
8.0.3
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:
${tomcatVersion}
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-websocket:
${tomcatVersion}
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-logging-juli:
${tomcatVersion}
"
)
testCompile
(
"commons-dbcp:commons-dbcp:1.4"
)
testCompile
(
"log4j:log4j:1.2.17"
)
testCompile
(
"org.slf4j:slf4j-jcl:${slf4jVersion}"
)
...
...
@@ -453,8 +453,9 @@ project("spring-oxm") {
dependencies
{
compile
(
project
(
":spring-beans"
))
compile
(
project
(
":spring-core"
))
optional
(
"org.codehaus.castor:castor-xml:1.3.
2
"
)
{
optional
(
"org.codehaus.castor:castor-xml:1.3.
3
"
)
{
exclude
group:
'stax'
,
module:
'stax-api'
exclude
group:
"org.springframework"
,
module:
"spring-context"
}
optional
(
"org.apache.xmlbeans:xmlbeans:2.6.0"
)
{
exclude
group:
'stax'
,
module:
'stax-api'
...
...
@@ -504,11 +505,11 @@ project("spring-jdbc") {
compile
(
project
(
":spring-tx"
))
optional
(
project
(
":spring-context"
))
// for JndiDataSourceLookup
optional
(
"javax.transaction:javax.transaction-api:1.2"
)
optional
(
"c
3p0:c3p0:0.9.1.2
"
)
optional
(
"c
om.mchange:c3p0:0.9.2.1
"
)
optional
(
"org.hsqldb:hsqldb:${hsqldbVersion}"
)
optional
(
"com.h2database:h2:1.
0.71
"
)
optional
(
"org.apache.derby:derby:10.10.
1.1
"
)
optional
(
"org.apache.derby:derbyclient:10.10.
1.1
"
)
optional
(
"com.h2database:h2:1.
3.176
"
)
optional
(
"org.apache.derby:derby:10.10.
2.0
"
)
optional
(
"org.apache.derby:derbyclient:10.10.
2.0
"
)
}
}
...
...
@@ -523,7 +524,7 @@ project("spring-context-support") {
optional
(
project
(
":spring-tx"
))
// for Quartz support
optional
(
"javax.mail:javax.mail-api:1.4.7"
)
optional
(
"javax.cache:cache-api:1.0.0"
)
optional
(
"com.google.guava:guava:1
6.0.1
"
)
optional
(
"com.google.guava:guava:1
7.0
"
)
optional
(
"net.sf.ehcache:ehcache-core:2.6.5"
)
optional
(
"org.quartz-scheduler:quartz:2.1.7"
)
optional
(
"org.codehaus.fabric3.api:commonj:1.1.0"
)
...
...
@@ -531,7 +532,7 @@ project("spring-context-support") {
optional
(
"org.freemarker:freemarker:2.3.20"
)
optional
(
"com.lowagie:itext:2.1.7"
)
optional
(
"net.sf.jasperreports:jasperreports:$jasperReportsVersion"
)
testCompile
(
"org.apache.poi:poi:3.
9
"
)
testCompile
(
"org.apache.poi:poi:3.
10-FINAL
"
)
testCompile
(
"commons-beanutils:commons-beanutils:1.8.0"
)
// for Velocity/JasperReports
testCompile
(
"commons-digester:commons-digester:1.8.1"
)
// for Velocity/JasperReports
testCompile
(
"org.hsqldb:hsqldb:${hsqldbVersion}"
)
...
...
@@ -558,7 +559,7 @@ project("spring-web") {
optional
(
"javax.el:javax.el-api:2.2.4"
)
optional
(
"javax.faces:javax.faces-api:2.2"
)
optional
(
"aopalliance:aopalliance:1.0"
)
optional
(
"com.caucho:hessian:4.0.3
3
"
)
optional
(
"com.caucho:hessian:4.0.3
8
"
)
optional
(
"commons-fileupload:commons-fileupload:1.3.1"
)
optional
(
"org.apache.httpcomponents:httpclient:4.3.3"
)
optional
(
"org.apache.httpcomponents:httpasyncclient:4.0.1"
)
...
...
@@ -594,7 +595,7 @@ project("spring-websocket") {
optional
(
project
(
":spring-webmvc"
))
optional
(
"javax.servlet:javax.servlet-api:3.1.0"
)
optional
(
"javax.websocket:javax.websocket-api:1.0"
)
optional
(
"org.apache.tomcat:tomcat-websocket:
8.0.3
"
)
{
optional
(
"org.apache.tomcat:tomcat-websocket:
${tomcatVersion}
"
)
{
exclude
group:
"org.apache.tomcat"
,
module:
"tomcat-websocket-api"
exclude
group:
"org.apache.tomcat"
,
module:
"tomcat-servlet-api"
}
...
...
@@ -607,18 +608,18 @@ project("spring-websocket") {
exclude
group:
"javax.servlet"
,
module:
"javax.servlet"
}
optional
(
"org.eclipse.jetty.websocket:websocket-client:${jettyVersion}"
)
optional
(
"io.undertow:undertow-core:1.0.
0
.Final"
)
optional
(
"io.undertow:undertow-servlet:1.0.
0
.Final"
)
{
optional
(
"io.undertow:undertow-core:1.0.
1
.Final"
)
optional
(
"io.undertow:undertow-servlet:1.0.
1
.Final"
)
{
exclude
group:
"org.jboss.spec.javax.servlet"
,
module:
"jboss-servlet-api_3.1_spec"
exclude
group:
"org.jboss.spec.javax.annotation"
,
module:
"jboss-annotations-api_1.2_spec"
}
optional
(
"io.undertow:undertow-websockets-jsr:1.0.
0
.Final"
)
{
optional
(
"io.undertow:undertow-websockets-jsr:1.0.
1
.Final"
)
{
exclude
group:
"org.jboss.spec.javax.websocket"
,
module:
"jboss-websocket-api_1.0_spec"
}
optional
(
"com.fasterxml.jackson.core:jackson-databind:${jackson2Version}"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:
8.0.3
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-websocket:
8.0.3
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-logging-juli:
8.0.3
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-core:
${tomcatVersion}
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-websocket:
${tomcatVersion}
"
)
testCompile
(
"org.apache.tomcat.embed:tomcat-embed-logging-juli:
${tomcatVersion}
"
)
testCompile
(
"org.projectreactor:reactor-core:1.1.0.RELEASE"
)
testCompile
(
"org.projectreactor:reactor-net:1.1.0.RELEASE"
)
testCompile
(
"log4j:log4j:1.2.17"
)
...
...
@@ -701,7 +702,7 @@ project("spring-webmvc") {
optional
(
"javax.servlet.jsp:javax.servlet.jsp-api:2.2.1"
)
optional
(
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1"
)
optional
(
"net.sourceforge.jexcelapi:jxl:2.6.12"
)
optional
(
"org.apache.poi:poi:3.
9
"
)
optional
(
"org.apache.poi:poi:3.
10-FINAL
"
)
optional
(
"org.apache.velocity:velocity:1.7"
)
optional
(
"velocity-tools:velocity-tools-view:1.4"
)
optional
(
"org.freemarker:freemarker:2.3.20"
)
...
...
@@ -1178,7 +1179,7 @@ configure(rootProject) {
task
wrapper
(
type:
Wrapper
)
{
description
=
"Generates gradlew[.bat] scripts"
gradleVersion
=
"1.1
1
"
gradleVersion
=
"1.1
2
"
doLast
()
{
def
gradleOpts
=
"-XX:MaxMetaspaceSize=1024m -Xmx1024m"
...
...
gradle/wrapper/gradle-wrapper.jar
浏览文件 @
e84f61bb
此差异由.gitattributes 抑制。
gradle/wrapper/gradle-wrapper.properties
浏览文件 @
e84f61bb
#
Thu Mar 06 18:45:45 CE
T 2014
#
Wed Apr 30 13:06:57 CES
T 2014
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
http
\:
//services.gradle.org/distributions/gradle-1.11-all
.zip
distributionUrl
=
http
s
\:
//services.gradle.org/distributions/gradle-1.12-bin
.zip
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录