Skip to content

Commit e22f0d6

Browse files
committed
Merge branch 'main' of https://github.com/spring-projects/sts4 into main
2 parents 8a84805 + 2604012 commit e22f0d6

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

concourse/tasks/bump-versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ for extension_id in $(ls -d vscode-*)
1616
do
1717
cd $vscode_sources/$extension_id
1818
echo "Should update version of $extension_id to $version"
19-
npm version $version
19+
npm version --allow-same-version $version
2020
git add package.json
2121
echo ""
2222
done

headless-services/spring-boot-language-server/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ cd ../jdt-ls-extension
66
if command -v xvfb-run ; then
77
echo "Using xvfb to run in headless environment..."
88
xvfb-run ../mvnw \
9+
-DskipTests \
910
-DtrimStackTrace=false \
1011
-f ../pom.xml \
1112
-pl $modules \
1213
-am \
1314
clean install
1415
else
1516
../mvnw \
17+
-DskipTests \
1618
-DtrimStackTrace=false \
1719
-f ../pom.xml \
1820
-pl $modules \
@@ -22,6 +24,7 @@ fi
2224
cd ../xml-ls-extension
2325
../mvnw \
2426
-DtrimStackTrace=false \
27+
-DskipTests \
2528
-f ../pom.xml \
2629
-pl xml-ls-extension \
2730
-am \

vscode-extensions/vscode-spring-boot/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
"title": "Create a new Spring Boot project",
4545
"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)",
4646
"media": {
47-
"image": "walkthroughs/spring-initializr-integration.png",
48-
"altText": "Create a new Maven-based Spring Boot project"
47+
"image": "walkthroughs/spring-initializr-integration.png",
48+
"altText": "Create a new Maven-based Spring Boot project"
4949
}
5050
},
5151
{

0 commit comments

Comments
 (0)