Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions benchmarks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams
* Side Public License, v 1.
*/

apply plugin: 'elasticsearch.build'
apply plugin: 'elasticsearch.java'
apply plugin: 'application'
mainClassName = 'org.openjdk.jmh.Main'

Expand Down Expand Up @@ -61,22 +61,6 @@ tasks.named("run").configure {
dependsOn "copyExpression", "copyPainless"
}

// classes generated by JMH can use all sorts of forbidden APIs but we have no influence at all and cannot exclude these classes
disableTasks('forbiddenApisMain')

// No licenses for our benchmark deps (we don't ship benchmarks)
tasks.named("dependencyLicenses").configure { enabled = false }
tasks.named("dependenciesInfo").configure { enabled = false }
tasks.named("dependenciesGraph").configure { enabled = false }


tasks.named("thirdPartyAudit").configure {
ignoreViolations(
// these classes intentionally use JDK internal API (and this is ok since the project is maintained by Oracle employees)
'org.openjdk.jmh.util.Utils'
)
}

spotless {
java {
// IDEs can sometimes run annotation processors that leave files in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
import org.elasticsearch.gradle.internal.precommit.InternalPrecommitTasks;
import org.elasticsearch.gradle.internal.precommit.JarHellPrecommitPlugin;
import org.elasticsearch.gradle.internal.precommit.SplitPackagesAuditPrecommitPlugin;
import org.gradle.api.GradleException;
import org.gradle.api.InvalidUserDataException;
import org.gradle.api.Plugin;
Expand Down Expand Up @@ -42,6 +44,7 @@ public void apply(final Project project) {
project.getPluginManager().apply(DependenciesGraphPlugin.class);

InternalPrecommitTasks.create(project, true);
project.getPluginManager().apply(SplitPackagesAuditPrecommitPlugin.class);
}

public static void configureLicenseAndNotice(final Project project) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

package org.elasticsearch.gradle.internal.precommit;

import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
import org.elasticsearch.gradle.util.GradleUtils;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.TaskProvider;

public class SplitPackagesAuditPrecommitPlugin extends PrecommitPlugin {
public static final String TASK_NAME = "splitPackagesAudit";

@Override
public TaskProvider<? extends Task> createTask(Project project) {
TaskProvider<SplitPackagesAuditTask> task = project.getTasks().register(TASK_NAME, SplitPackagesAuditTask.class);
task.configure(t -> {
t.setClasspath(project.getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME));
SourceSet mainSourceSet = GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME);
t.getSrcDirs().set(project.provider(() -> mainSourceSet.getAllSource().getSrcDirs()));
});
return task;
}
}
Loading