Permalink
Browse files

OPENJPA-1754 Include Apache BVal and spec api in openjpa-all and bina…

…ry assembly to complete the JPA 2.0 picture

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@985350 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 3b8f794 commit 021e8a498e08f64c1c553a6f8f188269eb45c164 Donald Woods committed Aug 13, 2010
View
File renamed without changes.
View
File renamed without changes.
View
@@ -119,5 +119,18 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</dependency>
+ <!-- bean validation includes -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>org.apache.bval.bundle</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
</dependencies>
</project>
@@ -19,17 +19,24 @@
openjpa-all includes software developed by the:
Apache Commons Collections project
+ Apache Commons Collections project
+ Apache Commons DBCP project
Apache Commons Lang project
Apache Commons Logging project
Apache Commons Pool project
- Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 2.0 spec apis)
+ Apache Geronimo project
+ Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
SERP project
+
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed.
+
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
OpenJPA includes the persistence and orm schemas from the JPA specifications.
-Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
+Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
OpenJPA elects to include this software in this distribution under the
CDDL license. You can obtain a copy of the License at:
https://glassfish.dev.java.net/public/CDDL+GPL.html
@@ -69,26 +69,6 @@
</profiles>
<dependencies>
- <!-- When using bval, commons-lang must be in the dependency list -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>org.apache.bval.bundle</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
@@ -48,33 +48,11 @@
</property>
</activation>
<dependencies>
+ <!-- use openjpa-all which includes Apache BVal and depends -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>org.apache.bval.bundle</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- force usage of the geronimo-validation_1.0_spec -->
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
@@ -109,6 +87,23 @@
</property>
</activation>
<dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${pom.version}</version>
+ <!-- allow profiles to decide which validation spec to use -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
@@ -165,18 +160,6 @@
</profiles>
<dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${pom.version}</version>
- <!-- allow profiles to decide which validation spec to use -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
@@ -185,11 +168,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
File renamed without changes.
@@ -1,25 +1,27 @@
-Apache OpenJPA Aggregate Jar with Dependencies
+Apache OpenJPA binary assembly
Copyright 2006-2010 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-The OpenJPA binary assembly includes software developed by the:
+The OpenJPA binary assembly and openjpa-all includes software developed by the:
+ Apache Commons Beanutils project
Apache Commons Collections project
Apache Commons DBCP project
Apache Commons Lang project
+ Apache Commons Logging project
Apache Commons Pool project
Apache Derby project
- Apache Geronimo project (JMS 1.1, JTA 1.1, JPA 2.0 and Bean Validation 1.0 spec apis)
+ Apache Geronimo project
+ Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
Apache Incubtor - Bean Validation project
SERP project
The following copyright notice(s) were affixed to portions of this code
with which this file is now or was at one time distributed.
-
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
@@ -37,9 +37,7 @@
<include>NOTICE</include>
<include>README.txt</include>
<include>DISCLAIMER.txt</include>
- <include>LICENSE.txt</include>
<include>STATUS.txt</include>
- <include>NOTICE.txt</include>
<include>RELEASE-NOTES</include>
<include>RELEASE-NOTES.html</include>
<include>RELEASE-NOTES.txt</include>
@@ -126,7 +124,9 @@
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <!-- <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include> -->
+ <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
+ <include>org.apache.bval:org.apache.bval.bundle</include>
+ <include>commons-beanutils:commons-beanutils</include>
</includes>
</dependencySet>
</dependencySets>
View
@@ -443,11 +443,18 @@
<artifactId>commons-dbcp</artifactId>
</dependency>
- <!-- excluded optional dependency that user should provide with BV impl
+ <!-- included for Apache Bean Validation provider -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
</dependency>
- -->
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>org.apache.bval.bundle</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
</dependencies>
</project>

0 comments on commit 021e8a4

Please sign in to comment.