From cb9a75eff33c5984f4bb7d6b839912784e2d0a37 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Feb 2018 11:11:13 -0800 Subject: [PATCH] Create new boot-language-server project This will be the home of the merged language server (boot-properties + boot-java). --- .../boot-language-server/.classpath | 26 ++++++ .../boot-language-server/.project | 23 +++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 5 ++ .../.settings/org.eclipse.m2e.core.prefs | 4 + .../boot-language-server/build.sh | 3 + .../boot-language-server/pom.xml | 85 +++++++++++++++++++ headless-services/pom.xml | 1 + 8 files changed, 149 insertions(+) create mode 100644 headless-services/boot-language-server/.classpath create mode 100644 headless-services/boot-language-server/.project create mode 100644 headless-services/boot-language-server/.settings/org.eclipse.core.resources.prefs create mode 100644 headless-services/boot-language-server/.settings/org.eclipse.jdt.core.prefs create mode 100644 headless-services/boot-language-server/.settings/org.eclipse.m2e.core.prefs create mode 100755 headless-services/boot-language-server/build.sh create mode 100644 headless-services/boot-language-server/pom.xml diff --git a/headless-services/boot-language-server/.classpath b/headless-services/boot-language-server/.classpath new file mode 100644 index 000000000..af1430be1 --- /dev/null +++ b/headless-services/boot-language-server/.classpath @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/headless-services/boot-language-server/.project b/headless-services/boot-language-server/.project new file mode 100644 index 000000000..6ecf0c8da --- /dev/null +++ b/headless-services/boot-language-server/.project @@ -0,0 +1,23 @@ + + + boot-language-server + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/headless-services/boot-language-server/.settings/org.eclipse.core.resources.prefs b/headless-services/boot-language-server/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/headless-services/boot-language-server/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/headless-services/boot-language-server/.settings/org.eclipse.jdt.core.prefs b/headless-services/boot-language-server/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/headless-services/boot-language-server/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/headless-services/boot-language-server/.settings/org.eclipse.m2e.core.prefs b/headless-services/boot-language-server/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/headless-services/boot-language-server/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/headless-services/boot-language-server/build.sh b/headless-services/boot-language-server/build.sh new file mode 100755 index 000000000..536346853 --- /dev/null +++ b/headless-services/boot-language-server/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash +set -e +../mvnw -f ../pom.xml -pl boot-language-server -am clean install diff --git a/headless-services/boot-language-server/pom.xml b/headless-services/boot-language-server/pom.xml new file mode 100644 index 000000000..63fa3ea43 --- /dev/null +++ b/headless-services/boot-language-server/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + boot-language-server + jar + + + org.springframework.ide.vscode + commons-parent + 0.1.4-SNAPSHOT + ../commons/pom.xml + + + + ${project.version} + + + + + org.springframework.ide.vscode + boot-java-language-server + ${dependencies.version} + + + org.springframework.ide.vscode + boot-properties-language-server + ${dependencies.version} + + + + + org.springframework.ide.vscode + language-server-test-harness + ${dependencies.version} + test + + + + org.mockito + mockito-all + ${mockito-version} + test + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.8 + 1.8 + + + + + org.springframework.boot + spring-boot-maven-plugin + 1.4.1.RELEASE + + + + repackage + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + test-projects/** + + + + + + diff --git a/headless-services/pom.xml b/headless-services/pom.xml index 0f7b1aaf1..b677104e2 100644 --- a/headless-services/pom.xml +++ b/headless-services/pom.xml @@ -13,6 +13,7 @@ commons manifest-yaml-language-server concourse-language-server + boot-language-server boot-properties-language-server boot-java-language-server bosh-language-server