Skip to content

Commit 547b146

Browse files
committed
fit:修改插件打包依赖关系
1 parent 13b43f9 commit 547b146

8 files changed

Lines changed: 40 additions & 12 deletions

File tree

codeTools/x-WebSourcesTool/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ description = 'x-WebSourcesTool'
99

1010
//打jar包需要包含依赖的配置
1111
jar {
12-
from { configurations.compileClasspath.findAll { it.name.contains("okhttp") }.collect { zipTree(it) } }
12+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
13+
from { configurations.compileClasspath.findAll { it.name.contains("okhttp")
14+
|| it.name.contains("okio")
15+
|| it.name.contains("kotlin-stdlib")
16+
}.collect { zipTree(it) } }
1317
}
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
api project(':xcore')
3-
implementation 'org.apache.activemq:activemq-broker:5.18.3'
3+
implementation 'org.apache.activemq:activemq-broker:5.18.6'
44
}
55

66
group = 'com.xwintop'
@@ -9,5 +9,16 @@ description = 'x-ActiveMqTool'
99

1010
//打jar包需要包含依赖的配置
1111
jar {
12-
from { configurations.compileClasspath.findAll { it.name.contains("activemq-broker") }.collect { zipTree(it) } }
12+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
13+
from { configurations.compileClasspath.findAll { it.name.contains("activemq-broker")
14+
|| it.name.contains("javax.annotation-api")
15+
|| it.name.contains("jackson-databind")
16+
|| it.name.contains("jackson-annotations")
17+
|| it.name.contains("jackson-core")
18+
|| it.name.contains("jackson-bom")
19+
|| it.name.contains("activemq-client")
20+
|| it.name.contains("jakarta.jms-api")
21+
|| it.name.contains("hawtbuf")
22+
|| it.name.contains("activemq-openwire-legacy")
23+
}.collect { zipTree(it) } }
1324
}
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dependencies {
22
api project(':xcore')
3-
// implementation 'org.springframework.boot:spring-boot-starter-activemq:2.7.18'
43
implementation 'org.springframework.kafka:spring-kafka:2.8.11'
54
}
65

@@ -9,5 +8,7 @@ version = '0.0.1'
98
description = 'x-KafkaTool'
109
//打jar包需要包含依赖的配置
1110
jar {
12-
from { configurations.compileClasspath.findAll { it.name.contains("spring-kafka") }.collect { zipTree(it) } }
11+
from { configurations.compileClasspath.findAll { it.name.contains("spring-kafka")
12+
|| it.name.contains("kafka-clients")
13+
}.collect { zipTree(it) } }
1314
}

debugTools/x-SocketTool/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ description = 'x-SocketTool'
1010

1111
//打jar包需要包含依赖的配置
1212
jar {
13+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
1314
from { configurations.compileClasspath.findAll { it.name.contains("mina")
1415
||it.name.contains("oshi")
16+
||it.name.contains("jna")
1517
}.collect { zipTree(it) } }
1618
}

debugTools/x-SwitchHostsTool/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,10 @@ description = 'x-SwitchHostsTool'
99

1010
//打jar包需要包含依赖的配置
1111
jar {
12-
from { configurations.compileClasspath.findAll { it.name.contains("richtextfx") }.collect { zipTree(it) } }
12+
from { configurations.compileClasspath.findAll { it.name.contains("richtextfx")
13+
|| it.name.contains("flowless")
14+
|| it.name.contains("undofx")
15+
|| it.name.contains("wellbehavedfx")
16+
|| it.name.contains("reactfx")
17+
}.collect { zipTree(it) } }
1318
}

debugTools/x-ZookeeperTool/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ description = 'x-ZookeeperTool'
99

1010
//打jar包需要包含依赖的配置
1111
jar {
12-
from { configurations.compileClasspath.findAll { it.name.contains("zkclient") }.collect { zipTree(it) } }
12+
from { configurations.compileClasspath.findAll { it.name.contains("zkclient")
13+
|| it.name.contains("zookeeper")
14+
}.collect { zipTree(it) } }
1315
}

littleTools/x-EmailTool/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@ description = 'x-EmailTool'
99

1010
//打jar包需要包含依赖的配置
1111
jar {
12-
from { configurations.compileClasspath.findAll { it.name.contains("commons-email") }.collect { zipTree(it) } }
12+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
13+
from { configurations.compileClasspath.findAll { it.name.contains("commons-email")
14+
|| it.name.contains("javax.mail")
15+
}.collect { zipTree(it) } }
1316
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
dependencies {
22
api project(':xcore')
3-
implementation 'org.apache.lucene:lucene-core:8.11.3'
4-
implementation 'org.apache.lucene:lucene-backward-codecs:8.11.3'
3+
implementation 'org.apache.lucene:lucene-backward-codecs:8.11.4'
54
}
65

76
group = 'com.xwintop'
@@ -10,6 +9,7 @@ description = 'x-FileSearchTool'
109

1110
//打jar包需要包含依赖的配置
1211
jar {
13-
duplicatesStrategy = 'exclude'
14-
from { configurations.compileClasspath.findAll { it.name.contains("lucene")}.collect { zipTree(it) } }
12+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
13+
from { configurations.compileClasspath.findAll { it.name.contains("lucene")
14+
}.collect { zipTree(it) } }
1515
}

0 commit comments

Comments
 (0)