OPENJPA-2677 prepare upgrade to BVal-1.1.2

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1766814 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Struberg 2016-10-27 13:15:29 +00:00
parent be71987b9c
commit 6b8d4b9bcd
6 changed files with 5 additions and 25 deletions

View File

@ -137,6 +137,7 @@
<groupId>commons-dbcp</groupId> <groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>
</dependency> </dependency>
<!-- bean validation includes --> <!-- bean validation includes -->
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
@ -146,16 +147,5 @@
<groupId>org.apache.bval</groupId> <groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId> <artifactId>org.apache.bval.bundle</artifactId>
</dependency> </dependency>
<dependency>
<!-- TODO This is actually a transitive dependency from bval and should get removed once bval gets rid of it-->
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -6,7 +6,6 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/). The Apache Software Foundation (http://www.apache.org/).
The OpenJPA binary assembly and openjpa-all 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 Collections project
Apache Commons DBCP project Apache Commons DBCP project
Apache Commons Lang project Apache Commons Lang project

View File

@ -144,7 +144,6 @@
<include>org.apache.geronimo.specs:geronimo-jms_1.1_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>org.apache.bval:org.apache.bval.bundle</include>
<include>commons-beanutils:commons-beanutils</include>
<include>org.apache.xbean:xbean-asm5-shaded</include> <include>org.apache.xbean:xbean-asm5-shaded</include>
</includes> </includes>
</dependencySet> </dependencySet>

View File

@ -83,7 +83,6 @@
<include>org.apache.geronimo.specs:geronimo-jms_1.1_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>org.apache.bval:org.apache.bval.bundle</include>
<include>commons-beanutils:commons-beanutils</include>
<include>org.apache.xbean:xbean-asm5-shaded</include> <include>org.apache.xbean:xbean-asm5-shaded</include>
</includes> </includes>
</dependencySet> </dependencySet>

View File

@ -424,9 +424,5 @@
<groupId>org.apache.bval</groupId> <groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId> <artifactId>org.apache.bval.bundle</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

11
pom.xml
View File

@ -87,6 +87,8 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version> <maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version> <maven.surefire.version>2.19.1</maven.surefire.version>
<bval.version>1.1.2-SNAPSHOT</bval.version>
</properties> </properties>
<licenses> <licenses>
@ -532,17 +534,12 @@
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.1_spec</artifactId> <artifactId>geronimo-validation_1.1_spec</artifactId>
<version>1.0-alpha-1</version> <version>1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.bval</groupId> <groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId> <artifactId>org.apache.bval.bundle</artifactId>
<version>1.1.1</version> <version>${bval.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>