diff --git a/pom.xml b/pom.xml index 6ab06c3e1a9860d99e5dd514399f81c2dab1f690..73b43cbbe23a038ed2f04f4cd70442f130217c17 100644 --- a/pom.xml +++ b/pom.xml @@ -63,13 +63,13 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <targetJdk>1.8</targetJdk> <org.springframework.version>5.1.7.RELEASE</org.springframework.version> - <org.hibernate.version>5.4.2.Final</org.hibernate.version> + <org.hibernate.version>5.4.3.Final</org.hibernate.version> <com.sun.jersey.version>1.19.4</com.sun.jersey.version> <apache.cxf>3.3.2</apache.cxf> <apache.pdfbox>2.0.15</apache.pdfbox> <apache.poi>4.1.0</apache.poi> <apache.log4j>2.11.2</apache.log4j> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.9</jackson.version> <org.mysql.version>5.1.46</org.mysql.version> <org.postgresql.version>42.2.5</org.postgresql.version> <org.infinispan.version>9.2.3.Final</org.infinispan.version> @@ -1358,7 +1358,7 @@ </systemPropertyVariables> <testNGArtifactName>none:none</testNGArtifactName> <includes> - <include>org/olat/selenium/*Test.java</include> + <include>org/olat/selenium/SeleniumTest.java</include> </includes> </configuration> <executions> @@ -1775,6 +1775,15 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>2.7</version> + <configuration> + <rulesUri>file://${basedir}/scripts/version-rules.xml</rulesUri> + </configuration> + </plugin> </plugins> </pluginManagement> </build> @@ -1942,12 +1951,12 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> - <version>1.61</version> + <version>1.62</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.61</version> + <version>1.62</version> </dependency> <dependency> <groupId>com.github.scribejava</groupId> @@ -2104,7 +2113,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.25</version> + <version>1.7.26</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -2459,7 +2468,7 @@ </exclusions> </dependency> <!-- end Spring dependencies --> - <!-- Start Apache CXF dependency --> + <!-- Start Apache CXF dependency and Active MQ Broker --> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> @@ -2470,7 +2479,12 @@ <artifactId>jackson-annotations</artifactId> <version>${jackson.version}</version> </dependency> - <!-- end Apache CXF --> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> + </dependency> + <!-- end Apache CXF dependency and Active MQ Broker --> <!-- paypal --> <dependency> @@ -2490,7 +2504,7 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.12.0</version> + <version>3.12.2</version> <scope>test</scope> </dependency> <dependency> @@ -2548,11 +2562,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.arquillian.extension</groupId> - <artifactId>arquillian-drone-webdriver-depchain</artifactId> - <type>pom</type> - <scope>test</scope> - </dependency> + <groupId>org.jboss.arquillian.extension</groupId> + <artifactId>arquillian-drone-webdriver</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.eu.ingwar.tools</groupId> <artifactId>arquillian-suite-extension</artifactId> @@ -2562,7 +2575,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.2</version> + <version>2.8.5</version> <scope>test</scope> </dependency> <dependency> diff --git a/scripts/version-rules.xml b/scripts/version-rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..2d188b63504a2254785bee1fa1deb3ba7e8f95dc --- /dev/null +++ b/scripts/version-rules.xml @@ -0,0 +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)[-_\.]?[0-9]*</ignoreVersion> + </ignoreVersions> +</ruleset> \ No newline at end of file