BoykoAlex ba8af9f132 Merge branch 'master' into request-mappings ...

# Conflicts:
#	headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
#	headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java
#	headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java
#	headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
#	headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java

2017-10-26 21:04:44 -04:00

..

.settings

Detect boot app processes launched from fatjar / thinjar boot launcher

2017-10-20 15:40:01 -07:00

src

Merge branch 'master' into request-mappings

2017-10-26 21:04:44 -04:00

.classpath

Start adding some tests for SpringBootApp discovery and actuator client

2017-10-19 15:55:18 -07:00

.project

PT ##143653365 + PT ##143653925: simple main class that identifies running boot apps and tries to find the port information

2017-05-12 11:08:41 +02:00

pom.xml

Merge branch 'master' into request-mappings

2017-10-26 21:04:44 -04:00