Commit 9216878c authored by nik's avatar nik Committed by intellij-monorepo-bot
Browse files

build scripts: restore publishing of modules mentioned in...

build scripts: restore publishing of modules mentioned in MavenArtifactsProperties.additionalModules

...even if 'forIdeModules' is true as it was before f32b1c53c8cff9dee. This fixes publishing of intellij.tools.jps.buildScriptDependencies, for example.

GitOrigin-RevId: 339fc21f690ab7457ecc2dded765324114c1dd5e
parent 3deb1087
Showing with 4 additions and 3 deletions
+4 -3
......@@ -334,13 +334,14 @@ idea.fatal.error.notification=disabled
if (mavenArtifacts.forIdeModules || !mavenArtifacts.additionalModules.isEmpty() || !mavenArtifacts.proprietaryModules.isEmpty()) {
buildContext.executeStep("Generate Maven artifacts", BuildOptions.MAVEN_ARTIFACTS_STEP) {
def mavenArtifactsBuilder = new MavenArtifactsBuilder(buildContext)
def moduleNames
def ideModuleNames
if (mavenArtifacts.forIdeModules) {
def bundledPlugins = buildContext.productProperties.productLayout.allBundledPluginsModules
moduleNames = distributionJARsBuilder.platformModules + buildContext.productProperties.productLayout.getIncludedPluginModules(bundledPlugins)
ideModuleNames = distributionJARsBuilder.platformModules + buildContext.productProperties.productLayout.getIncludedPluginModules(bundledPlugins)
} else {
moduleNames = mavenArtifacts.additionalModules
ideModuleNames = []
}
def moduleNames = ideModuleNames + mavenArtifacts.additionalModules
if (!moduleNames.isEmpty()) {
mavenArtifactsBuilder.generateMavenArtifacts(moduleNames, 'maven-artifacts')
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment