[OPENMEETINGS-1612] cxf, selenium and postgres versions are updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/96e75787 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/96e75787 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/96e75787 Branch: refs/heads/3.2.x Commit: 96e75787e5cf7444ebaaaac8e9933d8da09a425c Parents: 97f7b9a Author: Maxim Solodovnik <[email protected]> Authored: Wed Apr 12 05:21:24 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Apr 12 05:21:24 2017 +0000 ---------------------------------------------------------------------- openmeetings-db/pom.xml | 45 ++++++++++++++++++++------------------------ pom.xml | 4 ++-- 2 files changed, 22 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/96e75787/openmeetings-db/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml index 6fd9b17..b4c4f0a 100644 --- a/openmeetings-db/pom.xml +++ b/openmeetings-db/pom.xml @@ -16,8 +16,8 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> @@ -35,7 +35,7 @@ <commons-dbcp.version>2.1.1</commons-dbcp.version> <commons-pool.version>1.6</commons-pool.version> <!-- required by OpenJPA for clustering --> <commons-pool2.version>2.4.2</commons-pool2.version> - <postgresql.version>9.4.1212.jre7</postgresql.version> + <postgresql.version>42.0.0</postgresql.version> <site.basedir>${project.parent.basedir}</site.basedir> </properties> <dependencies> @@ -107,11 +107,6 @@ <artifactId>postgresql</artifactId> <version>${postgresql.version}</version> </dependency> - <dependency> - <groupId>com.tdunning</groupId> - <artifactId>json</artifactId> - <version>1.8</version> <!-- FIXME need to be removed with update to wicket-8.x --> - </dependency> </dependencies> <build> <plugins> @@ -120,27 +115,27 @@ <artifactId>openjpa-maven-plugin</artifactId> <version>${openjpa.version}</version> <configuration> - <includes>**/entity/**/*.class</includes> - <addDefaultConstructor>true</addDefaultConstructor> - <enforcePropertyRestrictions>true</enforcePropertyRestrictions> - <persistenceXmlFile>${project.parent.basedir}/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml</persistenceXmlFile> + <includes>**/entity/**/*.class</includes> + <addDefaultConstructor>true</addDefaultConstructor> + <enforcePropertyRestrictions>true</enforcePropertyRestrictions> + <persistenceXmlFile>${project.parent.basedir}/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml</persistenceXmlFile> </configuration> <executions> - <execution> - <id>enhancer</id> - <phase>process-classes</phase> - <goals> - <goal>enhance</goal> - </goals> - </execution> + <execution> + <id>enhancer</id> + <phase>process-classes</phase> + <goals> + <goal>enhance</goal> + </goals> + </execution> </executions> <dependencies> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <!-- set the version to be the same as the level in your runtime --> - <version>${openjpa.version}</version> - </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <!-- set the version to be the same as the level in your runtime --> + <version>${openjpa.version}</version> + </dependency> </dependencies> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/96e75787/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2c943da..bb5437b 100644 --- a/pom.xml +++ b/pom.xml @@ -49,8 +49,8 @@ <mina.version>2.0.16</mina.version> <tomcat.version>8.5.12</tomcat.version> <ical4j.version>2.0.0</ical4j.version> - <cxf.version>3.1.9</cxf.version> - <selenium.version>3.0.1</selenium.version> + <cxf.version>3.1.11</cxf.version> + <selenium.version>3.3.1</selenium.version> <simple-xml.version>2.7.1</simple-xml.version> <jettison.version>1.3.8</jettison.version> <site.basedir>${project.basedir}</site.basedir>
