Skip to content
Snippets Groups Projects
Commit 6c2fe76b authored by srosse's avatar srosse
Browse files

OO-4007, OO-4081: remove webdriver depchain, security updates

parent d77e23a9
No related branches found
No related tags found
No related merge requests found
...@@ -63,13 +63,13 @@ ...@@ -63,13 +63,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<targetJdk>1.8</targetJdk> <targetJdk>1.8</targetJdk>
<org.springframework.version>5.1.7.RELEASE</org.springframework.version> <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> <com.sun.jersey.version>1.19.4</com.sun.jersey.version>
<apache.cxf>3.3.2</apache.cxf> <apache.cxf>3.3.2</apache.cxf>
<apache.pdfbox>2.0.15</apache.pdfbox> <apache.pdfbox>2.0.15</apache.pdfbox>
<apache.poi>4.1.0</apache.poi> <apache.poi>4.1.0</apache.poi>
<apache.log4j>2.11.2</apache.log4j> <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.mysql.version>5.1.46</org.mysql.version>
<org.postgresql.version>42.2.5</org.postgresql.version> <org.postgresql.version>42.2.5</org.postgresql.version>
<org.infinispan.version>9.2.3.Final</org.infinispan.version> <org.infinispan.version>9.2.3.Final</org.infinispan.version>
...@@ -1358,7 +1358,7 @@ ...@@ -1358,7 +1358,7 @@
</systemPropertyVariables> </systemPropertyVariables>
<testNGArtifactName>none:none</testNGArtifactName> <testNGArtifactName>none:none</testNGArtifactName>
<includes> <includes>
<include>org/olat/selenium/*Test.java</include> <include>org/olat/selenium/SeleniumTest.java</include>
</includes> </includes>
</configuration> </configuration>
<executions> <executions>
...@@ -1775,6 +1775,15 @@ ...@@ -1775,6 +1775,15 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
...@@ -1942,12 +1951,12 @@ ...@@ -1942,12 +1951,12 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15on</artifactId> <artifactId>bcmail-jdk15on</artifactId>
<version>1.61</version> <version>1.62</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>1.61</version> <version>1.62</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.scribejava</groupId> <groupId>com.github.scribejava</groupId>
...@@ -2104,7 +2113,7 @@ ...@@ -2104,7 +2113,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.25</version> <version>1.7.26</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
...@@ -2459,7 +2468,7 @@ ...@@ -2459,7 +2468,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- end Spring dependencies --> <!-- end Spring dependencies -->
<!-- Start Apache CXF dependency --> <!-- Start Apache CXF dependency and Active MQ Broker -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
...@@ -2470,7 +2479,12 @@ ...@@ -2470,7 +2479,12 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </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 --> <!-- paypal -->
<dependency> <dependency>
...@@ -2490,7 +2504,7 @@ ...@@ -2490,7 +2504,7 @@
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<version>3.12.0</version> <version>3.12.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -2548,11 +2562,10 @@ ...@@ -2548,11 +2562,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.arquillian.extension</groupId> <groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-webdriver-depchain</artifactId> <artifactId>arquillian-drone-webdriver</artifactId>
<type>pom</type> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.eu.ingwar.tools</groupId> <groupId>org.eu.ingwar.tools</groupId>
<artifactId>arquillian-suite-extension</artifactId> <artifactId>arquillian-suite-extension</artifactId>
...@@ -2562,7 +2575,7 @@ ...@@ -2562,7 +2575,7 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.2</version> <version>2.8.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
......
<?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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment