diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 5f399c103..9ddc42f75 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -212,6 +212,51 @@
+
+ e49
+
+ e4.9.0
+ e4.9
+ 2018-09
+ 2018-09 (4.9)
+ 2018-09
+ 4.9
+ e49
+
+
+
+ photon
+ p2
+ http://download.eclipse.org/releases/2018-09/
+
+
+ staging
+ p2
+ http://download.eclipse.org/staging/2018-09/
+
+
+ orbit
+ p2
+ http://download.eclipse.org/tools/orbit/downloads/drops/S20180710163057/repository
+
+
+ e-i-commons
+ p2
+ http://dist.springframework.org/snapshot/IDE/nightly
+
+
+ lsp4e
+ p2
+ http://download.eclipse.org/lsp4e/snapshots/
+
+
+ tm4e
+ p2
+ http://download.eclipse.org/tm4e/snapshots/
+
+
+
+
build.springsource.com
diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/JavaProject.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/JavaProject.java
index 01150d681..6173593cf 100644
--- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/JavaProject.java
+++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/JavaProject.java
@@ -74,4 +74,9 @@ public class JavaProject implements IJavaProject, Disposable {
public boolean exists() {
return new File(uri).exists();
}
+
+ @Override
+ public String toString() {
+ return "JavaProject("+uri+")";
+ }
}
diff --git a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/UriUtil.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/UriUtil.java
index 660a0416e..201f12a7d 100644
--- a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/UriUtil.java
+++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/UriUtil.java
@@ -28,7 +28,7 @@ public class UriUtil {
public static String normalize(String uriVal) {
try {
if (uriVal != null && uriVal.startsWith("file:")) {
- File file = new File(URI.create(uriVal));
+ File file = new File(URI.create(uriVal)).getCanonicalFile();
uriVal = file.toURI().toString();
//Careful!!! If the project uri points to a existing project... then it will be
//a directory and then the uri we computed will get a slash at the end.
@@ -39,6 +39,7 @@ public class UriUtil {
while (uriVal.endsWith("/")) {
uriVal = uriVal.substring(0, uriVal.length()-1);
}
+ //Careful on windows, drive letters
return uriVal;
}
} catch (Exception e) {
diff --git a/vscode-extensions/vscode-bosh/CHANGELOG.md b/vscode-extensions/vscode-bosh/CHANGELOG.md
index 4d5e6d431..d7acfbc2a 100644
--- a/vscode-extensions/vscode-bosh/CHANGELOG.md
+++ b/vscode-extensions/vscode-bosh/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2018-08-09 (M14)
+
+* no major changes
+
+## 2018-07-23 (M13)
+
+* no major changes
+
+## 2018-06-08 (M12)
+
+* no major changes
+
## 2018-05-14 (M11)
* _(all)_ JVM used to run the language servers can now be specified via custom settings ([#51](https://github.com/spring-projects/sts4/issues/51))
diff --git a/vscode-extensions/vscode-concourse/CHANGELOG.md b/vscode-extensions/vscode-concourse/CHANGELOG.md
index d1050d12d..a812dc6fd 100644
--- a/vscode-extensions/vscode-concourse/CHANGELOG.md
+++ b/vscode-extensions/vscode-concourse/CHANGELOG.md
@@ -1,7 +1,12 @@
+## 2018-08-09 (M14)
+
+* no major changes
+
## 2018-07-23 (M13)
* _(Concourse)_ Added support for missing attributes to `GitGetParams`, `GitPutParams`, `Job` and `Step` schemas ([#64](https://github.com/spring-projects/sts4/issues/64)), ([#65](https://github.com/spring-projects/sts4/issues/65))
* _(Concourse)_ fixed: Concourse VSCode Extension: Does not recognize GCS buckets in semver resource ([#60](https://github.com/spring-projects/sts4/issues/60))
+
## 2018-06-08 (M12)
* _(Concourse)_ add support for new attributes of DockerImageSource (aws_session_token, max_concurrent_downloads, max_concurrent_uploads) and DockerImagePutParams (additional_tags, cache_from, load_bases, target_name) ([#56](https://github.com/spring-projects/sts4/issues/56))
diff --git a/vscode-extensions/vscode-manifest-yaml/CHANGELOG.md b/vscode-extensions/vscode-manifest-yaml/CHANGELOG.md
index a34d66255..b4d648fc2 100644
--- a/vscode-extensions/vscode-manifest-yaml/CHANGELOG.md
+++ b/vscode-extensions/vscode-manifest-yaml/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2018-08-09 (M14)
+
+* no major changes
+
+## 2018-07-23 (M13)
+
+* no major changes
+
+## 2018-06-08 (M12)
+
+* no major changes
+
## 2018-05-14 (M11)
* _(all)_ JVM used to run the language servers can now be specified via custom settings ([#51](https://github.com/spring-projects/sts4/issues/51))
diff --git a/vscode-extensions/vscode-spring-boot/CHANGELOG.md b/vscode-extensions/vscode-spring-boot/CHANGELOG.md
index 14fc8a0ad..1312f0dfb 100644
--- a/vscode-extensions/vscode-spring-boot/CHANGELOG.md
+++ b/vscode-extensions/vscode-spring-boot/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2018-08-09 (M14)
+
+* _(Spring Boot)_ added support for showing live hovers for Spring Boot apps running remotely (on Cloud Foundry)
+* _(Spring Boot)_ improved and simplified content for live hovers showing bean wiring information
+* _(Spring Boot)_ improved look of live hover highlights
+* (_Spring Boot)_ improved error handling when source code parsing goes wrong
+* (_Spring Boot)_ added specific bean wiring live hovers for `@Autowired` fields and constructors
+* (_Spring Boot)_ user-defined values in property files showing up as suggestions for `@Value` completions
+* (_Spring Boot)_ bean symbols now directly contain additional annotations (like `@Conditional...` or `@Profile`)
+* (_Spring Boot)_ added option to match running process directly to specific project in the workspace (for live hovers) via system property (set `-Dspring.boot.project.name=` to show live hovers of that running process exclusively on the project with that name).
+* (_Spring Boot)_ fixed bug that prevented property editing support to work on Windows ([#59](https://github.com/spring-projects/sts4/issues/59))
+
## 2018-07-23 (M13)
* _(Spring Boot)_ early prototype for detecting changed bean definitions in live-running (and restarted) boot applications