Skip to content

Commit 7be0d2c

Browse files
committed
temporary fix elemental in bookstore
1 parent 35e9978 commit 7be0d2c

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

scripts/pit/lib/lib-patch-v25.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ applyv25patches() {
77

88
case $vers_ in
99
*beta1|*beta2|*beta3) SV=4.0.0-M3 ;;
10-
*) SV=4.0.0-RC1 ;;
10+
*) SV=4.0.0-RC2 ;;
1111
esac
1212
changeMavenBlock parent org.springframework.boot spring-boot-starter-parent $SV
1313
setVersionInGradle "org.springframework.boot" $SV
@@ -48,8 +48,9 @@ applyv25patches() {
4848
## TODO: Update Lumo imports in TypeScript files
4949
patchLumoImports
5050
;;
51-
archetype-spring)
52-
## TODO: should we deliver starters or demos with property enabled?
51+
archetype-spring|initializer-vaadin-maven-react)
52+
## TODO: spring 4 does not enables this prop as default as before
53+
## should we deliver starters or demos with property enabled?
5354
enableLiveReload
5455
;;
5556
start)
@@ -59,6 +60,10 @@ applyv25patches() {
5960
## For some reason npm install glob@^11.0.3 --save modifies devdeps but not deps
6061
perl -0777 -pi -e 's|( "lit":)|\n "glob": "^11.0.3",$1|' package.json
6162
;;
63+
bookstore-example)
64+
## TODO: check that documentation mention elemental is not a transitive dep anymore
65+
addMavenDep "com.google.gwt" "gwt-elemental" compile '\<version\>2.9.0\</version\>'
66+
;;
6267
esac
6368

6469
## TODO: document in migration guide to 25

scripts/pit/lib/lib-utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ addRepoToPom() {
828828
addMavenDep() {
829829
local GI=$1; local AI=$2; local SC=$3; local EX="$4"
830830
local t=' '
831-
__cmd="perl -0777 -pi -e 's|(\n[ \t]*)(</dependencies>\s+<build>)|\$1$t<dependency>\$1$t$t<groupId>${GI}</groupId>\$1$t$t<artifactId>${AI}</artifactId>\$1$t$t<scope>${SC}</scope>${EX}\$1$t</dependency>\$1\$2|' pom.xml"
831+
__cmd="perl -0777 -pi -e 's|(\n[ \t]*)(</dependencies>\s+(<build>\|<repo))|\$1$t<dependency>\$1$t$t<groupId>${GI}</groupId>\$1$t$t<artifactId>${AI}</artifactId>\$1$t$t<scope>${SC}</scope>${EX}\$1$t</dependency>\$1\$2|' pom.xml"
832832
runCmd -f "Adding dependency $GI $AI $SC to pom.xml" "$__cmd"
833833
}
834834

0 commit comments

Comments
 (0)