You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2011/02/23 21:40:52 UTC
svn commit: r1073937 - in /incubator/bval/sandbox/lang3-work: ./
bval-core/src/main/java/org/apache/bval/
bval-core/src/main/java/org/apache/bval/model/ bval-jsr303/src/main/java/
bval-jsr303/src/main/java/org/apache/bval/jsr303/ bval-jsr303/src/main/j...
Author: mbenson
Date: Wed Feb 23 20:40:52 2011
New Revision: 1073937
URL: http://svn.apache.org/viewvc?rev=1073937&view=rev
Log:
merge c1073929 from trunk
Modified:
incubator/bval/sandbox/lang3-work/ (props changed)
incubator/bval/sandbox/lang3-work/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java (props changed)
incubator/bval/sandbox/lang3-work/bval-core/src/main/java/org/apache/bval/model/MetaProperty.java (props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/ (props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/AppendValidationToBuilder.java (props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java (props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidationListener.java (props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/util/PathImpl.java (props changed)
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java (props changed)
incubator/bval/sandbox/lang3-work/bval-xstream/ (props changed)
incubator/bval/sandbox/lang3-work/pom.xml
Propchange: incubator/bval/sandbox/lang3-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1031642,1035416-1036603,1069985
+/incubator/bval/trunk:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1031642,1035416-1036603,1069985,1073929
Propchange: incubator/bval/sandbox/lang3-work/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985
+/incubator/bval/trunk/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929
Propchange: incubator/bval/sandbox/lang3-work/bval-core/src/main/java/org/apache/bval/model/MetaProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-core/src/main/java/org/apache/bval/model/MetaProperty.java:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985
+/incubator/bval/trunk/bval-core/src/main/java/org/apache/bval/model/MetaProperty.java:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929
Propchange: incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1031642,1035416-1036603,1069985
+/incubator/bval/trunk/bval-jsr303/src/main/java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1031642,1035416-1036603,1069985,1073929
Propchange: incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/AppendValidationToBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AppendValidationToBuilder.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985
+/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AppendValidationToBuilder.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929
Propchange: incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985
+/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929
Propchange: incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidationListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidationListener.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985
+/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidationListener.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929
Propchange: incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/util/PathImpl.java
('svn:mergeinfo' removed)
Propchange: incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985
+/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java:992330-992353,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929
Propchange: incubator/bval/sandbox/lang3-work/bval-xstream/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 20:40:52 2011
@@ -1 +1 @@
-/incubator/bval/trunk/bval-xstream:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985
+/incubator/bval/trunk/bval-xstream:992143,992401,992406,992412,992510,992648,993404-993438,996236,996240,997154,1002445,1002497,1031642,1035416-1036603,1069985,1073929
Modified: incubator/bval/sandbox/lang3-work/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/pom.xml?rev=1073937&r1=1073936&r2=1073937&view=diff
==============================================================================
--- incubator/bval/sandbox/lang3-work/pom.xml (original)
+++ incubator/bval/sandbox/lang3-work/pom.xml Wed Feb 23 20:40:52 2011
@@ -351,9 +351,14 @@
</dependency>
<!-- Optional - only used by bval-guice -->
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>2.0</version>
+ <version>3.0-rc2</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>