Skip to content

Commit 761ce57

Browse files
dkapildkapil
committed
Merge branch 'master' of https://github.com/eugenp/tutorials into task/BAEL-8840
2 parents 297f5f6 + e8a4138 commit 761ce57

File tree

12 files changed

+61
-111
lines changed

12 files changed

+61
-111
lines changed

‎parent-boot-1/pom.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,17 @@
3737
</dependencies>
3838

3939
<build>
40-
<plugins>
41-
<plugin>
42-
<groupId>org.springframework.boot</groupId>
43-
<artifactId>spring-boot-maven-plugin</artifactId>
44-
<version>1.5.15.RELEASE</version>
45-
</plugin>
46-
</plugins>
40+
<pluginManagement>
41+
<plugins>
42+
<plugin>
43+
<groupId>org.springframework.boot</groupId>
44+
<artifactId>spring-boot-maven-plugin</artifactId>
45+
<version>1.5.15.RELEASE</version>
46+
</plugin>
47+
</plugins>
48+
</pluginManagement>
4749
</build>
4850

49-
5051
<properties>
5152
<rest-assured.version>3.1.0</rest-assured.version>
5253
</properties>

‎parent-boot-2/pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@
3636
</dependencies>
3737

3838
<build>
39-
<plugins>
40-
<plugin>
41-
<groupId>org.springframework.boot</groupId>
42-
<artifactId>spring-boot-maven-plugin</artifactId>
43-
<version>2.0.4.RELEASE</version>
44-
</plugin>
45-
</plugins>
39+
<pluginManagement>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-maven-plugin</artifactId>
44+
<version>2.0.4.RELEASE</version>
45+
</plugin>
46+
</plugins>
47+
</pluginManagement>
4648
</build>
4749

4850
<profiles>

‎pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@
579579
<module>testing-modules/mockserver</module>
580580
<module>testing-modules/test-containers</module>
581581
<module>undertow</module>
582+
<module>vaadin</module>
582583
<module>vertx-and-rxjava</module>
583584
<module>saas</module>
584585
<module>deeplearning4j</module>
@@ -1126,6 +1127,7 @@
11261127
<module>testing-modules/mockserver</module>
11271128
<module>testing-modules/test-containers</module>
11281129
<module>undertow</module>
1130+
<module>vaadin</module>
11291131
<module>vertx-and-rxjava</module>
11301132
<module>saas</module>
11311133
<module>deeplearning4j</module>

‎vaadin-spring/pom.xml

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎vaadin-spring/src/main/resources/logback.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎vaadin/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
## Relevant articles:
22

33
- [Introduction to Vaadin](http://www.baeldung.com/vaadin)
4+
- [Sample Application with Spring Boot and Vaadin](https://www.baeldung.com/spring-boot-vaadin)

‎vaadin/pom.xml

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,30 @@
88
<packaging>war</packaging>
99
<version>1.0-SNAPSHOT</version>
1010
<name>Vaadin</name>
11-
<prerequisites>
12-
<maven>3</maven>
13-
</prerequisites>
14-
11+
1512
<parent>
13+
<artifactId>parent-boot-2</artifactId>
1614
<groupId>com.baeldung</groupId>
17-
<artifactId>parent-modules</artifactId>
18-
<version>1.0.0-SNAPSHOT</version>
15+
<version>0.0.1-SNAPSHOT</version>
16+
<relativePath>../parent-boot-2</relativePath>
1917
</parent>
2018

19+
<dependencyManagement>
20+
<dependencies>
21+
<dependency>
22+
<groupId>com.vaadin</groupId>
23+
<artifactId>vaadin-bom</artifactId>
24+
<version>${vaadin.version}</version>
25+
<type>pom</type>
26+
<scope>import</scope>
27+
</dependency>
28+
</dependencies>
29+
</dependencyManagement>
30+
2131
<dependencies>
2232
<dependency>
2333
<groupId>javax.servlet</groupId>
2434
<artifactId>javax.servlet-api</artifactId>
25-
<version>${servlet.version}</version>
2635
<scope>provided</scope>
2736
</dependency>
2837
<dependency>
@@ -41,6 +50,25 @@
4150
<groupId>com.vaadin</groupId>
4251
<artifactId>vaadin-themes</artifactId>
4352
</dependency>
53+
54+
<dependency>
55+
<groupId>org.springframework.boot</groupId>
56+
<artifactId>spring-boot-starter-data-jpa</artifactId>
57+
</dependency>
58+
<dependency>
59+
<groupId>com.vaadin</groupId>
60+
<artifactId>vaadin-spring-boot-starter</artifactId>
61+
<version>${vaadin-spring-boot-starter.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>com.h2database</groupId>
65+
<artifactId>h2</artifactId>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.springframework.boot</groupId>
69+
<artifactId>spring-boot-starter-test</artifactId>
70+
<scope>test</scope>
71+
</dependency>
4472
</dependencies>
4573

4674
<build>
@@ -97,21 +125,13 @@
97125
<scanIntervalSeconds>2</scanIntervalSeconds>
98126
</configuration>
99127
</plugin>
128+
<plugin>
129+
<groupId>org.springframework.boot</groupId>
130+
<artifactId>spring-boot-maven-plugin</artifactId>
131+
</plugin>
100132
</plugins>
101133
</build>
102134

103-
<dependencyManagement>
104-
<dependencies>
105-
<dependency>
106-
<groupId>com.vaadin</groupId>
107-
<artifactId>vaadin-bom</artifactId>
108-
<version>${vaadin.version}</version>
109-
<type>pom</type>
110-
<scope>import</scope>
111-
</dependency>
112-
</dependencies>
113-
</dependencyManagement>
114-
115135
<repositories>
116136
<repository>
117137
<id>vaadin-addons</id>
@@ -166,6 +186,7 @@
166186
<servlet.version>3.0.1</servlet.version>
167187
<vaadin.version>7.7.10</vaadin.version>
168188
<vaadin.plugin.version>8.0.6</vaadin.plugin.version>
189+
<vaadin-spring-boot-starter.version>10.0.1</vaadin-spring-boot-starter.version>
169190
<jetty.plugin.version>9.3.9.v20160517</jetty.plugin.version>
170191
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
171192
<maven.compiler.source>1.8</maven.compiler.source>

‎vaadin-spring/src/main/java/com/baeldung/Application.java renamed to ‎vaadin/src/main/java/com/baeldung/Application.java

File renamed without changes.

‎vaadin-spring/src/main/java/com/baeldung/Employee.java renamed to ‎vaadin/src/main/java/com/baeldung/Employee.java

File renamed without changes.

‎vaadin-spring/src/main/java/com/baeldung/EmployeeEditor.java renamed to ‎vaadin/src/main/java/com/baeldung/EmployeeEditor.java

File renamed without changes.

‎vaadin-spring/src/main/java/com/baeldung/EmployeeRepository.java renamed to ‎vaadin/src/main/java/com/baeldung/EmployeeRepository.java

File renamed without changes.

‎vaadin-spring/src/main/java/com/baeldung/MainView.java renamed to ‎vaadin/src/main/java/com/baeldung/MainView.java

File renamed without changes.

0 commit comments

Comments
 (0)