diff --git a/graylog-plugin-function-base64inflate/dependency-reduced-pom.xml b/graylog-plugin-function-base64inflate/dependency-reduced-pom.xml index cc366c0..3471efe 100644 --- a/graylog-plugin-function-base64inflate/dependency-reduced-pom.xml +++ b/graylog-plugin-function-base64inflate/dependency-reduced-pom.xml @@ -3,14 +3,14 @@ graylog-plugin-parent org.graylog.plugins - 5.1.5 + 6.2.2 ../pom.xml/pom.xml 4.0.0 com.example.plugins graylog-plugin-function-base64inflate ${project.artifactId} - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT Graylog ${project.artifactId} plugin. https://www.graylog.org @@ -162,478 +162,8 @@ org.graylog2 graylog2-server - 5.1.5 + 6.2.2 provided - - - opentelemetry-api - io.opentelemetry - - - opentelemetry-instrumentation-annotations - io.opentelemetry.instrumentation - - - opentelemetry-semconv - io.opentelemetry - - - airline - com.github.rvesse - - - guava - com.google.guava - - - caffeine - com.github.ben-manes.caffeine - - - guava-retrying - com.github.rholder - - - shiro-core - org.apache.shiro - - - api-all - org.apache.directory.api - - - guice - com.google.inject - - - guice-assistedinject - com.google.inject.extensions - - - javax.inject - javax.inject - - - jadconfig - org.graylog - - - mongodb-driver-sync - org.mongodb - - - mongodb-driver-legacy - org.mongodb - - - mongojack - org.graylog.repackaged.mongojack - - - okhttp - com.squareup.okhttp3 - - - jackson-core - com.fasterxml.jackson.core - - - jackson-databind - com.fasterxml.jackson.core - - - jackson-annotations - com.fasterxml.jackson.core - - - jackson-jaxrs-base - com.fasterxml.jackson.jaxrs - - - jackson-datatype-guava - com.fasterxml.jackson.datatype - - - jackson-datatype-jdk8 - com.fasterxml.jackson.datatype - - - jackson-datatype-jsr310 - com.fasterxml.jackson.datatype - - - jackson-datatype-joda - com.fasterxml.jackson.datatype - - - jackson-module-jsonSchema - com.fasterxml.jackson.module - - - jackson-jaxrs-json-provider - com.fasterxml.jackson.jaxrs - - - jackson-dataformat-yaml - com.fasterxml.jackson.dataformat - - - jackson-dataformat-csv - com.fasterxml.jackson.dataformat - - - metrics-annotation - io.dropwizard.metrics - - - metrics-core - io.dropwizard.metrics - - - metrics-log4j2 - io.dropwizard.metrics - - - metrics-jvm - io.dropwizard.metrics - - - metrics-jmx - io.dropwizard.metrics - - - metrics-json - io.dropwizard.metrics - - - simpleclient_dropwizard - io.prometheus - - - simpleclient_hotspot - io.prometheus - - - simpleclient_httpserver - io.prometheus - - - siv-mode - org.cryptomator - - - commons-email - org.apache.commons - - - commons-validator - commons-validator - - - jersey-hk2 - org.glassfish.jersey.inject - - - jersey-bean-validation - org.glassfish.jersey.ext - - - jersey-media-multipart - org.glassfish.jersey.media - - - jersey-container-grizzly2-http - org.glassfish.jersey.containers - - - guice-bridge - org.glassfish.hk2 - - - hk2-api - org.glassfish.hk2 - - - hk2-locator - org.glassfish.hk2 - - - javax.ws.rs-api - javax.ws.rs - - - jaxb-api - javax.xml.bind - - - reflections - org.reflections - - - opencsv - net.sf.opencsv - - - commons-io - commons-io - - - natty - com.joestelmach - - - jmte - com.floreysoft - - - disruptor - com.lmax - - - joda-time - joda-time - - - uuid - org.graylog2.repackaged - - - de.huxhorn.sulky.ulid - de.huxhorn.sulky - - - commons-codec - commons-codec - - - grok - org.graylog2.repackaged - - - gelfclient - org.graylog2 - - - swagger-annotations - io.swagger - - - hibernate-validator - org.hibernate.validator - - - bcpkix-jdk15on - org.bouncycastle - - - lucene-queryparser - org.apache.lucene - - - lucene-analysis-common - org.apache.lucene - - - classgraph - io.github.classgraph - - - s3 - software.amazon.awssdk - - - log4j-api - org.apache.logging.log4j - - - log4j-core - org.apache.logging.log4j - - - log4j-slf4j-impl - org.apache.logging.log4j - - - jcl-over-slf4j - org.slf4j - - - log4j-over-slf4j - org.slf4j - - - log4j-jul - org.apache.logging.log4j - - - jbcrypt - org.mindrot - - - unboundid-ldapsdk - com.unboundid - - - retrofit - com.squareup.retrofit2 - - - converter-jackson - com.squareup.retrofit2 - - - os-platform-finder - org.graylog.repackaged - - - javax.el-api - javax.el - - - netty-common - io.netty - - - netty-buffer - io.netty - - - netty-handler - io.netty - - - netty-codec - io.netty - - - netty-codec-dns - io.netty - - - netty-codec-http - io.netty - - - netty-resolver-dns - io.netty - - - netty-transport-native-epoll - io.netty - - - netty-transport-native-kqueue - io.netty - - - netty-tcnative-boringssl-static - io.netty - - - netty-tcnative-boringssl-static - io.netty - - - javax.annotation-api - javax.annotation - - - HdrHistogram - org.hdrhistogram - - - oshi-core - com.github.oshi - - - amqp-client - com.rabbitmq - - - kafka09_2.11 - org.graylog.shaded - - - kafka_2.13 - org.apache.kafka - - - syslog4j - org.graylog2 - - - json-path - com.jayway.jsonpath - - - java-semver - com.github.zafarkhaja - - - semver4j - org.graylog.repackaged - - - protobuf-java - com.google.protobuf - - - validation-api - javax.validation - - - geoip2 - com.maxmind.geoip2 - - - cef-parser - org.graylog.cef - - - antlr4-runtime - org.antlr - - - jool - org.jooq - - - freemarker - org.freemarker - - - asciitable - de.vandermeer - - - commons-net - commons-net - - - slf4j-api - org.slf4j - - - auto-value-annotations - com.google.auto.value - - - jdot - info.leadinglight - - - streamex - one.util - - - cron-utils - com.cronutils - - - rate-limited-logger - com.swrve - - org.graylog.plugins @@ -641,10 +171,6 @@ 2.5.2 provided - - javapoet - com.squareup - antlr4-runtime org.antlr @@ -653,489 +179,23 @@ jool org.jooq + + javapoet + com.squareup + org.graylog2 graylog2-server - 5.1.5 + 6.2.2 test-jar test - - - opentelemetry-api - io.opentelemetry - - - opentelemetry-instrumentation-annotations - io.opentelemetry.instrumentation - - - opentelemetry-semconv - io.opentelemetry - - - airline - com.github.rvesse - - - guava - com.google.guava - - - caffeine - com.github.ben-manes.caffeine - - - guava-retrying - com.github.rholder - - - shiro-core - org.apache.shiro - - - api-all - org.apache.directory.api - - - guice - com.google.inject - - - guice-assistedinject - com.google.inject.extensions - - - javax.inject - javax.inject - - - jadconfig - org.graylog - - - mongodb-driver-sync - org.mongodb - - - mongodb-driver-legacy - org.mongodb - - - mongojack - org.graylog.repackaged.mongojack - - - okhttp - com.squareup.okhttp3 - - - jackson-core - com.fasterxml.jackson.core - - - jackson-databind - com.fasterxml.jackson.core - - - jackson-annotations - com.fasterxml.jackson.core - - - jackson-jaxrs-base - com.fasterxml.jackson.jaxrs - - - jackson-datatype-guava - com.fasterxml.jackson.datatype - - - jackson-datatype-jdk8 - com.fasterxml.jackson.datatype - - - jackson-datatype-jsr310 - com.fasterxml.jackson.datatype - - - jackson-datatype-joda - com.fasterxml.jackson.datatype - - - jackson-module-jsonSchema - com.fasterxml.jackson.module - - - jackson-jaxrs-json-provider - com.fasterxml.jackson.jaxrs - - - jackson-dataformat-yaml - com.fasterxml.jackson.dataformat - - - jackson-dataformat-csv - com.fasterxml.jackson.dataformat - - - metrics-annotation - io.dropwizard.metrics - - - metrics-core - io.dropwizard.metrics - - - metrics-log4j2 - io.dropwizard.metrics - - - metrics-jvm - io.dropwizard.metrics - - - metrics-jmx - io.dropwizard.metrics - - - metrics-json - io.dropwizard.metrics - - - simpleclient_dropwizard - io.prometheus - - - simpleclient_hotspot - io.prometheus - - - simpleclient_httpserver - io.prometheus - - - siv-mode - org.cryptomator - - - commons-email - org.apache.commons - - - commons-validator - commons-validator - - - jersey-hk2 - org.glassfish.jersey.inject - - - jersey-bean-validation - org.glassfish.jersey.ext - - - jersey-media-multipart - org.glassfish.jersey.media - - - jersey-container-grizzly2-http - org.glassfish.jersey.containers - - - guice-bridge - org.glassfish.hk2 - - - hk2-api - org.glassfish.hk2 - - - hk2-locator - org.glassfish.hk2 - - - javax.ws.rs-api - javax.ws.rs - - - jaxb-api - javax.xml.bind - - - reflections - org.reflections - - - opencsv - net.sf.opencsv - - - commons-io - commons-io - - - natty - com.joestelmach - - - jmte - com.floreysoft - - - disruptor - com.lmax - - - joda-time - joda-time - - - uuid - org.graylog2.repackaged - - - de.huxhorn.sulky.ulid - de.huxhorn.sulky - - - commons-codec - commons-codec - - - grok - org.graylog2.repackaged - - - gelfclient - org.graylog2 - - - swagger-annotations - io.swagger - - - hibernate-validator - org.hibernate.validator - - - bcpkix-jdk15on - org.bouncycastle - - - lucene-queryparser - org.apache.lucene - - - lucene-analysis-common - org.apache.lucene - - - classgraph - io.github.classgraph - - - s3 - software.amazon.awssdk - - - log4j-api - org.apache.logging.log4j - - - log4j-core - org.apache.logging.log4j - - - log4j-slf4j-impl - org.apache.logging.log4j - - - jcl-over-slf4j - org.slf4j - - - log4j-over-slf4j - org.slf4j - - - log4j-jul - org.apache.logging.log4j - - - jbcrypt - org.mindrot - - - unboundid-ldapsdk - com.unboundid - - - retrofit - com.squareup.retrofit2 - - - converter-jackson - com.squareup.retrofit2 - - - os-platform-finder - org.graylog.repackaged - - - javax.el-api - javax.el - - - netty-common - io.netty - - - netty-buffer - io.netty - - - netty-handler - io.netty - - - netty-codec - io.netty - - - netty-codec-dns - io.netty - - - netty-codec-http - io.netty - - - netty-resolver-dns - io.netty - - - netty-transport-native-epoll - io.netty - - - netty-transport-native-kqueue - io.netty - - - netty-tcnative-boringssl-static - io.netty - - - netty-tcnative-boringssl-static - io.netty - - - javax.annotation-api - javax.annotation - - - HdrHistogram - org.hdrhistogram - - - oshi-core - com.github.oshi - - - amqp-client - com.rabbitmq - - - kafka09_2.11 - org.graylog.shaded - - - kafka_2.13 - org.apache.kafka - - - syslog4j - org.graylog2 - - - json-path - com.jayway.jsonpath - - - java-semver - com.github.zafarkhaja - - - semver4j - org.graylog.repackaged - - - protobuf-java - com.google.protobuf - - - validation-api - javax.validation - - - geoip2 - com.maxmind.geoip2 - - - cef-parser - org.graylog.cef - - - freemarker - org.freemarker - - - asciitable - de.vandermeer - - - commons-net - commons-net - - - slf4j-api - org.slf4j - - - auto-value-annotations - com.google.auto.value - - - jdot - info.leadinglight - - - streamex - one.util - - - cron-utils - com.cronutils - - - rate-limited-logger - com.swrve - - - antlr4-runtime - org.antlr - - - jool - org.jooq - - com.google.auto.value - auto-value - 1.7.4 + auto-value-annotations + 1.11.0 provided diff --git a/graylog-plugin-function-base64inflate/pom.xml b/graylog-plugin-function-base64inflate/pom.xml index c7c423b..8ff717a 100644 --- a/graylog-plugin-function-base64inflate/pom.xml +++ b/graylog-plugin-function-base64inflate/pom.xml @@ -25,12 +25,12 @@ org.graylog.plugins graylog-plugin-parent - 5.1.5 + 6.2.2 com.example.plugins graylog-plugin-function-base64inflate - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT jar ${project.artifactId} @@ -120,7 +120,16 @@ auto-service-annotations 1.1.1 - + + com.google.inject + guice + 7.0.0 + + + org.slf4j + slf4j-log4j13 + 1.0 + org.graylog2 diff --git a/graylog-plugin-function-base64inflate/src/main/java/org/graylog/plugins/custom/Base64InflateFunction.java b/graylog-plugin-function-base64inflate/src/main/java/org/graylog/plugins/custom/Base64InflateFunction.java index bf14b94..f63c92b 100644 --- a/graylog-plugin-function-base64inflate/src/main/java/org/graylog/plugins/custom/Base64InflateFunction.java +++ b/graylog-plugin-function-base64inflate/src/main/java/org/graylog/plugins/custom/Base64InflateFunction.java @@ -19,6 +19,8 @@ package org.graylog.plugins.custom; import com.google.auto.service.AutoService; +import com.google.inject.AbstractModule; + import org.graylog.plugins.pipelineprocessor.EvaluationContext; import org.graylog.plugins.pipelineprocessor.ast.expressions.Expression; import org.graylog.plugins.pipelineprocessor.ast.functions.AbstractFunction; diff --git a/graylog-plugin-function-base64inflate/target/classes/org.graylog.plugins.graylog-plugin-function-base64inflate/graylog-plugin.properties b/graylog-plugin-function-base64inflate/target/classes/org.graylog.plugins.graylog-plugin-function-base64inflate/graylog-plugin.properties index 364ac82..fcc635d 100644 --- a/graylog-plugin-function-base64inflate/target/classes/org.graylog.plugins.graylog-plugin-function-base64inflate/graylog-plugin.properties +++ b/graylog-plugin-function-base64inflate/target/classes/org.graylog.plugins.graylog-plugin-function-base64inflate/graylog-plugin.properties @@ -1,8 +1,8 @@ # The plugin version -version=1.0.0-SNAPSHOT +version=1.0.1-SNAPSHOT # The required Graylog server version -graylog.version=5.1.5 +graylog.version=6.2.2 # When set to true (the default) the plugin gets a separate class loader # when loading the plugin. When set to false, the plugin shares a class loader diff --git a/graylog-plugin-function-base64inflate/target/classes/org/graylog/plugins/custom/Base64InflateFunction.class b/graylog-plugin-function-base64inflate/target/classes/org/graylog/plugins/custom/Base64InflateFunction.class index ffa4daa..80a205a 100644 Binary files a/graylog-plugin-function-base64inflate/target/classes/org/graylog/plugins/custom/Base64InflateFunction.class and b/graylog-plugin-function-base64inflate/target/classes/org/graylog/plugins/custom/Base64InflateFunction.class differ diff --git a/graylog-plugin-function-base64inflate/target/maven-archiver/pom.properties b/graylog-plugin-function-base64inflate/target/maven-archiver/pom.properties index a83b8f4..428531b 100644 --- a/graylog-plugin-function-base64inflate/target/maven-archiver/pom.properties +++ b/graylog-plugin-function-base64inflate/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Apache Maven -#Thu May 08 11:05:30 EDT 2025 +#Sat May 10 10:42:17 EDT 2025 artifactId=graylog-plugin-function-base64inflate groupId=com.example.plugins -version=1.0.0-SNAPSHOT +version=1.0.1-SNAPSHOT