You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/05/27 20:57:46 UTC
[6/6] struts git commit: WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
Add new bean validation plugin to assembly, bom and parent sections
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b6afefee
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b6afefee
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b6afefee
Branch: refs/heads/master
Commit: b6afefeea74e4986e10ff19b32d6880357d753a9
Parents: f419ee5
Author: Johannes Geppert <jo...@gmail.com>
Authored: Wed May 27 20:56:17 2015 +0200
Committer: Johannes Geppert <jo...@gmail.com>
Committed: Wed May 27 20:56:17 2015 +0200
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b6afefee/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e971112..f48c82c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -145,6 +145,11 @@
<dependency>
<groupId>org.apache.struts</groupId>
+ <artifactId>struts2-bean-validation-plugin</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
<artifactId>struts2-cdi-plugin</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/struts/blob/b6afefee/assembly/src/main/assembly/all.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 9e52856..d5d6b2e 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -129,6 +129,10 @@
</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>
</fileSet>
http://git-wip-us.apache.org/repos/asf/struts/blob/b6afefee/assembly/src/main/assembly/docs.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index 1f349ba..91b8d0a 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -53,6 +53,10 @@
<!-- 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>
</fileSet>
http://git-wip-us.apache.org/repos/asf/struts/blob/b6afefee/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index 7e4bed3..12b3f75 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -55,6 +55,11 @@
</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>
<version>${struts-version.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/struts/blob/b6afefee/plugins/bean-validation/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index 0a06794..53c3022 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/b6afefee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7958d8a..62f644d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,11 @@
</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>
<version>${project.version}</version>
</dependency>