Skip to content

Commit 44adcf4

Browse files
authored
Fix snapshot deployment dependencies (#72)
This fixes the issue that UI JARs are included in the custom project deployment when openremoteVersion is set to a SNAPSHOT version published locally. It is also no longer necessary to exclude `:openremote:ui:app` from the tasks because submodules are no longer used.
1 parent 4cc88e6 commit 44adcf4

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

deployment/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ tasks.register('license') {
3030
tasks.register('installDist', Copy) {
3131
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
3232
dependsOn(parent.getTasksByName('installDist', true).findAll {
33-
// Don't create circular dependency or depend on built in openremote submodule apps
34-
it.project != project && !it.project.path.startsWith(":openremote:ui:app")
33+
// Don't create circular dependency
34+
it.project != project
3535
})
3636

3737
into("$buildDir")
@@ -48,6 +48,6 @@ tasks.register('installDist', Copy) {
4848
// Don't include deps baked into the manager docker image
4949
exclude configurations.managerRuntime.resolvedConfiguration.resolvedArtifacts.collect {it.file.name }
5050
// Don't include any ui packaged JARs (used for dev purposes only)
51-
exclude { (it.file.path.contains(".gradle") || it.file.path.contains(".m2")) && it.file.path.contains("io.openremote.ui") }
51+
exclude { (it.file.path.contains(".gradle") || it.file.path.contains(".m2")) && it.file.path.contains("io/openremote/ui") }
5252
}
5353
}

0 commit comments

Comments
 (0)