From 4780e1a2cc719f2150f93d1f515d224b8c8dbfd3 Mon Sep 17 00:00:00 2001 From: srosse <stephane.rosse@frentix.com> Date: Sat, 6 Jun 2020 11:20:26 +0200 Subject: [PATCH] OO-4728: update hibernate, XStream, dom4j and others --- pom.xml | 34 +++++++++++++++++----------------- scripts/version-rules.xml | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 07bc6044bd6..98fc101bb98 100644 --- a/pom.xml +++ b/pom.xml @@ -63,17 +63,17 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <targetJdk>1.8</targetJdk> <org.springframework.version>5.2.6.RELEASE</org.springframework.version> - <org.hibernate.version>5.4.15.Final</org.hibernate.version> + <org.hibernate.version>5.4.17.Final</org.hibernate.version> <apache.cxf>3.3.6</apache.cxf> <apache.pdfbox>2.0.19</apache.pdfbox> <apache.poi>4.1.2</apache.poi> - <apache.log4j>2.13.1</apache.log4j> + <apache.log4j>2.13.3</apache.log4j> <io.jsonwebtoken>0.10.7</io.jsonwebtoken> - <io.undertow>2.0.30.Final</io.undertow> - <jackson.version>2.10.3</jackson.version> + <io.undertow>2.1.3.Final</io.undertow> + <jackson.version>2.11.0</jackson.version> <org.mysql.version>5.1.46</org.mysql.version> - <org.postgresql.version>42.2.12</org.postgresql.version> - <org.infinispan.version>10.1.6.Final</org.infinispan.version> + <org.postgresql.version>42.2.13</org.postgresql.version> + <org.infinispan.version>10.1.8.Final</org.infinispan.version> <lucene.version>7.7.0</lucene.version> <version.selenium>3.141.59</version.selenium> <version.drone>2.5.1</version.drone> @@ -424,7 +424,7 @@ <dependency> <groupId>org.webjars</groupId> <artifactId>swagger-ui</artifactId> - <version>3.25.0</version> + <version>3.25.5</version> </dependency> <dependency> <groupId>jakarta.xml.ws</groupId> @@ -434,7 +434,7 @@ <dependency> <groupId>org.dom4j</groupId> <artifactId>dom4j</artifactId> - <version>2.1.1</version> + <version>2.1.3</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -1618,7 +1618,7 @@ <!-- Used by at least commons-fileupload, webdriver --> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.6</version> + <version>2.7</version> </dependency> <dependency> <groupId>org.jcodec</groupId> @@ -1707,12 +1707,12 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> - <version>1.64</version> + <version>1.65</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.64</version> + <version>1.65.01</version> </dependency> <dependency> <groupId>com.github.scribejava</groupId> @@ -1948,7 +1948,7 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-css</artifactId> - <version>1.12</version> + <version>1.13</version> <exclusions> <exclusion> <groupId>xml-apis</groupId> @@ -1963,7 +1963,7 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-util</artifactId> - <version>1.12</version> + <version>1.13</version> </dependency> <dependency> <groupId>de.java2html</groupId> @@ -2101,7 +2101,7 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20190722</version> + <version>20200518</version> </dependency> <dependency> <groupId>jazzlib</groupId> @@ -2131,7 +2131,7 @@ <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.4.11.1</version> + <version>1.4.12</version> </dependency> <dependency> <groupId>com.sun.mail</groupId> @@ -2274,7 +2274,7 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.15.0</version> + <version>3.16.1</version> <scope>test</scope> </dependency> <dependency> @@ -2304,7 +2304,7 @@ <dependency> <groupId>org.zapodot</groupId> <artifactId>embedded-ldap-junit</artifactId> - <version>0.7</version> + <version>0.8.1</version> <scope>test</scope> </dependency> <dependency> diff --git a/scripts/version-rules.xml b/scripts/version-rules.xml index fb1f2270740..10ed8f0b899 100644 --- a/scripts/version-rules.xml +++ b/scripts/version-rules.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <ruleset xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" comparisonMethod="maven" xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd"> <ignoreVersions> - <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|beta|Beta|BETA|Dev0|rc1|rc2|rc3|rc4|RC1|RC2|RC3|RC4|jre7|jre6)[-_\.]?[0-9]*</ignoreVersion> + <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|beta|Beta|BETA|Dev0|CR1|rc1|rc2|rc3|rc4|RC1|RC2|RC3|RC4|RC5|RC6|java7|jre7|jre6)[-_\.]?[0-9]*</ignoreVersion> </ignoreVersions> </ruleset> \ No newline at end of file -- GitLab