Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
2411b657
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 搜索 >>
提交
2411b657
编写于
9月 30, 2019
作者:
F
François Guillot
提交者:
Stephane Nicoll
11月 04, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix spring-core jar task 'up-to-date'-ness
See gh-23729
上级
f746e9df
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
46 deletion
+31
-46
spring-core/kotlin-coroutines/kotlin-coroutines.gradle
spring-core/kotlin-coroutines/kotlin-coroutines.gradle
+11
-0
spring-core/spring-core.gradle
spring-core/spring-core.gradle
+20
-46
未找到文件。
spring-core/kotlin-coroutines/kotlin-coroutines.gradle
浏览文件 @
2411b657
...
...
@@ -2,6 +2,17 @@ description = "Spring Core Coroutines support"
apply
plugin:
"kotlin"
configurations
{
classesOnlyElements
{
canBeConsumed
=
true
canBeResolved
=
false
}
}
artifacts
{
classesOnlyElements
(
compileKotlin
.
destinationDir
)
}
dependencies
{
compile
(
"org.jetbrains.kotlin:kotlin-reflect"
)
compile
(
"org.jetbrains.kotlin:kotlin-stdlib"
)
...
...
spring-core/spring-core.gradle
浏览文件 @
2411b657
import
com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins
{
id
"com.github.johnrengelman.shadow"
version
"5.1.0"
}
description
=
"Spring Core"
apply
plugin:
"kotlin"
...
...
@@ -9,62 +15,30 @@ def cglibVersion = "3.3.0"
def
objenesisVersion
=
"3.1"
configurations
{
jarjar
cglib
objenesis
coroutines
{
transitive
=
false
}
coroutines
}
task
cglibRepackJar
(
type:
Jar
)
{
repackJar
->
repackJar
.
baseName
=
"spring-cglib-repack"
repackJar
.
version
=
cglibVersion
doLast
()
{
project
.
ant
{
taskdef
name:
"jarjar"
,
classname:
"org.pantsbuild.jarjar.JarJarTask"
,
classpath:
configurations
.
jarjar
.
asPath
jarjar
(
destfile:
repackJar
.
archivePath
)
{
configurations
.
cglib
.
each
{
originalJar
->
zipfileset
(
src:
originalJar
)
}
// Repackage net.sf.cglib => org.springframework.cglib
rule
(
pattern:
"net.sf.cglib.**"
,
result:
"org.springframework.cglib.@1"
)
// As mentioned above, transform cglib's internal asm dependencies from
// org.objectweb.asm => org.springframework.asm. Doing this counts on the
// the fact that Spring and cglib depend on the same version of asm!
rule
(
pattern:
"org.objectweb.asm.**"
,
result:
"org.springframework.asm.@1"
)
}
}
}
task
cglibRepackJar
(
type:
ShadowJar
)
{
baseName
=
'spring-cglib-repack'
version
=
cglibVersion
configurations
=
[
project
.
configurations
.
cglib
]
relocate
'net.sf.cglib'
,
'org.springframework.cglib'
relocate
'org.objectweb.asm'
,
'org.springframework.asm'
}
task
objenesisRepackJar
(
type:
Jar
)
{
repackJar
->
repackJar
.
baseName
=
"spring-objenesis-repack"
repackJar
.
version
=
objenesisVersion
doLast
()
{
project
.
ant
{
taskdef
name:
"jarjar"
,
classname:
"org.pantsbuild.jarjar.JarJarTask"
,
classpath:
configurations
.
jarjar
.
asPath
jarjar
(
destfile:
repackJar
.
archivePath
)
{
configurations
.
objenesis
.
each
{
originalJar
->
zipfileset
(
src:
originalJar
)
}
// Repackage org.objenesis => org.springframework.objenesis
rule
(
pattern:
"org.objenesis.**"
,
result:
"org.springframework.objenesis.@1"
)
}
}
}
task
objenesisRepackJar
(
type:
ShadowJar
)
{
baseName
=
'spring-objenesis-repack'
version
=
objenesisVersion
configurations
=
[
project
.
configurations
.
objenesis
]
relocate
'org.objenesis'
,
'org.springframework.objenesis'
}
dependencies
{
cglib
(
"cglib:cglib:${cglibVersion}@jar"
)
objenesis
(
"org.objenesis:objenesis:${objenesisVersion}@jar"
)
jarjar
(
"org.pantsbuild:jarjar:1.7.2"
)
coroutines
(
project
(
":kotlin-coroutines"
))
coroutines
(
project
(
path:
":kotlin-coroutines"
,
configuration:
'classesOnlyElements'
))
compile
(
files
(
cglibRepackJar
))
compile
(
files
(
objenesisRepackJar
))
compile
(
project
(
":spring-jcl"
))
...
...
@@ -107,5 +81,5 @@ jar {
include
"org/springframework/objenesis/**"
}
from
{
configurations
.
coroutines
.
collect
{
it
.
isDirectory
()
?
it
:
zipTree
(
it
)
}
}
from
configurations
.
coroutines
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录