Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency updates #4398

Merged
merged 20 commits into from
Jan 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion graylog-project-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@
<artifactId>metrics-jvm</artifactId>
<version>${metrics.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jmx</artifactId>
<version>${metrics.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-json</artifactId>
Expand Down Expand Up @@ -204,7 +209,7 @@
<version>${javax.ws.rs-api.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
Expand Down
6 changes: 5 additions & 1 deletion graylog2-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jmx</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-json</artifactId>
Expand Down Expand Up @@ -317,7 +321,7 @@
<artifactId>swagger-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/
package org.graylog2.bootstrap;

import com.codahale.metrics.JmxReporter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.jmx.JmxReporter;
import com.codahale.metrics.log4j2.InstrumentedAppender;
import com.github.joschi.jadconfig.JadConfig;
import com.github.joschi.jadconfig.ParameterException;
Expand Down
34 changes: 17 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,24 +84,24 @@

<!-- Dependencies -->
<airline.version>2.3.0</airline.version>
<amqp-client.version>5.0.0</amqp-client.version>
<amqp-client.version>5.1.1</amqp-client.version>
<apache-directory-version>1.0.0</apache-directory-version>
<auto-value.version>1.5.2</auto-value.version>
<auto-value.version>1.5.3</auto-value.version>
<auto-value-javabean.version>1.0.0</auto-value-javabean.version>
<commons-codec.version>1.11</commons-codec.version>
<commons-email.version>1.5</commons-email.version>
<commons-io.version>2.6</commons-io.version>
<disruptor.version>3.3.7</disruptor.version>
<drools.version>6.5.0.Final</drools.version>
<elasticsearch.version>5.6.4</elasticsearch.version>
<elasticsearch.version>5.6.5</elasticsearch.version>
<jest.version>2.4.11+jackson</jest.version>
<gelfclient.version>1.4.1</gelfclient.version>
<grok.version>0.1.7-graylog</grok.version>
<guava-retrying.version>2.0.0</guava-retrying.version>
<guava.version>23.4-jre</guava.version>
<guava.version>23.6-jre</guava.version>
<guice.version>4.1.0</guice.version>
<HdrHistogram.version>2.1.10</HdrHistogram.version>
<hibernate-validator.version>6.0.4.Final</hibernate-validator.version>
<hibernate-validator.version>6.0.7.Final</hibernate-validator.version>
<hk2.version>2.5.0-b32</hk2.version> <!-- The HK2 version should match the version being used by Jersey -->
<jackson.version>2.8.9</jackson.version>
<jadconfig.version>0.13.0</jadconfig.version>
Expand All @@ -117,23 +117,23 @@
<joda-time.version>2.9.9</joda-time.version>
<json-path.version>2.4.0</json-path.version>
<kafka.version>0.9.0.1</kafka.version>
<log4j.version>2.9.1</log4j.version>
<metrics.version>3.2.5</metrics.version>
<log4j.version>2.10.0</log4j.version>
<metrics.version>4.0.2</metrics.version>
<mongodb-driver.version>3.5.0</mongodb-driver.version>
<mongojack.version>2.8.0</mongojack.version>
<natty.version>0.13</natty.version>
<netty.version>3.10.6.Final</netty.version>
<okhttp.version>3.9.0</okhttp.version>
<okhttp.version>3.9.1</okhttp.version>
<opencsv.version>2.3</opencsv.version>
<os-platform-finder.version>1.2.2</os-platform-finder.version>
<protobuf.version>3.4.0</protobuf.version>
<protobuf.version>3.5.1</protobuf.version>
<reflections.version>0.9.11</reflections.version>
<retrofit.version>2.3.0</retrofit.version>
<scala.version>2.11.8</scala.version>
<shiro.version>1.4.0</shiro.version>
<sigar.version>1.6.4</sigar.version>
<slf4j.version>1.7.25</slf4j.version>
<spotbugs-annotations.version>3.1.0</spotbugs-annotations.version>
<spotbugs-annotations.version>3.1.1</spotbugs-annotations.version>
<swagger.version>1.5.13</swagger.version>
<syslog4j.version>0.9.60</syslog4j.version>
<uuid.version>3.2</uuid.version>
Expand All @@ -143,18 +143,18 @@

<!-- Test dependencies -->
<apacheds-server.version>2.0.0-M24</apacheds-server.version>
<assertj-core.version>3.8.0</assertj-core.version>
<assertj-core.version>3.9.0</assertj-core.version>
<assertj-joda-time.version>2.0.0</assertj-joda-time.version>
<awaitility.version>1.7.0</awaitility.version>
<equalsverifier.version>2.3.3</equalsverifier.version>
<equalsverifier.version>2.4</equalsverifier.version>
<fongo.version>2.1.0</fongo.version>
<jukito.version>1.5</jukito.version>
<junit.version>4.12</junit.version>
<mockito.version>2.12.0</mockito.version>
<mockito.version>2.13.0</mockito.version>
<nosqlunit.version>1.0.0-rc.5</nosqlunit.version>
<nosqlunit-elasticsearch-http.version>1.0.0-4+jackson</nosqlunit-elasticsearch-http.version>
<restassured.version>2.9.0</restassured.version>
<system-rules.version>1.16.1</system-rules.version>
<system-rules.version>1.17.0</system-rules.version>

<!-- Nodejs dependencies -->
<nodejs.version>v8.9.1</nodejs.version>
Expand Down Expand Up @@ -218,7 +218,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -273,7 +273,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.0-RC8</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -326,7 +326,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.1.2</version>
<version>2.2.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down