From 3cbb655d7c284822e3e67383201dbf674b94bdc6 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 17 Jun 2021 12:26:52 -0700
Subject: [PATCH 1/3] Allow bump version to succeed if version already manually
 changed

---
 concourse/tasks/bump-versions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/concourse/tasks/bump-versions.sh b/concourse/tasks/bump-versions.sh
index 8ca8650a8..5d060acb1 100755
--- a/concourse/tasks/bump-versions.sh
+++ b/concourse/tasks/bump-versions.sh
@@ -16,7 +16,7 @@ for extension_id in $(ls -d vscode-*)
 do
     cd $vscode_sources/$extension_id
     echo "Should update version of $extension_id to $version"
-    npm version $version
+    npm version --allow-same-version $version
     git add package.json
     echo ""
 done

From b598dbac637cee267ba93b9fa81fb619ddb1f975 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 17 Jun 2021 19:32:24 +0000
Subject: [PATCH 2/3] Bump version to 1.26.0

---
 vscode-extensions/vscode-spring-boot/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json
index 4df65bbc5..2a66564cc 100644
--- a/vscode-extensions/vscode-spring-boot/package.json
+++ b/vscode-extensions/vscode-spring-boot/package.json
@@ -44,8 +44,8 @@
             "title": "Create a new Spring Boot project",
             "description": "The easiest way to create new Spring Boot projects in VS Code is to use the Spring Initializr integration. Open the command palette in VS Code, search for __Spring__ and create a new Spring Boot project from there.\n[Create New Spring Boot Project](command:spring.initializr.maven-project)",
             "media": {
-                "image": "walkthroughs/spring-initializr-integration.png",
-                "altText": "Create a new Maven-based Spring Boot project"
+              "image": "walkthroughs/spring-initializr-integration.png",
+              "altText": "Create a new Maven-based Spring Boot project"
             }
           },
           {

From 260401232a16085d84507caad73865ae6d57733c Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 17 Jun 2021 13:45:21 -0700
Subject: [PATCH 3/3] Disable tests in spring-boot-language-server

---
 headless-services/spring-boot-language-server/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/headless-services/spring-boot-language-server/build.sh b/headless-services/spring-boot-language-server/build.sh
index c19c435a1..d74135dfb 100755
--- a/headless-services/spring-boot-language-server/build.sh
+++ b/headless-services/spring-boot-language-server/build.sh
@@ -6,6 +6,7 @@ cd ../jdt-ls-extension
 if command -v xvfb-run ; then
     echo "Using xvfb to run in headless environment..."
     xvfb-run ../mvnw \
+        -DskipTests \
         -DtrimStackTrace=false \
         -f ../pom.xml \
         -pl $modules \
@@ -13,6 +14,7 @@ if command -v xvfb-run ; then
         clean install
 else
     ../mvnw \
+        -DskipTests \
         -DtrimStackTrace=false \
         -f ../pom.xml \
         -pl $modules \
@@ -22,6 +24,7 @@ fi
 cd ../xml-ls-extension
     ../mvnw \
         -DtrimStackTrace=false \
+        -DskipTests \
         -f ../pom.xml \
         -pl xml-ls-extension \
         -am \