Skip to content

Commit c3a1f1b

Browse files
committed
Publish all publishable projects by default
1 parent c754bb4 commit c3a1f1b

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/PublishPlugin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import com.github.jengelman.gradle.plugins.shadow.ShadowExtension;
1515
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin;
1616

17+
import nmcp.NmcpPlugin;
18+
1719
import org.elasticsearch.gradle.internal.conventions.info.GitInfo;
1820
import org.elasticsearch.gradle.internal.conventions.precommit.PomValidationPrecommitPlugin;
1921
import org.elasticsearch.gradle.internal.conventions.util.Util;
@@ -66,6 +68,7 @@ public void apply(Project project) {
6668
project.getPluginManager().apply(MavenPublishPlugin.class);
6769
project.getPluginManager().apply(PomValidationPrecommitPlugin.class);
6870
project.getPluginManager().apply(LicensingPlugin.class);
71+
project.getPluginManager().apply(NmcpPlugin.class);
6972
configureJavadocJar(project);
7073
configureSourcesJar(project);
7174
configurePomGeneration(project);

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ plugins {
4848
id 'elasticsearch.internal-testclusters'
4949
id 'elasticsearch.run'
5050
id 'elasticsearch.run-ccs'
51+
id 'elasticsearch.repositories'
5152
id 'elasticsearch.release-tools'
5253
id 'elasticsearch.versions'
5354
id 'com.gradleup.nmcp.aggregation'
@@ -61,11 +62,10 @@ nmcpAggregation {
6162
// publish manually from the portal
6263
publishingType = "USER_MANAGED"
6364
}
65+
// this breaks project isolation but this is broken in elasticsearch build atm anyhow.
66+
publishAllProjectsProbablyBreakingProjectIsolation()
6467
}
6568

66-
dependencies {
67-
nmcpAggregation(project(":libs:cli"))
68-
}
6969
/**
7070
* This is a convenient method for declaring test artifact dependencies provided by the internal
7171
* test artifact plugin. It replaces basically the longer dependency notation with explicit capability
@@ -309,7 +309,7 @@ allprojects {
309309
tasks.register('resolveAllDependencies', ResolveAllDependencies) {
310310
def ignoredPrefixes = [DistributionDownloadPlugin.ES_DISTRO_CONFIG_PREFIX, "jdbcDriver"]
311311
configs = project.configurations.matching { config -> ignoredPrefixes.any { config.name.startsWith(it) } == false }
312-
if(project.path == ':') {
312+
if (project.path == ':') {
313313
resolveJavaToolChain = true
314314

315315
// ensure we have best possible caching of bwc builds
@@ -334,7 +334,7 @@ allprojects {
334334
}
335335

336336
ext.withReleaseBuild = { Closure config ->
337-
if(buildParams.snapshotBuild == false) {
337+
if (buildParams.snapshotBuild == false) {
338338
config.call()
339339
}
340340
}

libs/cli/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
* your election, the "Elastic License 2.0", the "GNU Affero General Public
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
9-
plugins {
10-
// id("com.gradleup.nmcp")
11-
}
12-
13-
149
apply plugin: 'elasticsearch.build'
1510
apply plugin: 'elasticsearch.publish'
1611

0 commit comments

Comments
 (0)