diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index aba89c8..ff68921 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ graylog-plugin-web-parent org.graylog.plugins - 5.0.0 + 6.0.0 ../graylog2-server/graylog-plugin-parent/graylog-plugin-web-parent/pom.xml 4.0.0 @@ -36,39 +36,10 @@ - com.mycila - license-maven-plugin - - - - check - - - + de.thetaphi + forbiddenapis - - -
com/mycila/maven/plugin/license/templates/SSPL-1.txt
- - 2024 - johan@nosd.in - - - **/src/main/java/** - **/src/test/java/** - **/pom.xml - *.js - src/web/**/*.js - src/web/**/*.jsx - src/web/**/*.ts - src/web/**/*.tsx - src/web/**/*.css - - - *.config.js - -
-
+ true
@@ -79,12 +50,25 @@ maven-compiler-plugin - 3.10.1 + 3.13.0 17 true true - true + false + true + + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED + com.google.auto.value.processor.AutoValueProcessor @@ -119,6 +103,12 @@ false + + + com.fasterxml.jackson.core:* + joda-time:joda-time + + @@ -195,7 +185,7 @@ com.github.eirslett frontend-maven-plugin - 1.9.1 + 1.15.0 install node and yarn @@ -203,8 +193,8 @@ install-node-and-yarn - v16.13.0 - v1.22.17 + ${nodejs.version} + ${yarn.version} @@ -214,8 +204,6 @@ install - v16.13.0 - v1.22.17 @@ -225,15 +213,9 @@ run build - v16.13.0 - v1.22.17 - - v16.13.0 - v1.22.17 -
@@ -241,890 +223,72 @@ - org.graylog2 - graylog2-server - 5.0.0 - provided - - - 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-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 - - - slf4j-api - org.slf4j - - - auto-value-annotations - com.google.auto.value - - - jdot - info.leadinglight - - - streamex - one.util - - - cron-utils - com.cronutils - - + com.fasterxml.jackson.core + jackson-databind + 2.17.1 + compile + + + joda-time + joda-time + 2.12.7 + compile org.graylog2 graylog2-server - 5.0.0 + 6.0.0 + provided + + + org.graylog2 + graylog2-server + 6.0.0 test-jar test + + + org.slf4j + slf4j-jdk14 + 1.7.21 + provided + + + com.google.inject + guice + 7.0.0 + provided - airline - com.github.rvesse + jakarta.inject-api + jakarta.inject + + + aopalliance + aopalliance 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-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 - - - slf4j-api - org.slf4j - - - auto-value-annotations - com.google.auto.value - - - jdot - info.leadinglight - - - streamex - one.util - - - cron-utils - com.cronutils + + + + com.google.inject.extensions + guice-assistedinject + 7.0.0 + provided + + + error_prone_annotations + com.google.errorprone com.google.auto.value auto-value - 1.7.4 + 1.10.4 provided @@ -1141,10 +305,6 @@ auto-value-extension-util com.gabrielittner.auto.value - - jackson-annotations - com.fasterxml.jackson.core - guava com.google.guava @@ -1153,11 +313,26 @@ + 7.0.0 /usr/share/graylog-server/plugin - 17 - ${project.parent.version} - 17 + 11 + 6.0.0 + 11 + 1.3.2 + v1.22.19 + 4.2.25 + 2.17.1 + 1.6.8.1 + 2.5.2 + false + 1.10.4 + 11 + 4.3 UTF-8 + 3.14.0 + v18.18.0 + 3.0.2 + 2.12.7 true diff --git a/pom.xml b/pom.xml index b59ffd0..3545e9b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.graylog.plugins graylog-plugin-web-parent - 5.0.0 + 6.0.0 ../graylog2-server/graylog-plugin-parent/graylog-plugin-web-parent @@ -54,56 +54,69 @@ UTF-8 - 17 - 17 + 11 + 11 + 11 + false true - ${project.parent.version} /usr/share/graylog-server/plugin + + 6.0.0 + 7.0.0 + 1.10.4 + 2.5.2 + 2.17.1 + 3.0.2 + 2.12.7 + 3.14.0 + 4.2.25 + 1.3.2 + 4.3 + + + v18.18.0 + v1.22.19 + + + 4.3 + 1.6.8.1 - - + + + io.dropwizard.metrics + metrics-core + ${metrics.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + jakarta.validation + jakarta.validation-api + ${validation-api.version} + + + joda-time + joda-time + ${joda-time.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + com.google.auto.value + auto-value-annotations + ${auto-value.version} + org.graylog2 graylog2-server @@ -118,6 +131,24 @@ test-jar test + + org.slf4j + slf4j-jdk14 + 1.7.21 + provided + + + com.google.inject + guice + ${guice.version} + provided + + + com.google.inject.extensions + guice-assistedinject + ${guice.version} + provided + com.google.auto.value auto-value @@ -147,42 +178,12 @@ - com.mycila - license-maven-plugin + de.thetaphi + forbiddenapis - - -
com/mycila/maven/plugin/license/templates/SSPL-1.txt
- - 2024 - johan@nosd.in - - - **/src/main/java/** - **/src/test/java/** - **/pom.xml - *.js - src/web/**/*.js - src/web/**/*.jsx - src/web/**/*.ts - src/web/**/*.tsx - src/web/**/*.css - - - *.config.js - -
-
+ true
- - - - check - - -
- maven-assembly-plugin @@ -193,12 +194,25 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.13.0 17 true true - true + false + true + + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED + com.google.auto.value.processor.AutoValueProcessor @@ -224,6 +238,12 @@ 2.4.1 false + + + com.fasterxml.jackson.core:* + joda-time:joda-time + + @@ -322,6 +342,7 @@ com.github.eirslett frontend-maven-plugin + 1.15.0