Skip to content

Commit

Permalink
Merge 212978e into 513361e
Browse files Browse the repository at this point in the history
  • Loading branch information
yagee-de committed Jun 19, 2018
2 parents 513361e + 212978e commit ea93164
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -4,7 +4,7 @@ dist: trusty
group: beta
install: true
addons:
firefox: "56.0"
firefox: "60.0.2"
apt:
packages:
- google-chrome-stable
Expand All @@ -15,7 +15,7 @@ cache:
env:
global:
- MAVEN_OPTS="-Xmx1024M -Xss128M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"
- GECKODRIVER_VERSION="0.19.0"
- GECKODRIVER_VERSION="0.21.0"
- CHROMEDRIVER_VERSION=$(curl http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
- FIREFOX_BIN=$(which firefox)
- SELENIUM_BROWSER=firefox
Expand Down
29 changes: 14 additions & 15 deletions pom.xml
Expand Up @@ -46,7 +46,7 @@
<hk2.version>2.5.0-b61</hk2.version>
<httpcomponents.version>4.5.5</httpcomponents.version>
<httpcore.version>4.4.9</httpcore.version>
<jackson.version>2.9.5</jackson.version>
<jackson.version>2.9.6</jackson.version>
<java.target.version>1.8</java.target.version>
<!-- jersey 2.26, 2.27 leaks database connections and has CDI problems -->
<jersey.version>2.25.1</jersey.version>
Expand All @@ -58,9 +58,9 @@
<maven.compiler.target>${java.target.version}</maven.compiler.target>
<node.version>v6.9.1</node.version>
<pmd.failOnViolation>false</pmd.failOnViolation>
<selenium.version>3.11.0</selenium.version>
<selenium.version>3.12.0</selenium.version>
<site.suffix />
<swagger.version>2.0.1</swagger.version>
<swagger.version>2.0.2</swagger.version>
<uniqueVersion>false</uniqueVersion>
<xalan.version>2.7.2</xalan.version>
<yarn.version>v0.24.6</yarn.version>
Expand Down Expand Up @@ -738,12 +738,12 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.2</version>
<version>2.8.5</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>24.1-jre</version>
<version>25.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
Expand All @@ -758,7 +758,7 @@
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.2</version>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
Expand All @@ -768,7 +768,7 @@
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
<version>1.9.0</version>
<version>1.10.0</version>
</dependency>
<dependency>
<groupId>com.yahoo.platform.yui</groupId>
Expand Down Expand Up @@ -800,7 +800,7 @@
<dependency>
<groupId>io.bit3</groupId>
<artifactId>jsass</artifactId>
<version>5.5.6</version>
<version>5.7.3</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
Expand Down Expand Up @@ -924,7 +924,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.16.1</version>
<version>1.17</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -964,7 +964,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>7.3.0</version>
<version>7.3.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -1013,7 +1013,7 @@
<dependency>
<groupId>org.bibsonomy</groupId>
<artifactId>bibsonomy-bibtex-parser</artifactId>
<version>3.8.10</version>
<version>3.8.11</version>
<exclusions>
<exclusion>
<groupId>jtidy</groupId>
Expand Down Expand Up @@ -1331,8 +1331,7 @@
<dependency>
<groupId>org.tmatesoft.svnkit</groupId>
<artifactId>svnkit</artifactId>
<!-- 1.9.1 locks in junit tests -->
<version>1.8.14</version>
<version>1.9.3</version>
<exclusions>
<exclusion>
<groupId>com.trilead</groupId>
Expand Down Expand Up @@ -1424,7 +1423,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.7.8</version>
<version>3.2.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -1569,7 +1568,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.4.0</version>
<version>2.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit ea93164

Please sign in to comment.