Skip to content

Commit 2d18bc3

Browse files
AB-xdevAB-xdev
committed
Track correction III
1 parent d555c76 commit 2d18bc3

File tree

1 file changed

+126
-31
lines changed

1 file changed

+126
-31
lines changed

‎vaadin-addon-template-demo/pom.xml‎

Lines changed: 126 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>com.xdev-software</groupId>
8-
<artifactId>standard-maven-template-demo</artifactId>
8+
<artifactId>vaadin-addon-template-demo</artifactId>
99
<version>1.0.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

@@ -23,21 +23,91 @@
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525

26-
<mainClass>software.xdev.Application</mainClass>
26+
<mainClass>software.xdev.vaadin.Application</mainClass>
27+
28+
<!-- Dependency-Versions -->
29+
<vaadin.version>24.0.5</vaadin.version>
30+
31+
<org.springframework.boot.version>3.1.0</org.springframework.boot.version>
2732
</properties>
2833

34+
<dependencyManagement>
35+
<dependencies>
36+
<dependency>
37+
<groupId>com.vaadin</groupId>
38+
<artifactId>vaadin-bom</artifactId>
39+
<type>pom</type>
40+
<scope>import</scope>
41+
<version>${vaadin.version}</version>
42+
</dependency>
43+
44+
<!-- Spring Boot -->
45+
<!-- This bom provides versions for ~500 dependencies -->
46+
<!-- Nearly at the end so that it doesn't accidentally overwrite other versions -->
47+
<dependency>
48+
<groupId>org.springframework.boot</groupId>
49+
<artifactId>spring-boot-dependencies</artifactId>
50+
<version>${org.springframework.boot.version}</version>
51+
<type>pom</type>
52+
<scope>import</scope>
53+
</dependency>
54+
</dependencies>
55+
</dependencyManagement>
56+
2957
<dependencies>
58+
<dependency>
59+
<groupId>com.vaadin</groupId>
60+
<artifactId>vaadin-core</artifactId>
61+
</dependency>
3062
<dependency>
3163
<groupId>com.xdev-software</groupId>
32-
<artifactId>standard-maven-template</artifactId>
64+
<artifactId>vaadin-addon-template</artifactId>
3365
<version>${project.version}</version>
3466
</dependency>
67+
68+
<!-- Spring -->
69+
<dependency>
70+
<groupId>com.vaadin</groupId>
71+
<artifactId>vaadin-spring-boot-starter</artifactId>
72+
</dependency>
73+
<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
74+
<dependency>
75+
<groupId>org.yaml</groupId>
76+
<artifactId>snakeyaml</artifactId>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.springframework.boot</groupId>
80+
<artifactId>spring-boot-devtools</artifactId>
81+
<optional>true</optional>
82+
</dependency>
3583
</dependencies>
3684

3785
<build>
3886
<finalName>${project.artifactId}</finalName>
87+
88+
<pluginManagement>
89+
<plugins>
90+
<plugin>
91+
<groupId>org.springframework.boot</groupId>
92+
<artifactId>spring-boot-maven-plugin</artifactId>
93+
<version>${org.springframework.boot.version}</version>
94+
</plugin>
95+
</plugins>
96+
</pluginManagement>
3997

4098
<plugins>
99+
<plugin>
100+
<groupId>com.vaadin</groupId>
101+
<artifactId>vaadin-maven-plugin</artifactId>
102+
<version>${vaadin.version}</version>
103+
<executions>
104+
<execution>
105+
<goals>
106+
<goal>prepare-frontend</goal>
107+
</goals>
108+
</execution>
109+
</executions>
110+
</plugin>
41111
<plugin>
42112
<groupId>org.apache.maven.plugins</groupId>
43113
<artifactId>maven-compiler-plugin</artifactId>
@@ -49,34 +119,59 @@
49119
</compilerArgs>
50120
</configuration>
51121
</plugin>
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-assembly-plugin</artifactId>
55-
<version>3.6.0</version>
56-
<configuration>
57-
<archive>
58-
<manifest>
59-
<mainClass>${mainClass}</mainClass>
60-
</manifest>
61-
<manifestEntries>
62-
<Multi-Release>true</Multi-Release>
63-
</manifestEntries>
64-
</archive>
65-
<descriptorRefs>
66-
<descriptorRef>jar-with-dependencies</descriptorRef>
67-
</descriptorRefs>
68-
<appendAssemblyId>false</appendAssemblyId>
69-
</configuration>
70-
<executions>
71-
<execution>
72-
<id>make-assembly</id> <!-- this is used for inheritance merges -->
73-
<phase>package</phase> <!-- bind to the packaging phase -->
74-
<goals>
75-
<goal>single</goal>
76-
</goals>
77-
</execution>
78-
</executions>
79-
</plugin>
80122
</plugins>
81123
</build>
124+
125+
<profiles>
126+
<profile>
127+
<id>production</id>
128+
<dependencies>
129+
<!-- Exclude development dependencies from production -->
130+
<dependency>
131+
<groupId>com.vaadin</groupId>
132+
<artifactId>vaadin-core</artifactId>
133+
<exclusions>
134+
<exclusion>
135+
<groupId>com.vaadin</groupId>
136+
<artifactId>vaadin-dev</artifactId>
137+
</exclusion>
138+
</exclusions>
139+
</dependency>
140+
</dependencies>
141+
<build>
142+
<plugins>
143+
<plugin>
144+
<groupId>com.vaadin</groupId>
145+
<artifactId>vaadin-maven-plugin</artifactId>
146+
<version>${vaadin.version}</version>
147+
<executions>
148+
<execution>
149+
<goals>
150+
<goal>prepare-frontend</goal>
151+
<goal>build-frontend</goal>
152+
</goals>
153+
</execution>
154+
</executions>
155+
</plugin>
156+
<plugin>
157+
<groupId>org.springframework.boot</groupId>
158+
<artifactId>spring-boot-maven-plugin</artifactId>
159+
<configuration>
160+
<mainClass>${mainClass}</mainClass>
161+
</configuration>
162+
<executions>
163+
<execution>
164+
<id>repackage</id>
165+
<goals>
166+
<goal>repackage</goal>
167+
</goals>
168+
<phase>package</phase>
169+
</execution>
170+
</executions>
171+
</plugin>
172+
</plugins>
173+
</build>
174+
</profile>
175+
</profiles>
176+
82177
</project>

0 commit comments

Comments
 (0)