Skip to content

Commit c3fde89

Browse files
FKHalsEik0freshpaun42panphil
committed
[BUILD] Prevent the core from exporting commons-io
and instead let every project get it itself, since it is not part of the cores public api and it further reduces the coupling between the core and these projects. We decided that this should be a separate commit from the previous ones (that also change the build-system) since it changes different files and could not be integrated coherently. Co-authored-by: Eik0fresh <39055879+Eik0fresh@users.noreply.github.com> Co-authored-by: paun42 <75132590+paun42@users.noreply.github.com> Co-authored-by: panphil <74254708+panphil@users.noreply.github.com>
1 parent d8dba44 commit c3fde89

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ subprojects {
144144
val log4j2Bridge = "org.apache.logging.log4j:log4j-1.2-api:$log4j2VersionNr"
145145

146146
projectToConf.extra["commons-lang3"] = "org.apache.commons:commons-lang3:3.8.1"
147+
projectToConf.extra["commons-io2"] = "commons-io:commons-io:2.0.1"
147148

148149
projectToConf.extra["junitVersion"] = junitVersion
149150
projectToConf.extra["log4j2ApiVersion"] = log4j2Api

core/META-INF/MANIFEST.MF

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ Export-Package: saros,
5959
saros.ui.util,
6060
saros.util,
6161
saros.versioning,
62-
org.apache.commons.io,
63-
org.apache.commons.io.comparator,
64-
org.apache.commons.io.filefilter,
65-
org.apache.commons.io.input,
66-
org.apache.commons.io.monitor,
67-
org.apache.commons.io.output,
6862
org.apache.commons.lang3,
6963
org.apache.commons.lang3.exception,
7064
org.apache.commons.lang3.time,

core/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55

66
val versionQualifier = ext.get("versionQualifier") as String
77
val commonsLang = ext.get("commons-lang3") as String
8+
val commonsIo = ext.get("commons-io2") as String
89

910
val log4j2ApiVersion = ext.get("log4j2ApiVersion") as String
1011
val log4j2CoreVersion = ext.get("log4j2CoreVersion") as String
@@ -40,7 +41,7 @@ sarosEclipse {
4041

4142
dependencies {
4243
bundle("commons-codec:commons-codec:1.3")
43-
bundleApi("commons-io:commons-io:2.0.1")
44+
bundle(commonsIo)
4445
bundleApi(commonsLang)
4546

4647
bundle("javax.jmdns:jmdns:3.4.1")

eclipse/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import com.diffplug.gradle.pde.EclipseRelease
1010
val versionQualifier = ext.get("versionQualifier") as String
1111
val eclipseVersionNr = ext.get("eclipseVersion") as String
1212

13+
val commonsIo = ext.get("commons-io2") as String
14+
1315
configurations {
1416
val testConfig by getting {}
1517
getByName("testImplementation") {
@@ -40,6 +42,7 @@ sourceSets {
4042

4143
dependencies {
4244
implementation(project(":saros.core"))
45+
implementation(commonsIo)
4346
// This is a workaround for https://github.com/saros-project/saros/issues/1086
4447
implementation("org.eclipse.platform:org.eclipse.urischeme:1.1.0")
4548
// This is a workaround for https://github.com/saros-project/saros/issues/1114

intellij/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ val versionQualifier: String? = ext.get("versionQualifier") as String?
66
val intellijHome: String? = ext.get("intellijHome") as String?
77
val intellijSandboxDir: String? = ext.get("intellijSandboxDir") as String?
88

9+
val commonsIo = ext.get("commons-io2") as String
10+
911
configurations {
1012
val testConfig by getting {}
1113
val testCompile by getting {
@@ -15,6 +17,7 @@ configurations {
1517

1618
dependencies {
1719
compile(project(path = ":saros.core", configuration = "plain"))
20+
implementation(commonsIo)
1821

1922
compile("org.easytesting:fest-assert:1.2")
2023
compile("org.easytesting:fest-reflect:1.2")

server/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
val versionQualifier = ext.get("versionQualifier")
22

3+
val commonsIo = ext.get("commons-io2") as String
4+
35
configurations {
46
val testConfig by getting {}
57
val testCompile by getting {
@@ -10,6 +12,7 @@ configurations {
1012
dependencies {
1113
compile(project(":saros.core"))
1214
compile("org.apache.commons:commons-collections4:4.2")
15+
implementation(commonsIo)
1316
}
1417

1518
sourceSets {

0 commit comments

Comments
 (0)