Skip to content

Commit b5b17c7

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 2c1a15f commit b5b17c7

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/plugin/BasePluginBuildPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@ private TaskProvider<Zip> createBundleTasks(final Project project, PluginPropert
121121
task.getIsLicensed().set(providerFactory.provider(extension::isLicensed));
122122

123123
var mainSourceSet = project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME);
124-
FileCollection moduleInfoFile = mainSourceSet.getOutput().getClassesDirs().getAsFileTree().matching(p -> p.include("module-info.class"));
124+
FileCollection moduleInfoFile = mainSourceSet.getOutput()
125+
.getClassesDirs()
126+
.getAsFileTree()
127+
.matching(p -> p.include("module-info.class"));
125128
task.getModuleInfoFile().setFrom(moduleInfoFile);
126129

127130
});

build-tools/src/main/java/org/elasticsearch/gradle/plugin/GenerateTestBuildInfoTask.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void generatePropertiesFile() throws IOException {
7070
cr.accept(new ClassVisitor(Opcodes.ASM9) {
7171
@Override
7272
public ModuleVisitor visitModule(String name, int access, String version) {
73-
//getLogger().lifecycle("FOUND 0: " + name + " | " + file.getAbsolutePath());
73+
// getLogger().lifecycle("FOUND 0: " + name + " | " + file.getAbsolutePath());
7474
moduleName[0] = name;
7575
return super.visitModule(name, access, version);
7676
}
@@ -110,7 +110,7 @@ public ModuleVisitor visitModule(String name, int access, String version) {
110110
cr.accept(new ClassVisitor(Opcodes.ASM9) {
111111
@Override
112112
public ModuleVisitor visitModule(String name, int access, String version) {
113-
//getLogger().lifecycle("FOUND 1: " + name + " | " + file.getAbsolutePath());
113+
// getLogger().lifecycle("FOUND 1: " + name + " | " + file.getAbsolutePath());
114114
moduleName[0] = name;
115115
return super.visitModule(name, access, version);
116116
}
@@ -122,7 +122,7 @@ public ModuleVisitor visitModule(String name, int access, String version) {
122122
if (moduleName[0] == null) {
123123
String amn = manifest.getMainAttributes().getValue("Automatic-Module-Name");
124124
if (amn != null) {
125-
//getLogger().lifecycle("FOUND 2: " + amn + " | " + file.getAbsolutePath());
125+
// getLogger().lifecycle("FOUND 2: " + amn + " | " + file.getAbsolutePath());
126126
moduleName[0] = amn;
127127
}
128128
}
@@ -135,7 +135,7 @@ public ModuleVisitor visitModule(String name, int access, String version) {
135135
jn = jn.substring(0, matcher.start());
136136
}
137137
jn = jn.replaceAll("[^A-Za-z0-9]", ".");
138-
//getLogger().lifecycle("FOUND 3: " + jn + " | " + file.getAbsolutePath());
138+
// getLogger().lifecycle("FOUND 3: " + jn + " | " + file.getAbsolutePath());
139139
moduleName[0] = jn;
140140
}
141141
}

0 commit comments

Comments
 (0)