Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit 324e25a

Browse files
h2002044arindam-bandyopadhyay
h2002044
authored and
arindam-bandyopadhyay
committed
Specify bean validation api version for Java EE API jar (#22045)
1 parent 288a1ca commit 324e25a

File tree

4 files changed

+93
-7
lines changed

4 files changed

+93
-7
lines changed

‎appserver/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
<javax.enterprise.deploy-api.version>1.6</javax.enterprise.deploy-api.version>
8181
<javax.security.jacc-api.version>1.5</javax.security.jacc-api.version>
8282
<javax.security.auth.message-api.version>1.1</javax.security.auth.message-api.version>
83+
<!-- Ensure that nucleus/pom.xml's javax.validation property is of same value as the one below -->
84+
<javax.validation-api.version>2.0.0.CR3</javax.validation-api.version>
8385
<javax.security.enterprise-api.version>1.0-b06</javax.security.enterprise-api.version>
8486
<javax.security.enterprise.version>1.0-b07</javax.security.enterprise.version>
8587

‎nucleus/packager/external/bean-validator-cdi/pom.xml‎

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,6 @@
195195
</execution>-->
196196
</executions>
197197
</plugin>
198-
<plugin>
199-
<groupId>org.apache.maven.plugins</groupId>
200-
<artifactId>maven-javadoc-plugin</artifactId>
201-
<configuration>
202-
<skip>true</skip>
203-
</configuration>
204-
</plugin>
205198
</plugins>
206199
</build>
207200

@@ -212,5 +205,50 @@
212205
<optional>true</optional>
213206
</dependency>
214207
</dependencies>
208+
209+
<!--
210+
This module repackages various maven artifacts and artifacts like hibernate-validator
211+
and hibernate-validator-cdi does not have java-docs published. Hence, we cannot
212+
repackage the java-docs. We skip java-doc generation and use empty java-doc plugin
213+
to make Nexus release job succeed.
214+
-->
215+
<profiles>
216+
<profile>
217+
<!-- generate empty javadoc jar -->
218+
<id>release-phase2</id>
219+
<activation>
220+
<activeByDefault>false</activeByDefault>
221+
</activation>
222+
<build>
223+
<plugins>
224+
<plugin>
225+
<groupId>org.apache.maven.plugins</groupId>
226+
<artifactId>maven-javadoc-plugin</artifactId>
227+
<configuration>
228+
<skip>true</skip>
229+
</configuration>
230+
</plugin>
231+
<plugin>
232+
<groupId>org.apache.maven.plugins</groupId>
233+
<artifactId>maven-jar-plugin</artifactId>
234+
<executions>
235+
<execution>
236+
<id>create-empty-javadoc-jar</id>
237+
<goals>
238+
<goal>jar</goal>
239+
</goals>
240+
<configuration>
241+
<classesDirectory>
242+
${project.build.directory}/javadoc
243+
</classesDirectory>
244+
<classifier>javadoc</classifier>
245+
</configuration>
246+
</execution>
247+
</executions>
248+
</plugin>
249+
</plugins>
250+
</build>
251+
</profile>
252+
</profiles>
215253
</project>
216254

‎nucleus/packager/external/bean-validator/pom.xml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,5 +267,50 @@
267267
<optional>true</optional>
268268
</dependency>
269269
</dependencies>
270+
271+
<!--
272+
This module repackages various maven artifacts and artifacts like hibernate-validator does not
273+
have java-docs published. Hence, we cannot repackage the java-docs. We skip java-doc
274+
generation and use empty java-doc plugin
275+
to make Nexus release job succeed.
276+
-->
277+
<profiles>
278+
<profile>
279+
<!-- generate empty javadoc jar -->
280+
<id>release-phase2</id>
281+
<activation>
282+
<activeByDefault>false</activeByDefault>
283+
</activation>
284+
<build>
285+
<plugins>
286+
<plugin>
287+
<groupId>org.apache.maven.plugins</groupId>
288+
<artifactId>maven-javadoc-plugin</artifactId>
289+
<configuration>
290+
<skip>true</skip>
291+
</configuration>
292+
</plugin>
293+
<plugin>
294+
<groupId>org.apache.maven.plugins</groupId>
295+
<artifactId>maven-jar-plugin</artifactId>
296+
<executions>
297+
<execution>
298+
<id>create-empty-javadoc-jar</id>
299+
<goals>
300+
<goal>jar</goal>
301+
</goals>
302+
<configuration>
303+
<classesDirectory>
304+
${project.build.directory}/javadoc
305+
</classesDirectory>
306+
<classifier>javadoc</classifier>
307+
</configuration>
308+
</execution>
309+
</executions>
310+
</plugin>
311+
</plugins>
312+
</build>
313+
</profile>
314+
</profiles>
270315
</project>
271316

‎nucleus/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
<grizzly.version>2.4.0-beta12</grizzly.version>
133133
<grizzly.npn.version>1.7</grizzly.npn.version>
134134
<jboss.logging.annotation.version>2.0.1.Final</jboss.logging.annotation.version>
135+
<!-- Ensure that appserver/pom.xml's javax.validation property is of same value as the one below -->
135136
<javax.validation.version>2.0.0.CR3</javax.validation.version>
136137
<javax.validation.version.lowerbound>1.1.0.Final</javax.validation.version.lowerbound>
137138
<hibernate-validator.version>6.0.0.CR3</hibernate-validator.version>

0 commit comments

Comments
 (0)