Skip to content

Commit b4bea5c

Browse files
committed
add vaadin-dev dependencies to all 25 projects
1 parent fc7f33c commit b4bea5c

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

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

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -514,31 +514,12 @@ replaceVaadinSpringWithStarter() {
514514
## Checks if Spring is not present in build files and adds vaadin-dev dependency
515515
## TODO: verify that is explained in migration guide
516516
addDevModeIfNeeded() {
517-
local has_spring=false
518-
519-
# Check for Spring in Maven pom.xml
520-
if [ -f "pom.xml" ]; then
521-
if grep -qi "spring" pom.xml 2>/dev/null; then
522-
has_spring=true
523-
[ -z "$TEST" ] && log "Spring detected in pom.xml, skipping vaadin-dev"
524-
fi
525-
fi
526-
527-
# Check for Spring in Gradle build.gradle
528-
if [ -f "build.gradle" ]; then
529-
if grep -qi "spring" build.gradle 2>/dev/null; then
530-
has_spring=true
531-
[ -z "$TEST" ] && log "Spring detected in build.gradle, skipping vaadin-dev"
532-
fi
533-
fi
534-
535517
# Add vaadin-dev dependency if Spring is not found
536-
if [ "$has_spring" = false ]; then
537518
# Handle Maven projects
538519
if [ -f "pom.xml" ]; then
539520
# Check for actual dependency, not exclusions
540521
if ! grep -A 2 -B 2 "vaadin-dev" pom.xml 2>/dev/null | grep -q "<dependency>" 2>/dev/null; then
541-
[ -z "$TEST" ] && log "Adding vaadin-dev dependency to Maven project (no Spring detected)"
522+
[ -z "$TEST" ] && log "Adding vaadin-dev dependency to Maven project"
542523
addMavenDep "com.vaadin" "vaadin-dev" "compile"
543524
else
544525
[ -z "$TEST" ] && log "vaadin-dev dependency already present in Maven project"
@@ -548,15 +529,12 @@ addDevModeIfNeeded() {
548529
# Handle Gradle projects
549530
if [ -f "build.gradle" ]; then
550531
if ! grep -q "vaadin-dev" build.gradle 2>/dev/null; then
551-
[ -z "$TEST" ] && log "Adding vaadin-dev dependency to Gradle project (no Spring detected)"
532+
[ -z "$TEST" ] && log "Adding vaadin-dev dependency to Gradle project"
552533
addGradleDep "com.vaadin" "vaadin-dev"
553534
else
554535
[ -z "$TEST" ] && log "vaadin-dev dependency already present in Gradle project"
555536
fi
556537
fi
557-
else
558-
[ -z "$TEST" ] && log "Spring framework detected, skipping vaadin-dev dependency"
559-
fi
560538
}
561539

562540
## Adds Hilla Spring Boot Starter dependency if project uses Hilla

0 commit comments

Comments
 (0)