You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/03/18 00:38:09 UTC
svn commit: r924556 - in
/myfaces/extensions/validator/branches/branch_for_jsf_2_0: ./ assembly/
assembly/src/main/resources/
component-support/generic-support/src/main/resources/
component-support/trinidad-support/src/main/resources/ core/src/main/res...
Author: gpetracek
Date: Wed Mar 17 23:38:08 2010
New Revision: 924556
URL: http://svn.apache.org/viewvc?rev=924556&view=rev
Log:
merge back changes
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml
myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/assembly/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_2_0/parent/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/resources/NOTICE.txt
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/resources/NOTICE.txt
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml Wed Mar 17 23:38:08 2010
@@ -165,6 +165,12 @@
<artifactId>myfaces-extval-property-validation</artifactId>
<version>${property-validation.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -172,6 +178,12 @@
<artifactId>myfaces-extval-bean-validation</artifactId>
<version>${bean-validation.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -186,6 +198,12 @@
<artifactId>myfaces-extval-generic-support</artifactId>
<version>${generic-support.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/src/main/resources/NOTICE.txt?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/src/main/resources/NOTICE.txt Wed Mar 17 23:38:08 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/resources/NOTICE.txt?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/resources/NOTICE.txt Wed Mar 17 23:38:08 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/resources/NOTICE.txt?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/resources/NOTICE.txt Wed Mar 17 23:38:08 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/resources/NOTICE.txt?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/resources/NOTICE.txt Wed Mar 17 23:38:08 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/assembly/src/main/resources/NOTICE.txt?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/assembly/src/main/resources/NOTICE.txt Wed Mar 17 23:38:08 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/parent/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/parent/NOTICE.txt?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/parent/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/parent/NOTICE.txt Wed Mar 17 23:38:08 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml Wed Mar 17 23:38:08 2010
@@ -33,12 +33,12 @@
<version>2.0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache MyFaces Extensions-Validator Module</name>
- <url>http://myfaces.apache.org/extensions/validator12</url>
+ <url>http://myfaces.apache.org/extensions/validator20</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/</developerConnection>
+ <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/</url>
</scm>
<distributionManagement>
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/resources/NOTICE.txt?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/resources/NOTICE.txt Wed Mar 17 23:38:08 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/resources/NOTICE.txt?rev=924556&r1=924555&r2=924556&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/resources/NOTICE.txt (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/property-validation/src/main/resources/NOTICE.txt Wed Mar 17 23:38:08 2010
@@ -1,5 +1,5 @@
Apache MyFaces Extensions Validator
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).