You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2016/10/27 13:15:30 UTC
svn commit: r1766814 - in /openjpa/trunk: openjpa-all/pom.xml
openjpa-project/NOTICE openjpa-project/assembly.xml
openjpa-project/bin-assembly.xml openjpa-project/pom.xml pom.xml
Author: struberg
Date: Thu Oct 27 13:15:29 2016
New Revision: 1766814
URL: http://svn.apache.org/viewvc?rev=1766814&view=rev
Log:
OPENJPA-2677 prepare upgrade to BVal-1.1.2
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-project/NOTICE
openjpa/trunk/openjpa-project/assembly.xml
openjpa/trunk/openjpa-project/bin-assembly.xml
openjpa/trunk/openjpa-project/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=1766814&r1=1766813&r2=1766814&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Thu Oct 27 13:15:29 2016
@@ -137,6 +137,7 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</dependency>
+
<!-- bean validation includes -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -146,16 +147,5 @@
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
</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>
</project>
Modified: openjpa/trunk/openjpa-project/NOTICE
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/NOTICE?rev=1766814&r1=1766813&r2=1766814&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/NOTICE (original)
+++ openjpa/trunk/openjpa-project/NOTICE Thu Oct 27 13:15:29 2016
@@ -6,7 +6,6 @@ This product includes software developed
The Apache Software Foundation (http://www.apache.org/).
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
Modified: openjpa/trunk/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/assembly.xml?rev=1766814&r1=1766813&r2=1766814&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/assembly.xml Thu Oct 27 13:15:29 2016
@@ -144,7 +144,6 @@
<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.bval:org.apache.bval.bundle</include>
- <include>commons-beanutils:commons-beanutils</include>
<include>org.apache.xbean:xbean-asm5-shaded</include>
</includes>
</dependencySet>
Modified: openjpa/trunk/openjpa-project/bin-assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/bin-assembly.xml?rev=1766814&r1=1766813&r2=1766814&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/bin-assembly.xml (original)
+++ openjpa/trunk/openjpa-project/bin-assembly.xml Thu Oct 27 13:15:29 2016
@@ -83,7 +83,6 @@
<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.bval:org.apache.bval.bundle</include>
- <include>commons-beanutils:commons-beanutils</include>
<include>org.apache.xbean:xbean-asm5-shaded</include>
</includes>
</dependencySet>
Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=1766814&r1=1766813&r2=1766814&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Thu Oct 27 13:15:29 2016
@@ -424,9 +424,5 @@
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
</dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
</dependencies>
</project>
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1766814&r1=1766813&r2=1766814&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Thu Oct 27 13:15:29 2016
@@ -87,6 +87,8 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version>
+
+ <bval.version>1.1.2-SNAPSHOT</bval.version>
</properties>
<licenses>
@@ -532,17 +534,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.1_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.2</version>
+ <version>${bval.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>