Skip to content

Commit 3312fc0

Browse files
committed
Match up publishing artifacts with DRA setup
1 parent 9f4ba3d commit 3312fc0

File tree

10 files changed

+6
-9
lines changed

10 files changed

+6
-9
lines changed

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/BuildPluginFuncTest.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ class BuildPluginFuncTest extends AbstractGradleFuncTest {
123123
then:
124124
result.task(":assemble").outcome == TaskOutcome.SUCCESS
125125
file("build/distributions/hello-world.jar").exists()
126-
file("build/distributions/hello-world-javadoc.jar").exists()
127-
file("build/distributions/hello-world-sources.jar").exists()
128126
assertValidJar(file("build/distributions/hello-world.jar"))
129127
}
130128

@@ -162,7 +160,7 @@ class BuildPluginFuncTest extends AbstractGradleFuncTest {
162160
result.task(":forbiddenPatterns").outcome == TaskOutcome.SUCCESS
163161
result.task(":validateModule").outcome == TaskOutcome.SUCCESS
164162
result.task(":splitPackagesAudit").outcome == TaskOutcome.SUCCESS
165-
result.task(":validateElasticPom").outcome == TaskOutcome.SUCCESS
163+
// result.task(":validateElasticPom").outcome == TaskOutcome.SUCCESS
166164
// disabled but check for being on the task graph
167165
result.task(":forbiddenApisMain").outcome == TaskOutcome.SKIPPED
168166
result.task(":checkstyleMain").outcome == TaskOutcome.SKIPPED

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BuildPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
package org.elasticsearch.gradle.internal;
1111

12+
import org.elasticsearch.gradle.internal.conventions.LicensingPlugin;
1213
import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
1314
import org.elasticsearch.gradle.internal.precommit.InternalPrecommitTasks;
1415
import org.elasticsearch.gradle.internal.snyk.SnykDependencyMonitoringGradlePlugin;
@@ -61,6 +62,7 @@ public void apply(final Project project) {
6162
project.getPluginManager().apply("elasticsearch.java");
6263
project.getPluginManager().apply(ElasticsearchJavadocPlugin.class);
6364
project.getPluginManager().apply(DependenciesInfoPlugin.class);
65+
project.getPluginManager().apply(LicensingPlugin.class);
6466
project.getPluginManager().apply(SnykDependencyMonitoringGradlePlugin.class);
6567
project.getPluginManager().apply(ClusterFeaturesMetadataPlugin.class);
6668
InternalPrecommitTasks.create(project, true);

libs/entitlement/bridge/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.elasticsearch.gradle.internal.precommit.CheckForbiddenApisTask
1111

1212
apply plugin: 'elasticsearch.build'
1313
apply plugin: 'elasticsearch.mrjar'
14+
apply plugin: 'elasticsearch.publish'
1415

1516
tasks.named('jar').configure {
1617
// guarding for intellij

libs/entitlement/tools/public-callers-finder/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
}
44

55
apply plugin: 'elasticsearch.build'
6-
apply plugin: 'elasticsearch.publish'
76

87
tasks.named("dependencyLicenses").configure {
98
mapping from: /asm-.*/, to: 'asm'

libs/entitlement/tools/securitymanager-scanner/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
}
44

55
apply plugin: 'elasticsearch.build'
6-
apply plugin: 'elasticsearch.publish'
76

87
tasks.named("dependencyLicenses").configure {
98
mapping from: /asm-.*/, to: 'asm'

test/x-content/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
apply plugin: 'elasticsearch.build'
11-
apply plugin: 'elasticsearch.publish'
1211

1312
dependencies {
1413
api project(":test:framework")

test/yaml-rest-runner/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'elasticsearch.build'
2+
apply plugin: 'elasticsearch.publish'
23
apply plugin: 'elasticsearch.internal-yaml-rest-test'
34
apply plugin: 'elasticsearch.yaml-rest-compat-test'
45

x-pack/plugin/core/template-resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
21
apply plugin: 'elasticsearch.build'
2+
apply plugin: 'elasticsearch.publish'
33

44
base {
55
archivesName = 'x-pack-template-resources'

x-pack/plugin/identity-provider/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
apply plugin: 'elasticsearch.internal-es-plugin'
9-
apply plugin: 'elasticsearch.publish'
109
apply plugin: 'elasticsearch.internal-cluster-test'
1110
esplugin {
1211
name = 'x-pack-identity-provider'

x-pack/plugin/kql/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import static org.elasticsearch.gradle.util.PlatformUtils.normalize
1010
apply plugin: 'elasticsearch.internal-es-plugin'
1111
apply plugin: 'elasticsearch.internal-cluster-test'
1212
apply plugin: 'elasticsearch.internal-yaml-rest-test'
13-
apply plugin: 'elasticsearch.publish'
1413

1514
esplugin {
1615
name = 'x-pack-kql'

0 commit comments

Comments
 (0)