Skip to content

Commit 11b6cfa

Browse files
committed
Add "validation-api" dependency in jetty
1 parent 508891b commit 11b6cfa

File tree

4 files changed

+48
-6
lines changed

4 files changed

+48
-6
lines changed

src/main/resources/v2/JavaJaxRS/cxf/pom.mustache

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@
3939
<idleTimeout>60000</idleTimeout>
4040
</httpConnector>
4141
</configuration>
42+
{{#useBeanValidation}}
43+
<dependencies>
44+
<dependency>
45+
<groupId>javax.validation</groupId>
46+
<artifactId>validation-api</artifactId>
47+
<version>${beanvalidation-version}</version>
48+
</dependency>
49+
</dependencies>
50+
{{/useBeanValidation}}
4251
<executions>
4352
<execution>
4453
<id>start-jetty</id>
@@ -194,9 +203,9 @@
194203
<junit-version>4.12</junit-version>
195204
<logback-version>1.1.7</logback-version>
196205
<servlet-api-version>2.5</servlet-api-version>
197-
{{#useBeanValidation}}
206+
{{#useBeanValidation}}
198207
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
199-
{{/useBeanValidation}}
208+
{{/useBeanValidation}}
200209
<cxf-version>3.2.1</cxf-version>
201210
<jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
202211
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/resources/v2/JavaJaxRS/cxf/server/pom.mustache

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@
3939
<idleTimeout>60000</idleTimeout>
4040
</httpConnector>
4141
</configuration>
42+
{{#useBeanValidation}}
43+
<dependencies>
44+
<dependency>
45+
<groupId>javax.validation</groupId>
46+
<artifactId>validation-api</artifactId>
47+
<version>${beanvalidation-version}</version>
48+
</dependency>
49+
</dependencies>
50+
{{/useBeanValidation}}
4251
<executions>
4352
<execution>
4453
<id>start-jetty</id>
@@ -245,9 +254,9 @@
245254
<junit-version>4.12</junit-version>
246255
<logback-version>1.1.7</logback-version>
247256
<servlet-api-version>2.5</servlet-api-version>
248-
{{#useBeanValidation}}
257+
{{#useBeanValidation}}
249258
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
250-
{{/useBeanValidation}}
259+
{{/useBeanValidation}}
251260
{{#generateSpringApplication}}
252261
<spring-version>4.3.13.RELEASE</spring-version>
253262
{{/generateSpringApplication}}

src/main/resources/v2/JavaJaxRS/libraries/jersey1/pom.mustache

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,15 @@
4242
<idleTimeout>60000</idleTimeout>
4343
</httpConnector>
4444
</configuration>
45+
{{#useBeanValidation}}
46+
<dependencies>
47+
<dependency>
48+
<groupId>javax.validation</groupId>
49+
<artifactId>validation-api</artifactId>
50+
<version>${beanvalidation-version}</version>
51+
</dependency>
52+
</dependencies>
53+
{{/useBeanValidation}}
4554
<executions>
4655
<execution>
4756
<id>start-jetty</id>
@@ -173,7 +182,7 @@
173182
<dependency>
174183
<groupId>javax.validation</groupId>
175184
<artifactId>validation-api</artifactId>
176-
<version>1.1.0.Final</version>
185+
<version>${beanvalidation-version}</version>
177186
<scope>provided</scope>
178187
</dependency>
179188
{{/useBeanValidation}}
@@ -198,6 +207,9 @@
198207
<slf4j-version>1.7.21</slf4j-version>
199208
<junit-version>4.12</junit-version>
200209
<servlet-api-version>2.5</servlet-api-version>
210+
{{#useBeanValidation}}
211+
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
212+
{{/useBeanValidation}}
201213
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
202214
</properties>
203215
</project>

src/main/resources/v2/JavaJaxRS/pom.mustache

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@
5151
<idleTimeout>60000</idleTimeout>
5252
</httpConnector>
5353
</configuration>
54+
{{#useBeanValidation}}
55+
<dependencies>
56+
<dependency>
57+
<groupId>javax.validation</groupId>
58+
<artifactId>validation-api</artifactId>
59+
<version>${beanvalidation-version}</version>
60+
</dependency>
61+
</dependencies>
62+
{{/useBeanValidation}}
5463
<executions>
5564
<execution>
5665
<id>start-jetty</id>
@@ -178,7 +187,7 @@
178187
<dependency>
179188
<groupId>javax.validation</groupId>
180189
<artifactId>validation-api</artifactId>
181-
<version>1.1.0.Final</version>
190+
<version>${beanvalidation-version}</version>
182191
<scope>provided</scope>
183192
</dependency>
184193
{{/useBeanValidation}}
@@ -208,6 +217,9 @@
208217
<junit-version>4.12</junit-version>
209218
<logback-version>1.1.7</logback-version>
210219
<servlet-api-version>2.5</servlet-api-version>
220+
{{#useBeanValidation}}
221+
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
222+
{{/useBeanValidation}}
211223
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
212224
</properties>
213225
</project>

0 commit comments

Comments
 (0)