fix: proper version in metadata, fix test errors preventing build

wizecore · Jul 8, 2024 · 831caeb · 831caeb
1 parent 4bfe6f1
commit 831caeb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,12 +22,38 @@
         <maven.install.skip>true</maven.install.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
         <maven.site.skip>true</maven.site.skip>
-        <graylog2.version>6.0.0</graylog2.version>
+        <graylog2.version>6.0.4</graylog2.version>
         <graylog2.syslog4j.version>0.9.61</graylog2.syslog4j.version>
         <guice.version>7.0.0</guice.version>
     </properties>
 
     <dependencies>
+        <!-- com/fasterxml/jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.9.9</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.9</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- com.codahale.metrics -->
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+            <version>4.1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.swrve</groupId>
+            <artifactId>rate-limited-logger</artifactId>
+            <version>2.0.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/run-graylog-mac b/run-graylog-mac
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 HERE=$PWD
-VER=6.0.0
+VER=6.0.4
 URL=https://downloads.graylog.org/releases/graylog/graylog-$VER.tgz
 if [ ! -f "graylog-$VER.tgz" ]; then
     echo "Downloading $URL"

diff --git a/src/main/java/com/wizecore/graylog2/plugin/SyslogOutputMetaData.java b/src/main/java/com/wizecore/graylog2/plugin/SyslogOutputMetaData.java
@@ -32,7 +32,7 @@ public Set<Capability> getRequiredCapabilities() {
 
 	@Override
 	public Version getRequiredVersion() {
-		return Version.from(4, 2, 6);
+		return Version.from(6, 0, 0);
 	}
 
 	@Override
@@ -47,6 +47,6 @@ public String getUniqueId() {
 
 	@Override
 	public Version getVersion() {
-		return Version.from(4, 2, 6);
+		return Version.from(6, 0, 4);
 	}
 }