yo/graylog-plugin-redis-lookup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

update to graylog 6.1.0, disable license check, use node & yarn versions from graylog2-server parent pom

Browse Source
This commit is contained in:
yo000
2025-02-09 18:42:01 +01:00
parent 5dcd438e73
commit a935b53b15
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dependency-reduced-pom.xml
View File

@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>graylog-plugin-web-parent</artifactId> <artifactId>graylog-plugin-web-parent</artifactId>
<groupId>org.graylog.plugins</groupId> <groupId>org.graylog.plugins</groupId>
<version>6.0.0</version> <version>6.1.0</version>
<relativePath>../graylog2-server/graylog-plugin-parent/graylog-plugin-web-parent/pom.xml</relativePath> <relativePath>../graylog2-server/graylog-plugin-parent/graylog-plugin-web-parent/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -42,6 +42,13 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>
@ -314,12 +321,11 @@
</dependencies> </dependencies>
<properties> <properties>
<guice.version>7.0.0</guice.version> <guice.version>7.0.0</guice.version>
<graylog.plugin-dir>/usr/share/graylog-server/plugin</graylog.plugin-dir> <graylog.plugin-dir>/usr/local/share/graylog/plugin</graylog.plugin-dir>
<maven.compiler.release>11</maven.compiler.release> <maven.compiler.release>11</maven.compiler.release>
<graylog.version>6.0.0</graylog.version> <graylog.version>6.0.0</graylog.version>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version> <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<yarn.version>v1.22.19</yarn.version>
<metrics.version>4.2.25</metrics.version> <metrics.version>4.2.25</metrics.version>
<jackson.version>2.17.1</jackson.version> <jackson.version>2.17.1</jackson.version>
<download-maven-plugin.version>1.6.8.1</download-maven-plugin.version> <download-maven-plugin.version>1.6.8.1</download-maven-plugin.version>
@ -330,7 +336,6 @@
<license-maven.version>4.3</license-maven.version> <license-maven.version>4.3</license-maven.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<commons-lang3.version>3.14.0</commons-lang3.version> <commons-lang3.version>3.14.0</commons-lang3.version>
<nodejs.version>v18.18.0</nodejs.version>
<validation-api.version>3.0.2</validation-api.version> <validation-api.version>3.0.2</validation-api.version>
<joda-time.version>2.12.7</joda-time.version> <joda-time.version>2.12.7</joda-time.version>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>

15
pom.xml
View File

@ -25,7 +25,7 @@
<parent> <parent>
<groupId>org.graylog.plugins</groupId> <groupId>org.graylog.plugins</groupId>
<artifactId>graylog-plugin-web-parent</artifactId> <artifactId>graylog-plugin-web-parent</artifactId>
<version>6.0.0</version> <version>6.1.0</version>
<relativePath>../graylog2-server/graylog-plugin-parent/graylog-plugin-web-parent</relativePath> <relativePath>../graylog2-server/graylog-plugin-parent/graylog-plugin-web-parent</relativePath>
</parent> </parent>
@ -62,7 +62,7 @@
<!-- Plugins will not be deployed by default - set to `false` if you actually want to deploy it --> <!-- Plugins will not be deployed by default - set to `false` if you actually want to deploy it -->
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
<graylog.plugin-dir>/usr/share/graylog-server/plugin</graylog.plugin-dir> <graylog.plugin-dir>/usr/local/share/graylog/plugin</graylog.plugin-dir>
<graylog.version>6.0.0</graylog.version> <graylog.version>6.0.0</graylog.version>
<guice.version>7.0.0</guice.version> <guice.version>7.0.0</guice.version>
@ -76,10 +76,6 @@
<javax.annotation-api.version>1.3.2</javax.annotation-api.version> <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<license-maven.version>4.3</license-maven.version> <license-maven.version>4.3</license-maven.version>
<!-- Nodejs dependencies -->
<nodejs.version>v18.18.0</nodejs.version>
<yarn.version>v1.22.19</yarn.version>
<!-- Plugin versions --> <!-- Plugin versions -->
<license-maven.version>4.3</license-maven.version> <license-maven.version>4.3</license-maven.version>
<download-maven-plugin.version>1.6.8.1</download-maven-plugin.version> <download-maven-plugin.version>1.6.8.1</download-maven-plugin.version>
@ -184,6 +180,13 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>