Skip to content

Commit

Permalink
Fix artifact IDs of dependencies in POMs
Browse files Browse the repository at this point in the history
Ensure the POMs of the published Maven artifacts have their dependencies
properly declared.

With the releases of openTCS 6.1 and openTCS 6.1.1, dependencies on
openTCS artifacts were using wrongly spelled artifact IDs, making it
impossible to include openTCS artifacts as dependencies in projects.

Co-authored-by: Stefan Walter <[email protected]>
Merged-by: Stefan Walter <[email protected]>
  • Loading branch information
martingr and swltr committed Sep 19, 2024
1 parent 3316b61 commit 2d1a329
Show file tree
Hide file tree
Showing 2,048 changed files with 130 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!/.idea/runConfigurations
/.gradle/
/build/
/openTCS-*/build/
/opentcs-*/build/
*~

# Ignore approval test result files.
Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,29 @@ repositories {
distributions {
main {
contents.from {
project(':openTCS-Kernel').ext.collectableDistDir
project(':opentcs-kernel').ext.collectableDistDir
}
contents.from {
project(':openTCS-KernelControlCenter').ext.collectableDistDir
project(':opentcs-kernelcontrolcenter').ext.collectableDistDir
}
contents.from {
project(':openTCS-ModelEditor').ext.collectableDistDir
project(':opentcs-modeleditor').ext.collectableDistDir
}
contents.from {
project(':openTCS-OperationsDesk').ext.collectableDistDir
project(':opentcs-operationsdesk').ext.collectableDistDir
}
contents.from {
project(':openTCS-Documentation').ext.collectableDistDir
project(':opentcs-documentation').ext.collectableDistDir
}
}
}

task subDists {
dependsOn(':openTCS-Kernel:installDist')
dependsOn(':openTCS-KernelControlCenter:installDist')
dependsOn(':openTCS-ModelEditor:installDist')
dependsOn(':openTCS-OperationsDesk:installDist')
dependsOn(':openTCS-Documentation:installDist')
dependsOn(':opentcs-kernel:installDist')
dependsOn(':opentcs-kernelcontrolcenter:installDist')
dependsOn(':opentcs-modeleditor:installDist')
dependsOn(':opentcs-operationsdesk:installDist')
dependsOn(':opentcs-documentation:installDist')
}

installDist.dependsOn subDists
Expand Down
13 changes: 0 additions & 13 deletions openTCS-PlantOverview-Panel-LoadGenerator/build.gradle

This file was deleted.

13 changes: 0 additions & 13 deletions openTCS-PlantOverview-Panel-ResourceAllocation/build.gradle

This file was deleted.

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply from: "${rootDir}/gradle/java-codequality.gradle"
apply from: "${rootDir}/gradle/publishing-java.gradle"

dependencies {
api project(':openTCS-API-Base')
api project(':opentcs-api-base')
api group: 'com.google.inject', name: 'guice', version: '7.0.0'
api group: 'com.google.inject.extensions', name: 'guice-assistedinject', version: '7.0.0'
}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ apply from: "${rootDir}/gradle/guice-project.gradle"
apply from: "${rootDir}/gradle/publishing-java.gradle"

dependencies {
api project(':openTCS-API-Injection')
api project(':openTCS-Common')
api project(':opentcs-api-injection')
api project(':opentcs-common')
}

task release {
Expand Down
Loading

0 comments on commit 2d1a329

Please sign in to comment.