From 13dbd5fa009e82353e36f19d4b7c3fa9355b5c31 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Wed, 31 Jul 2019 15:53:44 +0200
Subject: [PATCH] fix silly attempts to get rid of errors during compilation
 and put the missing import-package in place, otherwise it obviously cannot
 work

---
 .../META-INF/MANIFEST.MF                               |  1 +
 .../org.springframework.tooling.boot.ls/pom.xml        | 10 +---------
 .../boot/ls/DelegatingStreamConnectionProvider.java    |  1 -
 .../tooling/boot/ls/prefs/RemoteAppsPrefs.java         |  1 -
 .../tooling/boot/ls/prefs/RemoteAppsPrefsPage.java     |  1 -
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
index fd8f1678c..c7327b875 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.wst.sse.ui;bundle-version="1.5.0";resolution:=optional,
  org.json;bundle-version="1.0.0"
 Import-Package: com.google.common.base,
+ com.google.common.collect,
  com.google.gson;version="2.7.0",
  org.eclipse.jface.preference,
  org.osgi.framework
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
index 92e380b87..a29133c62 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
@@ -18,15 +18,6 @@
 	<build>
 		<plugins>
 
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -86,6 +77,7 @@
 			</plugin>
 
 		</plugins>
+
 	</build>
 
 </project>
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java
index 44859be6b..9901411fb 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java
@@ -52,7 +52,6 @@ import com.google.common.collect.ImmutableSet;
  * 
  * @author Martin Lippert
  */
-@SuppressWarnings("restriction")
 public class DelegatingStreamConnectionProvider implements StreamConnectionProvider {
 
 	private StreamConnectionProvider provider;
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefs.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefs.java
index 04336fa8f..b2bf5215e 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefs.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefs.java
@@ -27,7 +27,6 @@ import org.springsource.ide.eclipse.commons.livexp.util.Log;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 
-@SuppressWarnings("restriction")
 public class RemoteAppsPrefs {
 
 	public static final String REMOTE_APPS_KEY = "remote-apps";
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefsPage.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefsPage.java
index 7cd073009..fbb555637 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefsPage.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefsPage.java
@@ -18,7 +18,6 @@ import org.springsource.ide.eclipse.commons.livexp.ui.PrefsPageSection;
 
 import com.google.common.collect.ImmutableList;
 
-@SuppressWarnings("restriction")
 public class RemoteAppsPrefsPage extends PreferencePageWithSections {
 
 	public static final String PREF_REMOTE_BOOT_APPS_JSON = "boot-java.remote-apps";