Upgrade to Eclipse 2022-12

Closes gh-352
spring-io · Feb 6, 2023 · ac00093 · ac00093
1 parent 8d2e54c
commit ac00093
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<eclipse.jdk8.repository>https://download.eclipse.org/releases/2021-03/202103171000/</eclipse.jdk8.repository>
-		<eclipse.jdk11.repository>https://download.eclipse.org/releases/2022-06/202206151000/</eclipse.jdk11.repository>
+		<eclipse.jdk11.repository>https://download.eclipse.org/releases/2022-12/202212071000/</eclipse.jdk11.repository>
 		<eclipse.checkstyle.repository>https://checkstyle.org/eclipse-cs-update-site/</eclipse.checkstyle.repository>
 		<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
 		<ant.version>1.8.1</ant.version>
@@ -612,7 +612,7 @@
 				</os>
 			</activation>
 			<properties>
-				<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</ui.test.vmargs>
+				<ui.test.vmargs>-Xmx512m -XstartOnFirstThread</ui.test.vmargs>
 			</properties>
 		</profile>
 		<profile>
@@ -624,7 +624,7 @@
 				</os>
 			</activation>
 			<properties>
-				<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
+				<ui.test.vmargs>-Xmx512m</ui.test.vmargs>
 			</properties>
 		</profile>
 		<profile>

diff --git 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 @@
 	<name>Spring JavaFormat Eclipse Plugin Feature</name>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 </project>
diff --git 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 @@
 	<name>Spring JavaFormat Eclipse Plugin Site</name>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<build>
 		<plugins>

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
@@ -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
@@ -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
@@ -13,7 +13,7 @@
 	<name>Spring JavaFormat Eclipse Test</name>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

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
@@ -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
@@ -13,6 +13,7 @@
 	<name>Spring JavaFormat Eclipse Plugin</name>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<!-- Runtime -->

diff --git a/...format.eclipse/src/io/spring/javaformat/eclipse/m2e/MavenProjectSettingsConfigurator.java b/...format.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<File> searchFolders = getSearchFolders(request);
 			ProjectSettingsFiles settingsFiles = new ProjectSettingsFilesLocator(searchFolders).locateSettingsFiles();
-			settingsFiles.applyToProject(request.getProject(), monitor);
+			settingsFiles.applyToProject(request.mavenProjectFacade().getProject(), monitor);
 		});
 	}
 
 	private List<File> getSearchFolders(ProjectConfigurationRequest request) {
 		List<File> 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
@@ -13,13 +13,13 @@
 	<name>Spring JavaFormat Eclipse Parent</name>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<repositories>
 		<repository>
-			<id>eclipse-jdk8</id>
+			<id>eclipse-jdk11</id>
 			<layout>p2</layout>
-			<url>${eclipse.jdk8.repository}</url>
+			<url>${eclipse.jdk11.repository}</url>
 		</repository>
 		<repository>
 			<id>eclipse-checkstyle</id>