Skip to content

Update TP to I20220216-0600 #2009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2022
Merged

Update TP to I20220216-0600 #2009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220203-0300/"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220216-0600/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.jdt.ls.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
<id>lombok</id>
<activation>
<property>
<name>jdt.ls.lombok.disabled</name>
<value>!true</value>
<name>jdt.ls.lombok.enabled</name>
<value>true</value>
</property>
</activation>
<properties>
<lombokArgs>-javaagent:${basedir}/lib/lombok-1.18.20.jar</lombokArgs>
<lombokArgs>-javaagent:${basedir}/lib/lombok-1.18.22.jar</lombokArgs>
</properties>
<build>
<plugins>
Expand All @@ -53,7 +53,7 @@
<artifactItem>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<version>1.18.22</version>
</artifactItem>
</artifactItems>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ls.tests/projects/maven/mavenlombok/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<version>1.18.22</version>
</dependency>
</dependencies>

Expand Down
36 changes: 0 additions & 36 deletions ...t.ls.tests/src/org/eclipse/jdt/ls/core/internal/correction/SerialVersionQuickFixTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ public void testLocalClass() throws Exception {
buf.append("public class Test5 {\n");
buf.append(" public void test() {\n");
buf.append(" class X implements Serializable, Cloneable, Runnable {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = 1L;\n");
buf.append(" private static final int x= 1;\n");
buf.append(" private Object y;\n");
Expand All @@ -91,9 +88,6 @@ public void testLocalClass() throws Exception {
buf.append("public class Test5 {\n");
buf.append(" public void test() {\n");
buf.append(" class X implements Serializable, Cloneable, Runnable {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = -4564939359985118485L;\n");
buf.append(" private static final int x= 1;\n");
buf.append(" private Object y;\n");
Expand Down Expand Up @@ -136,9 +130,6 @@ public void testAnonymousClass() throws Exception {
buf.append(" protected int var2;\n");
buf.append(" public void test() {\n");
buf.append(" Serializable var3= new Serializable() {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = 1L;\n");
buf.append(" int var4; \n");
buf.append(" };\n");
Expand All @@ -155,9 +146,6 @@ public void testAnonymousClass() throws Exception {
buf.append(" protected int var2;\n");
buf.append(" public void test() {\n");
buf.append(" Serializable var3= new Serializable() {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = -868523843598659436L;\n");
buf.append(" int var4; \n");
buf.append(" };\n");
Expand Down Expand Up @@ -195,9 +183,6 @@ public void testInnerClass() throws Exception {
buf.append(" protected int var1;\n");
buf.append(" protected int var2;\n");
buf.append(" protected class Test1 implements Serializable {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = 1L;\n");
buf.append(" public long var3;\n");
buf.append(" }\n");
Expand All @@ -213,9 +198,6 @@ public void testInnerClass() throws Exception {
buf.append(" protected int var1;\n");
buf.append(" protected int var2;\n");
buf.append(" protected class Test1 implements Serializable {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = -4023230086280104302L;\n");
buf.append(" public long var3;\n");
buf.append(" }\n");
Expand All @@ -241,9 +223,6 @@ public void testOuterClass() throws Exception {
buf.append("package test1;\n");
buf.append("import java.io.Serializable;\n");
buf.append("public class Test1 implements Serializable {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = 1L;\n");
buf.append(" protected int var1;\n");
buf.append(" protected int var2;\n");
Expand All @@ -254,9 +233,6 @@ public void testOuterClass() throws Exception {
buf.append("package test1;\n");
buf.append("import java.io.Serializable;\n");
buf.append("public class Test1 implements Serializable {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = -2242798150684569765L;\n");
buf.append(" protected int var1;\n");
buf.append(" protected int var2;\n");
Expand Down Expand Up @@ -293,9 +269,6 @@ public void testOuterClass2() throws Exception {
buf.append("package test3;\n");
buf.append("import java.util.EventObject;\n");
buf.append("public class Test4 extends EventObject {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = 1L;\n");
buf.append(" private static final int x;\n");
buf.append(" private static Class[] a2;\n");
Expand All @@ -317,9 +290,6 @@ public void testOuterClass2() throws Exception {
buf.append("package test3;\n");
buf.append("import java.util.EventObject;\n");
buf.append("public class Test4 extends EventObject {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = -7476608308201363525L;\n");
buf.append(" private static final int x;\n");
buf.append(" private static Class[] a2;\n");
Expand Down Expand Up @@ -358,9 +328,6 @@ public void testOuterClass3() throws Exception {
buf.append("package a.b.c;\n");
buf.append("import java.io.Serializable;\n");
buf.append("public class Test1 implements Serializable {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = 1L;\n");
buf.append(" protected int var1;\n");
buf.append(" class Test1Inner {}\n");
Expand All @@ -371,9 +338,6 @@ public void testOuterClass3() throws Exception {
buf.append("package a.b.c;\n");
buf.append("import java.io.Serializable;\n");
buf.append("public class Test1 implements Serializable {\n");
buf.append(" /**\n");
buf.append(" *\n");
buf.append(" */\n");
buf.append(" private static final long serialVersionUID = -3715240305486851194L;\n");
buf.append(" protected int var1;\n");
buf.append(" class Test1Inner {}\n");
Expand Down