From b6afefeea74e4986e10ff19b32d6880357d753a9 Mon Sep 17 00:00:00 2001
From: Johannes Geppert <johgep@gmail.com>
Date: Wed, 27 May 2015 20:56:17 +0200
Subject: [PATCH] WW-4505 Add plugin to support bean validation

Add new bean validation plugin to assembly, bom and parent sections
---
 assembly/pom.xml                    | 5 +++++
 assembly/src/main/assembly/all.xml  | 4 ++++
 assembly/src/main/assembly/docs.xml | 4 ++++
 bom/pom.xml                         | 5 +++++
 plugins/bean-validation/pom.xml     | 2 +-
 pom.xml                             | 5 +++++
 6 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index e97111263..f48c82cb2 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -143,6 +143,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-bean-validation-plugin</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-cdi-plugin</artifactId>
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 9e5285695..d5d6b2ebb 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -128,6 +128,10 @@
         <outputDirectory>docs/struts2-plugins/struts2-$plugin-plugin</outputDirectory>
       </fileSet>
       -->
+      <fileSet>
+        <directory>../plugins/bean-validation/target/apidocs</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-bean-validation/apidocs</outputDirectory>
+      </fileSet>
       <fileSet>
         <directory>../plugins/cdi/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-cdi-plugin/apidocs</outputDirectory>
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index 1f349bab8..91b8d0a22 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -52,6 +52,10 @@
         </fileSet>
 
         <!-- Plugins -->
+        <fileSet>
+            <directory>../plugins/bean-validation/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-bean-validation/apidocs</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>../plugins/cdi/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-cdi-plugin/apidocs</outputDirectory>
diff --git a/bom/pom.xml b/bom/pom.xml
index 7e4bed3c2..12b3f75c5 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -53,6 +53,11 @@
                 <artifactId>struts2-core</artifactId>
                 <version>${struts-version.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-bean-validation-plugin</artifactId>
+                <version>${struts-version.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-cdi-plugin</artifactId>
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index 0a0679446..53c302208 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>struts2-bean-validation</artifactId>
+    <artifactId>struts2-bean-validation-plugin</artifactId>
     <name>Struts 2 Bean Validation Plugin</name>
     <packaging>jar</packaging>
 
diff --git a/pom.xml b/pom.xml
index 7958d8aa2..62f644d6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,6 +370,11 @@
                 <artifactId>struts2-spring-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-bean-validation-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-cdi-plugin</artifactId>