Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN \
WORKDIR /app/walking-skeleton-generator
RUN \
--mount=type=cache,target=/root/.m2 \
mvn -C clean package -Pproduction
mvn -C clean package
RUN mv target/*.jar target/generator.jar

# Generate config files
Expand Down
2 changes: 1 addition & 1 deletion walking-skeleton/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN --mount=type=cache,target=/root/.m2 \
--mount=type=secret,id=offlineKey \
sh -c 'PRO_KEY=$(jq -r ".proKey // empty" /run/secrets/proKey 2>/dev/null || echo "") && \
OFFLINE_KEY=$(cat /run/secrets/offlineKey 2>/dev/null || echo "") && \
./mvnw clean package -Pproduction -DskipTests -Dvaadin.proKey=${PRO_KEY} -Dvaadin.offlineKey=${OFFLINE_KEY}'
./mvnw clean package -DskipTests -Dvaadin.proKey=${PRO_KEY} -Dvaadin.offlineKey=${OFFLINE_KEY}'

FROM eclipse-temurin:21-jre-alpine
COPY --from=build /app/target/*.jar app.jar
Expand Down
2 changes: 1 addition & 1 deletion walking-skeleton/README-empty.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You can also start the application from the command line by running:
To build the application in production mode, run:

```bash
./mvnw -Pproduction package
./mvnw package
```

To build a Docker image, run:
Expand Down
2 changes: 1 addition & 1 deletion walking-skeleton/README-flow.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ You can also start the application from the command line by running:
To build the application in production mode, run:

```bash
./mvnw -Pproduction package
./mvnw package
```

To build a Docker image, run:
Expand Down
2 changes: 1 addition & 1 deletion walking-skeleton/README-hilla.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ You can also start the application from the command line by running:
To build the application in production mode, run:

```bash
./mvnw -Pproduction package
./mvnw package
```

To build a Docker image, run:
Expand Down
2 changes: 1 addition & 1 deletion walking-skeleton/README-hybrid.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You can also start the application from the command line by running:
To build the application in production mode, run:

```bash
./mvnw -Pproduction package
./mvnw package
```

To build a Docker image, run:
Expand Down
54 changes: 17 additions & 37 deletions walking-skeleton/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.0.0-M3</version>
<version>4.0.0-SNAPSHOT</version>
<relativePath/>
</parent>

Expand All @@ -40,6 +40,11 @@
<!-- Replace artifactId with vaadin-core to use only free components -->
<artifactId>vaadin</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-dev</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring-boot-starter</artifactId>
Expand All @@ -65,6 +70,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<!-- Set false to exclude optional dependencies like vaadin-dev. -->
<includeOptional>false</includeOptional>
Copy link
Member

@Artur- Artur- Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this the default in Spring Boot 4?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we probably end up removing this for v25 branches. For branches still using SB 3 (if we update those too) it will be true by default.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this is a PR for v25?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean the moment when we have something else than SNAPSHOT to use and flow is updated too.

</configuration>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
Expand Down Expand Up @@ -103,47 +112,18 @@
<goal>prepare-frontend</goal>
</goals>
</execution>
<execution>
<id>package-for-production</id>
<goals>
<goal>build-frontend</goal>
</goals>
<phase>prepare-package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>production</id>
<dependencies>
<dependency>
<!-- Exclude development dependencies from production -->
<groupId>com.vaadin</groupId>
<artifactId>vaadin-core</artifactId>
<exclusions>
<exclusion>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-dev</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-maven-plugin</artifactId>
<version>${vaadin.version}</version>
<executions>
<execution>
<goals>
<goal>build-frontend</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
<repository>
<id>vaadin-directory</id>
Expand Down
Loading