Skip to content

Commit 8f793f9

Browse files
committed
Upgrade to Eclipse 2020-03 with Java 14 support
Closes gh-195
1 parent 0ea3f12 commit 8f793f9

File tree

2 files changed

+27
-13
lines changed

2 files changed

+27
-13
lines changed

pom.xml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131
<main.basedir>${basedir}</main.basedir>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<java.version>1.8</java.version>
34-
<eclipse.repository>https://download.eclipse.org/releases/2019-12/201912181000/</eclipse.repository>
35-
<eclipse.checkstyle.repository>https://dl.bintray.com/eclipse-cs/eclipse-cs/8.18.0</eclipse.checkstyle.repository>
34+
<eclipse.repository>https://download.eclipse.org/releases/2020-03/202003181000/</eclipse.repository>
35+
<eclipse.java14.repository>https://download.eclipse.org/eclipse/updates/4.15-P-builds/</eclipse.java14.repository>
36+
<eclipse.checkstyle.repository>https://dl.bintray.com/eclipse-cs/eclipse-cs/8.32.0
37+
</eclipse.checkstyle.repository>
3638
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
3739
<ant.version>1.8.1</ant.version>
3840
<ant-contrib.version>1.0b3</ant-contrib.version>
@@ -42,16 +44,18 @@
4244
<gradle.version>3.4</gradle.version>
4345
<groovy.version>2.4.7</groovy.version>
4446
<maven-core.version>3.5.0</maven-core.version>
45-
<maven-plugin-api.version>${maven-core.version}</maven-plugin-api.version>
46-
<maven-plugin-annotations.version>3.5</maven-plugin-annotations.version>
47+
<maven-plugin-api.version>${maven-core.version}
48+
</maven-plugin-api.version>
49+
<maven-plugin-annotations.version>3.5
50+
</maven-plugin-annotations.version>
4751
<mockito.version>2.8.47</mockito.version>
4852
<junit.version>4.12</junit.version>
4953
<javassist.version>3.21.0-GA</javassist.version>
5054
<picocontainer.version>1.2</picocontainer.version>
5155
<system-rules.version>1.16.0</system-rules.version>
5256
<trove4j.version>3.0.3</trove4j.version>
53-
<tycho.version>1.4.0</tycho.version>
54-
<tycho-extras.version>1.4.0</tycho-extras.version>
57+
<tycho.version>1.7.0</tycho.version>
58+
<tycho-extras.version>1.7.0</tycho-extras.version>
5559
</properties>
5660
<build>
5761
<pluginManagement>
@@ -212,7 +216,8 @@
212216
<exclude>**/Abstract*.java</exclude>
213217
</excludes>
214218
<argLine>${ui.test.vmargs}</argLine>
215-
<forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
219+
<forkedProcessTimeoutInSeconds>7200
220+
</forkedProcessTimeoutInSeconds>
216221
<useUIHarness>false</useUIHarness>
217222
</configuration>
218223
</plugin>
@@ -447,9 +452,12 @@
447452
<configuration>
448453
<skip>${disable.checks}</skip>
449454
<configLocation>src/checkstyle/checkstyle.xml</configLocation>
450-
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
451-
<headerLocation>src/checkstyle/checkstyle-header.txt</headerLocation>
452-
<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion>
455+
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml
456+
</suppressionsLocation>
457+
<headerLocation>src/checkstyle/checkstyle-header.txt
458+
</headerLocation>
459+
<propertyExpansion>checkstyle.build.directory=${project.build.directory}
460+
</propertyExpansion>
453461
<encoding>UTF-8</encoding>
454462
<consoleOutput>true</consoleOutput>
455463
<failsOnError>true</failsOnError>
@@ -592,6 +600,11 @@
592600
<layout>p2</layout>
593601
<url>${eclipse.repository}</url>
594602
</repository>
603+
<repository>
604+
<id>eclipse-java14</id>
605+
<layout>p2</layout>
606+
<url>${eclipse.java14.repository}</url>
607+
</repository>
595608
<repository>
596609
<id>eclipse-checkstyle</id>
597610
<layout>p2</layout>
@@ -615,7 +628,8 @@
615628
</os>
616629
</activation>
617630
<properties>
618-
<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</ui.test.vmargs>
631+
<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread
632+
</ui.test.vmargs>
619633
</properties>
620634
</profile>
621635
<profile>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.ui,
1616
org.eclipse.m2e.jdt;resolution:=optional,
1717
org.eclipse.m2e.core;resolution:=optional,
1818
org.eclipse.m2e.maven.runtime;resolution:=optional,
19-
org.eclipse.buildship.core;bundle-version="[3.0.0,3.3.0)";resolution:=optional,
20-
net.sf.eclipsecs.core;bundle-version="8.18.0";resolution:=optional
19+
org.eclipse.buildship.core;resolution:=optional,
20+
net.sf.eclipsecs.core;resolution:=optional
2121
Bundle-ClassPath: .,
2222
lib/spring-javaformat-formatter-eclipse.jar,
2323
lib/spring-javaformat-formatter.jar,

0 commit comments

Comments
 (0)