Author: dwoods
Date: Mon Jun 21 19:12:34 2010
New Revision: 956672
URL: http://svn.apache.org/viewvc?rev=956672&view=rev
Log:
use released Apache Bean Valdiation 0.1-incubating artifacts. Move some common
dependency versions to parent POM.
Modified:
openjpa/trunk/openjpa-examples/image-gallery/pom.xml
openjpa/trunk/openjpa-integration/validation/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-examples/image-gallery/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/image-gallery/pom.xml?rev=956672&r1=956671&r2=956672&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/image-gallery/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/image-gallery/pom.xml Mon Jun 21 19:12:34
2010
@@ -48,47 +48,39 @@
</properties>
<dependencies>
- <!-- When using OpenJPA 2.0.0 with bval, commons-lang must be in the
dependency -->
- <!-- tree before openjpa-all-2.0.0 since openjpa-all bundles commons-lang
2.1 -->
- <!-- and bval requires version 2.4
-->
+ <!-- When using bval, commons-lang must be in the dependency list -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.8.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.5.3.0_1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=956672&r1=956671&r2=956672&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Mon Jun 21 19:12:34
2010
@@ -66,7 +66,6 @@
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<!-- force usage of the geronimo-validation_1.0_spec
-->
Modified: openjpa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=956672&r1=956671&r2=956672&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Mon Jun 21 19:12:34 2010
@@ -648,6 +648,16 @@
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>org.apache.bval.bundle</artifactId>
+ <version>0.1-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
@@ -697,6 +707,11 @@
<artifactId>jmock-junit3</artifactId>
<version>2.5.1</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -704,7 +719,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
