diff --git a/pom.xml b/pom.xml
index 1e1c3c83..877c2775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
UTF-8
1.8
https://download.eclipse.org/releases/2021-03/202103171000/
- https://download.eclipse.org/releases/2022-06/202206151000/
+ https://download.eclipse.org/releases/2022-12/202212071000/
https://checkstyle.org/eclipse-cs-update-site/
true
1.8.1
@@ -612,7 +612,7 @@
- -Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread
+ -Xmx512m -XstartOnFirstThread
@@ -624,7 +624,7 @@
- -Xmx512m -XX:MaxPermSize=256m
+ -Xmx512m
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.feature/pom.xml b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.feature/pom.xml
index 1615bba7..999de9e4 100755
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.feature/pom.xml
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.feature/pom.xml
@@ -13,6 +13,6 @@
Spring JavaFormat Eclipse Plugin Feature
${basedir}/../..
- 11
+ 17
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.site/pom.xml b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.site/pom.xml
index 91180586..8c6f5258 100755
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.site/pom.xml
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.site/pom.xml
@@ -13,7 +13,7 @@
Spring JavaFormat Eclipse Plugin Site
${basedir}/../..
- 11
+ 17
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/META-INF/MANIFEST.MF b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/META-INF/MANIFEST.MF
index a58dbd73..b3a9b579 100755
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/META-INF/MANIFEST.MF
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/META-INF/MANIFEST.MF
@@ -1,16 +1,18 @@
Manifest-Version: 1.0
Fragment-Host: io.spring.javaformat.eclipse
+Import-Package: org.junit,
+ org.junit.jupiter.api,
+ org.junit.jupiter.api.io
Bundle-ManifestVersion: 2
Bundle-Name: Spring Java Format Plugin Tests
Bundle-SymbolicName: io.spring.javaformat.eclipse.tests
Automatic-Module-Name: io.spring.javaformat.eclipse.tests
Bundle-Version: 0.0.36.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.junit,
- org.junit.jupiter.api
Bundle-ClassPath: .,
lib/assertj-core.jar,
lib/byte-buddy-agent.jar,
lib/byte-buddy.jar,
lib/mockito-core.jar,
- lib/objenesis.jar
+ lib/objenesis.jar,
+ lib/junit-jupiter-api.jar
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/build.properties b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/build.properties
index f084befe..b62f58dd 100755
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/build.properties
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/build.properties
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
lib/byte-buddy-agent.jar,\
lib/byte-buddy.jar,\
lib/mockito-core.jar,\
- lib/objenesis.jar
+ lib/objenesis.jar,\
+ lib/junit-jupiter-api.jar
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml
index 194fa5e8..9f94ca47 100644
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml
@@ -13,7 +13,7 @@
Spring JavaFormat Eclipse Test
${basedir}/../..
- 11
+ 17
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF
index 564a1fc2..e7c5b534 100644
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.ui.ide,
- org.slf4j.api;bundle-version="1.7.0",
org.eclipse.jdt.core,
org.eclipse.jface.text,
org.eclipse.m2e.jdt;resolution:=optional,
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/pom.xml b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/pom.xml
index 6785b635..e7c31f42 100644
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/pom.xml
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/pom.xml
@@ -13,6 +13,7 @@
Spring JavaFormat Eclipse Plugin
${basedir}/../..
+ 17
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/m2e/MavenProjectSettingsConfigurator.java b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/m2e/MavenProjectSettingsConfigurator.java
index 5cc7aacd..030a873f 100644
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/m2e/MavenProjectSettingsConfigurator.java
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/m2e/MavenProjectSettingsConfigurator.java
@@ -43,13 +43,13 @@ public void configure(ProjectConfigurationRequest request, IProgressMonitor moni
new Executor(Messages.springFormatSettingsImportError).run(() -> {
List searchFolders = getSearchFolders(request);
ProjectSettingsFiles settingsFiles = new ProjectSettingsFilesLocator(searchFolders).locateSettingsFiles();
- settingsFiles.applyToProject(request.getProject(), monitor);
+ settingsFiles.applyToProject(request.mavenProjectFacade().getProject(), monitor);
});
}
private List getSearchFolders(ProjectConfigurationRequest request) {
List files = new ArrayList<>();
- MavenProject project = request.getMavenProject();
+ MavenProject project = request.mavenProject();
while (project != null && project.getBasedir() != null) {
files.add(project.getBasedir());
project = project.getParent();
diff --git a/spring-javaformat-eclipse/pom.xml b/spring-javaformat-eclipse/pom.xml
index 8d391e4a..24fe7ecd 100644
--- a/spring-javaformat-eclipse/pom.xml
+++ b/spring-javaformat-eclipse/pom.xml
@@ -13,13 +13,13 @@
Spring JavaFormat Eclipse Parent
${basedir}/..
- 11
+ 17
- eclipse-jdk8
+ eclipse-jdk11
p2
- ${eclipse.jdk8.repository}
+ ${eclipse.jdk11.repository}
eclipse-checkstyle