From 324e25ac19db88461504a4cc7cd7d0a813bc28c9 Mon Sep 17 00:00:00 2001
From: Jagadish Ramu <jagadish.prasath@gmail.com>
Date: Sun, 16 Jul 2017 04:56:22 +0530
Subject: [PATCH] Specify bean validation api version for Java EE API jar
 (#22045)

---
 appserver/pom.xml                             |  2 +
 .../external/bean-validator-cdi/pom.xml       | 52 ++++++++++++++++---
 .../packager/external/bean-validator/pom.xml  | 45 ++++++++++++++++
 nucleus/pom.xml                               |  1 +
 4 files changed, 93 insertions(+), 7 deletions(-)

diff --git a/appserver/pom.xml b/appserver/pom.xml
index 66099293798..685b88fdef9 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -80,6 +80,8 @@
         <javax.enterprise.deploy-api.version>1.6</javax.enterprise.deploy-api.version>
         <javax.security.jacc-api.version>1.5</javax.security.jacc-api.version>
         <javax.security.auth.message-api.version>1.1</javax.security.auth.message-api.version>
+        <!-- Ensure that nucleus/pom.xml's javax.validation property is of same value as the one below -->
+        <javax.validation-api.version>2.0.0.CR3</javax.validation-api.version>
         <javax.security.enterprise-api.version>1.0-b06</javax.security.enterprise-api.version>
         <javax.security.enterprise.version>1.0-b07</javax.security.enterprise.version>
 
diff --git a/nucleus/packager/external/bean-validator-cdi/pom.xml b/nucleus/packager/external/bean-validator-cdi/pom.xml
index bca857f0a57..320e44f79f7 100644
--- a/nucleus/packager/external/bean-validator-cdi/pom.xml
+++ b/nucleus/packager/external/bean-validator-cdi/pom.xml
@@ -195,13 +195,6 @@
                     </execution>-->
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     
@@ -212,5 +205,50 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <!--
+    This module repackages various maven artifacts and artifacts like hibernate-validator 
+    and hibernate-validator-cdi does not have java-docs published. Hence, we cannot 
+    repackage the java-docs. We skip java-doc generation and use empty java-doc plugin
+    to make Nexus release job succeed.
+    -->
+    <profiles>
+        <profile>
+            <!-- generate empty javadoc jar -->
+            <id>release-phase2</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>create-empty-javadoc-jar</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                                <configuration>
+                                    <classesDirectory>
+                                        ${project.build.directory}/javadoc
+                                    </classesDirectory>
+                                    <classifier>javadoc</classifier>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
 
diff --git a/nucleus/packager/external/bean-validator/pom.xml b/nucleus/packager/external/bean-validator/pom.xml
index 63ca4c1b09b..271b3ac6099 100644
--- a/nucleus/packager/external/bean-validator/pom.xml
+++ b/nucleus/packager/external/bean-validator/pom.xml
@@ -267,5 +267,50 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <!--
+        This module repackages various maven artifacts and artifacts like hibernate-validator does not
+        have java-docs published. Hence, we cannot repackage the java-docs. We skip java-doc
+        generation and use empty java-doc plugin
+        to make Nexus release job succeed.
+    -->
+    <profiles>
+        <profile>
+            <!-- generate empty javadoc jar -->
+            <id>release-phase2</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>create-empty-javadoc-jar</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                                <configuration>
+                                    <classesDirectory>
+                                        ${project.build.directory}/javadoc
+                                    </classesDirectory>
+                                    <classifier>javadoc</classifier>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
 
diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index f019c7efc42..c4adaa005e6 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -132,6 +132,7 @@
         <grizzly.version>2.4.0-beta12</grizzly.version>
         <grizzly.npn.version>1.7</grizzly.npn.version>
         <jboss.logging.annotation.version>2.0.1.Final</jboss.logging.annotation.version>
+        <!-- Ensure that appserver/pom.xml's javax.validation property is of same value as the one below -->
         <javax.validation.version>2.0.0.CR3</javax.validation.version>
         <javax.validation.version.lowerbound>1.1.0.Final</javax.validation.version.lowerbound>
         <hibernate-validator.version>6.0.0.CR3</hibernate-validator.version>