Skip to content

Commit 831caeb

Browse files
committed
fix: proper version in metadata, fix test errors preventing build
1 parent 4bfe6f1 commit 831caeb

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

pom.xml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,38 @@
2222
<maven.install.skip>true</maven.install.skip>
2323
<maven.deploy.skip>true</maven.deploy.skip>
2424
<maven.site.skip>true</maven.site.skip>
25-
<graylog2.version>6.0.0</graylog2.version>
25+
<graylog2.version>6.0.4</graylog2.version>
2626
<graylog2.syslog4j.version>0.9.61</graylog2.syslog4j.version>
2727
<guice.version>7.0.0</guice.version>
2828
</properties>
2929

3030
<dependencies>
31+
<!-- com/fasterxml/jackson -->
32+
<dependency>
33+
<groupId>com.fasterxml.jackson.core</groupId>
34+
<artifactId>jackson-core</artifactId>
35+
<version>2.9.9</version>
36+
<scope>test</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>com.fasterxml.jackson.core</groupId>
40+
<artifactId>jackson-databind</artifactId>
41+
<version>2.9.9</version>
42+
<scope>test</scope>
43+
</dependency>
44+
<!-- com.codahale.metrics -->
45+
<dependency>
46+
<groupId>io.dropwizard.metrics</groupId>
47+
<artifactId>metrics-core</artifactId>
48+
<version>4.1.0</version>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>com.swrve</groupId>
53+
<artifactId>rate-limited-logger</artifactId>
54+
<version>2.0.2</version>
55+
<scope>test</scope>
56+
</dependency>
3157
<dependency>
3258
<groupId>junit</groupId>
3359
<artifactId>junit</artifactId>

run-graylog-mac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33
HERE=$PWD
4-
VER=6.0.0
4+
VER=6.0.4
55
URL=https://downloads.graylog.org/releases/graylog/graylog-$VER.tgz
66
if [ ! -f "graylog-$VER.tgz" ]; then
77
echo "Downloading $URL"

src/main/java/com/wizecore/graylog2/plugin/SyslogOutputMetaData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Set<Capability> getRequiredCapabilities() {
3232

3333
@Override
3434
public Version getRequiredVersion() {
35-
return Version.from(4, 2, 6);
35+
return Version.from(6, 0, 0);
3636
}
3737

3838
@Override
@@ -47,6 +47,6 @@ public String getUniqueId() {
4747

4848
@Override
4949
public Version getVersion() {
50-
return Version.from(4, 2, 6);
50+
return Version.from(6, 0, 4);
5151
}
5252
}

0 commit comments

Comments
 (0)