Skip to content

Commit ac00093

Browse files
philwebbphilwebb
committed
Upgrade to Eclipse 2022-12
Closes gh-352
1 parent 8d2e54c commit ac00093

10 files changed

Lines changed: 19 additions & 16 deletions

File tree

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<java.version>1.8</java.version>
3434
<eclipse.jdk8.repository>https://download.eclipse.org/releases/2021-03/202103171000/</eclipse.jdk8.repository>
35-
<eclipse.jdk11.repository>https://download.eclipse.org/releases/2022-06/202206151000/</eclipse.jdk11.repository>
35+
<eclipse.jdk11.repository>https://download.eclipse.org/releases/2022-12/202212071000/</eclipse.jdk11.repository>
3636
<eclipse.checkstyle.repository>https://checkstyle.org/eclipse-cs-update-site/</eclipse.checkstyle.repository>
3737
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
3838
<ant.version>1.8.1</ant.version>
@@ -612,7 +612,7 @@
612612
</os>
613613
</activation>
614614
<properties>
615-
<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</ui.test.vmargs>
615+
<ui.test.vmargs>-Xmx512m -XstartOnFirstThread</ui.test.vmargs>
616616
</properties>
617617
</profile>
618618
<profile>
@@ -624,7 +624,7 @@
624624
</os>
625625
</activation>
626626
<properties>
627-
<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
627+
<ui.test.vmargs>-Xmx512m</ui.test.vmargs>
628628
</properties>
629629
</profile>
630630
<profile>

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<name>Spring JavaFormat Eclipse Plugin Feature</name>
1414
<properties>
1515
<main.basedir>${basedir}/../..</main.basedir>
16-
<java.version>11</java.version>
16+
<java.version>17</java.version>
1717
</properties>
1818
</project>

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.site/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<name>Spring JavaFormat Eclipse Plugin Site</name>
1414
<properties>
1515
<main.basedir>${basedir}/../..</main.basedir>
16-
<java.version>11</java.version>
16+
<java.version>17</java.version>
1717
</properties>
1818
<build>
1919
<plugins>

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/META-INF/MANIFEST.MF‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
Manifest-Version: 1.0
22
Fragment-Host: io.spring.javaformat.eclipse
3+
Import-Package: org.junit,
4+
org.junit.jupiter.api,
5+
org.junit.jupiter.api.io
36
Bundle-ManifestVersion: 2
47
Bundle-Name: Spring Java Format Plugin Tests
58
Bundle-SymbolicName: io.spring.javaformat.eclipse.tests
69
Automatic-Module-Name: io.spring.javaformat.eclipse.tests
710
Bundle-Version: 0.0.36.qualifier
811
Bundle-RequiredExecutionEnvironment: JavaSE-11
9-
Require-Bundle: org.junit,
10-
org.junit.jupiter.api
1112
Bundle-ClassPath: .,
1213
lib/assertj-core.jar,
1314
lib/byte-buddy-agent.jar,
1415
lib/byte-buddy.jar,
1516
lib/mockito-core.jar,
16-
lib/objenesis.jar
17+
lib/objenesis.jar,
18+
lib/junit-jupiter-api.jar

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/build.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
66
lib/byte-buddy-agent.jar,\
77
lib/byte-buddy.jar,\
88
lib/mockito-core.jar,\
9-
lib/objenesis.jar
9+
lib/objenesis.jar,\
10+
lib/junit-jupiter-api.jar

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<name>Spring JavaFormat Eclipse Test</name>
1414
<properties>
1515
<main.basedir>${basedir}/../..</main.basedir>
16-
<java.version>11</java.version>
16+
<java.version>17</java.version>
1717
</properties>
1818
<dependencies>
1919
<dependency>

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui,
1010
org.eclipse.core.resources,
1111
org.eclipse.core.runtime,
1212
org.eclipse.ui.ide,
13-
org.slf4j.api;bundle-version="1.7.0",
1413
org.eclipse.jdt.core,
1514
org.eclipse.jface.text,
1615
org.eclipse.m2e.jdt;resolution:=optional,

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<name>Spring JavaFormat Eclipse Plugin</name>
1414
<properties>
1515
<main.basedir>${basedir}/../..</main.basedir>
16+
<java.version>17</java.version>
1617
</properties>
1718
<dependencies>
1819
<!-- Runtime -->

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/m2e/MavenProjectSettingsConfigurator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public void configure(ProjectConfigurationRequest request, IProgressMonitor moni
4343
new Executor(Messages.springFormatSettingsImportError).run(() -> {
4444
List<File> searchFolders = getSearchFolders(request);
4545
ProjectSettingsFiles settingsFiles = new ProjectSettingsFilesLocator(searchFolders).locateSettingsFiles();
46-
settingsFiles.applyToProject(request.getProject(), monitor);
46+
settingsFiles.applyToProject(request.mavenProjectFacade().getProject(), monitor);
4747
});
4848
}
4949

5050
private List<File> getSearchFolders(ProjectConfigurationRequest request) {
5151
List<File> files = new ArrayList<>();
52-
MavenProject project = request.getMavenProject();
52+
MavenProject project = request.mavenProject();
5353
while (project != null && project.getBasedir() != null) {
5454
files.add(project.getBasedir());
5555
project = project.getParent();

‎spring-javaformat-eclipse/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
<name>Spring JavaFormat Eclipse Parent</name>
1414
<properties>
1515
<main.basedir>${basedir}/..</main.basedir>
16-
<java.version>11</java.version>
16+
<java.version>17</java.version>
1717
</properties>
1818
<repositories>
1919
<repository>
20-
<id>eclipse-jdk8</id>
20+
<id>eclipse-jdk11</id>
2121
<layout>p2</layout>
22-
<url>${eclipse.jdk8.repository}</url>
22+
<url>${eclipse.jdk11.repository}</url>
2323
</repository>
2424
<repository>
2525
<id>eclipse-checkstyle</id>

0 commit comments

Comments
 (0)