Author: solomax
Date: Tue Jun 2 03:25:00 2015
New Revision: 1683032
URL: http://svn.apache.org/r1683032
Log:
[OPENMEETINGS-980] commons-pool version is updated; developer list is updated
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1683032&r1=1683031&r2=1683032&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Tue Jun 2 03:25:00
2015
@@ -33,6 +33,7 @@
<openjpa.version>2.4.0</openjpa.version>
<asterisk-java.version>1.0.0.CI-20150406</asterisk-java.version>
<commons-dbcp.version>2.1</commons-dbcp.version>
+ <commons-pool2.version>2.4.1</commons-pool2.version>
<derby.version>10.11.1.1</derby.version>
<postgresql.version>9.4-1200-jdbc41</postgresql.version>
<site.basedir>${project.parent.basedir}</site.basedir>
@@ -70,6 +71,17 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>${commons-dbcp.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>${commons-pool2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1683032&r1=1683031&r2=1683032&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Tue Jun 2 03:25:00 2015
@@ -249,6 +249,12 @@
<organization>VCRP</organization>
<organizationUrl>http://www.vcrp.de</organizationUrl>
</developer>
+ <developer>
+ <id>onoke</id>
+ <name>Keiji Ono</name>
+ <organization>net8</organization>
+ <organizationUrl>http://net8.co.jp/</organizationUrl>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -257,11 +263,6 @@
<contributor>
<name>Thibault Le Meur</name>
</contributor>
- <contributor>
- <name>Keiji Ono</name>
- <organization>net8</organization>
- <organizationUrl>http://net8.co.jp/</organizationUrl>
- </contributor>
</contributors>
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp</connection>
@@ -407,6 +408,10 @@
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
<optional>true</optional>
</dependency>
