|
25 | 25 | <enforcer.skip>true</enforcer.skip>
|
26 | 26 | <deploy.skip>true</deploy.skip>
|
27 | 27 | <maven.javadoc.skip>true</maven.javadoc.skip>
|
| 28 | + <!-- |
| 29 | + The build-helper-maven-plugin is used to add Bean Validation 2.0 source folder to the BV implementations |
| 30 | + that are 2.0+. Since we are also using this plugin to parse versions in the root pom we want to control |
| 31 | + when the sources are added with this property: |
| 32 | + --> |
| 33 | + <add.bv2.sources.skip>true</add.bv2.sources.skip> |
28 | 34 |
|
29 | 35 | <!--
|
30 | 36 | Need to specify something, since the plugin cannot handle empty options. Using something which does not have
|
|
81 | 87 | <goal>add-source</goal>
|
82 | 88 | </goals>
|
83 | 89 | <configuration>
|
| 90 | + <skipAddSource>${add.bv2.sources.skip}</skipAddSource> |
84 | 91 | <sources>
|
85 | 92 | <source>${project.basedir}/src/main/java-bv2</source>
|
86 | 93 | </sources>
|
|
163 | 170 | <properties>
|
164 | 171 | <beanvalidation-impl.name>Hibernate Validator</beanvalidation-impl.name>
|
165 | 172 | <beanvalidation-impl.version>${project.version}</beanvalidation-impl.version>
|
| 173 | + <add.bv2.sources.skip>false</add.bv2.sources.skip> |
166 | 174 | </properties>
|
167 | 175 | <dependencies>
|
168 | 176 | <dependency>
|
|
183 | 191 | <artifactId>log4j</artifactId>
|
184 | 192 | </dependency>
|
185 | 193 | </dependencies>
|
186 |
| - <!-- adding sources for BV 2.0 tests --> |
187 |
| - <build> |
188 |
| - <plugins> |
189 |
| - <plugin> |
190 |
| - <groupId>org.codehaus.mojo</groupId> |
191 |
| - <artifactId>build-helper-maven-plugin</artifactId> |
192 |
| - </plugin> |
193 |
| - </plugins> |
194 |
| - </build> |
195 | 194 | </profile>
|
196 | 195 | <profile>
|
197 | 196 | <id>hv-6.1</id>
|
|
205 | 204 | <validation-api.version>2.0.1.Final</validation-api.version>
|
206 | 205 | <beanvalidation-impl.name>Hibernate Validator</beanvalidation-impl.name>
|
207 | 206 | <beanvalidation-impl.version>6.1.2.Final</beanvalidation-impl.version>
|
| 207 | + <add.bv2.sources.skip>false</add.bv2.sources.skip> |
208 | 208 | </properties>
|
209 | 209 | <dependencies>
|
210 | 210 | <dependency>
|
|
227 | 227 | <artifactId>log4j</artifactId>
|
228 | 228 | </dependency>
|
229 | 229 | </dependencies>
|
230 |
| - <!-- adding sources for BV 2.0 tests --> |
231 |
| - <build> |
232 |
| - <plugins> |
233 |
| - <plugin> |
234 |
| - <groupId>org.codehaus.mojo</groupId> |
235 |
| - <artifactId>build-helper-maven-plugin</artifactId> |
236 |
| - </plugin> |
237 |
| - </plugins> |
238 |
| - </build> |
239 | 230 | </profile>
|
240 | 231 | <profile>
|
241 | 232 | <id>hv-6.0</id>
|
|
249 | 240 | <validation-api.version>2.0.1.Final</validation-api.version>
|
250 | 241 | <beanvalidation-impl.name>Hibernate Validator</beanvalidation-impl.name>
|
251 | 242 | <beanvalidation-impl.version>6.0.19.Final</beanvalidation-impl.version>
|
| 243 | + <add.bv2.sources.skip>false</add.bv2.sources.skip> |
252 | 244 | </properties>
|
253 | 245 | <dependencies>
|
254 | 246 | <dependency>
|
|
271 | 263 | <artifactId>log4j</artifactId>
|
272 | 264 | </dependency>
|
273 | 265 | </dependencies>
|
274 |
| - <!-- adding sources for BV 2.0 tests --> |
275 |
| - <build> |
276 |
| - <plugins> |
277 |
| - <plugin> |
278 |
| - <groupId>org.codehaus.mojo</groupId> |
279 |
| - <artifactId>build-helper-maven-plugin</artifactId> |
280 |
| - </plugin> |
281 |
| - </plugins> |
282 |
| - </build> |
283 | 266 | </profile>
|
284 | 267 | <profile>
|
285 | 268 | <id>hv-5.4</id>
|
|
0 commit comments