Revision c839d071
Added by Katja Luther over 7 years ago
pom.xml | ||
---|---|---|
8 | 8 |
<name>Vaadin Web Application</name> |
9 | 9 |
<properties> |
10 | 10 |
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
11 |
<vaadin.version>7.3.5</vaadin.version>
|
|
11 |
<vaadin.version>7.6.3</vaadin.version>
|
|
12 | 12 |
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version> |
13 | 13 |
<cdmlib.version>4.0.0-SNAPSHOT</cdmlib.version> |
14 | 14 |
<unitils.version>3.4.2</unitils.version> |
15 |
<spring.version>3.2.2.RELEASE</spring.version>
|
|
15 |
<spring.version>4.2.4.RELEASE</spring.version>
|
|
16 | 16 |
</properties> |
17 | 17 |
<prerequisites> |
18 | 18 |
<maven>3.0.5</maven> |
... | ... | |
175 | 175 |
<version>${spring.version}</version> |
176 | 176 |
<scope>provided</scope> |
177 | 177 |
</dependency> |
178 |
<dependency> |
|
179 |
<groupId>org.springframework</groupId> |
|
180 |
<artifactId>org.springframework.web</artifactId> |
|
181 |
<version>${spring.version}</version> |
|
182 |
<scope>provided</scope> |
|
183 |
</dependency> |
|
184 |
<dependency> |
|
185 |
<groupId>org.springframework</groupId> |
|
186 |
<artifactId>org.springframework.web.servlet</artifactId> |
|
187 |
<version>${spring.version}</version> |
|
188 |
<scope>provided</scope> |
|
189 |
</dependency> |
|
178 |
<dependency> |
|
179 |
<groupId>org.springframework</groupId> |
|
180 |
<artifactId>spring-web</artifactId> |
|
181 |
<version>${spring.version}</version> |
|
182 |
</dependency> |
|
183 |
<dependency> |
|
184 |
<groupId>org.springframework</groupId> |
|
185 |
<artifactId>spring-webmvc</artifactId> |
|
186 |
<version>${spring.version}</version> |
|
187 |
</dependency> |
|
190 | 188 |
<dependency> |
191 | 189 |
<groupId>junit</groupId> |
192 | 190 |
<artifactId>junit</artifactId> |
... | ... | |
359 | 357 |
<version>2.1.3</version> |
360 | 358 |
<scope>test</scope> |
361 | 359 |
</dependency> |
360 |
<dependency> |
|
361 |
<groupId>org.json</groupId> |
|
362 |
<artifactId>json</artifactId> |
|
363 |
<version>20151123</version> |
|
364 |
</dependency> |
|
365 |
|
|
362 | 366 |
</dependencies> |
363 | 367 |
<profiles> |
364 | 368 |
<profile> |
Also available in: Unified diff
fix project after dependency updates