Browse Source

Merge branch '4.0.x'

Closes gh-48976
pull/48997/head
Phillip Webb 1 week ago
parent
commit
a92ef60f34
  1. 14
      buildSrc/src/main/java/org/springframework/boot/build/EclipseConventions.java
  2. 56
      buildSrc/src/main/java/org/springframework/boot/build/EclipseSynchronizeResourceSettings.java

14
buildSrc/src/main/java/org/springframework/boot/build/EclipseConventions.java

@ -50,15 +50,27 @@ class EclipseConventions { @@ -50,15 +50,27 @@ class EclipseConventions {
}
private DomainObjectCollection<JavaBasePlugin> configure(Project project, EclipsePlugin eclipsePlugin) {
TaskProvider<?> synchronizeResourceSettings = registerEclipseSynchronizeResourceSettings(project);
TaskProvider<?> synchronizeJdtSettings = registerEclipseSynchronizeJdtSettings(project);
return project.getPlugins().withType(JavaBasePlugin.class, (javaBase) -> {
EclipseModel model = project.getExtensions().getByType(EclipseModel.class);
model.synchronizationTasks(synchronizeJdtSettings);
model.synchronizationTasks(synchronizeResourceSettings, synchronizeJdtSettings);
model.jdt(this::configureJdt);
model.classpath(this::configureClasspath);
});
}
private TaskProvider<?> registerEclipseSynchronizeResourceSettings(Project project) {
TaskProvider<EclipseSynchronizeResourceSettings> eclipseSynchronizateResource = project.getTasks()
.register("eclipseSynchronizateResourceSettings", EclipseSynchronizeResourceSettings.class);
eclipseSynchronizateResource.configure((task) -> {
task.setDescription("Synchronizate the Eclipse resource settings file from Buildship.");
task.setOutputFile(project.file(".settings/org.eclipse.core.resources.prefs"));
task.setInputFile(project.file(".settings/org.eclipse.core.resources.prefs"));
});
return eclipseSynchronizateResource;
}
private TaskProvider<EclipseSynchronizeJdtSettings> registerEclipseSynchronizeJdtSettings(Project project) {
TaskProvider<EclipseSynchronizeJdtSettings> taskProvider = project.getTasks()
.register("eclipseSynchronizeJdtSettings", EclipseSynchronizeJdtSettings.class);

56
buildSrc/src/main/java/org/springframework/boot/build/EclipseSynchronizeResourceSettings.java

@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
/*
* Copyright 2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.build;
import java.util.Properties;
import org.gradle.api.Task;
import org.gradle.api.internal.PropertiesTransformer;
import org.gradle.plugins.ide.api.PropertiesGeneratorTask;
import org.springframework.boot.build.EclipseSynchronizeResourceSettings.Configuration;
/**
* {@link Task} to synchronize Eclipse resource settings.
*
* @author Phillip Webb
*/
public abstract class EclipseSynchronizeResourceSettings extends PropertiesGeneratorTask<Configuration> {
@Override
protected Configuration create() {
return new Configuration(getTransformer());
}
@Override
protected void configure(Configuration configuration) {
}
public static class Configuration extends EmptyPropertiesPersistableConfigurationObject {
Configuration(PropertiesTransformer transformer) {
super(transformer);
}
@Override
protected void store(Properties properties) {
properties.put("encoding/<project>", "UTF-8");
}
}
}
Loading…
Cancel
Save