From a935b53b15da6343f27b9415bf53e59a72da5f61 Mon Sep 17 00:00:00 2001
From: yo000 <johan@nosd.in>
Date: Sun, 9 Feb 2025 18:42:01 +0100
Subject: [PATCH] update to graylog 6.1.0, disable license check, use node &
 yarn versions from graylog2-server parent pom

---
 dependency-reduced-pom.xml | 13 +++++++++----
 pom.xml                    | 15 +++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 535f9cf..46a8b41 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>graylog-plugin-web-parent</artifactId>
     <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>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -42,6 +42,13 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
@@ -314,12 +321,11 @@
   </dependencies>
   <properties>
     <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>
     <graylog.version>6.0.0</graylog.version>
     <maven.compiler.source>11</maven.compiler.source>
     <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>
     <jackson.version>2.17.1</jackson.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>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <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>
     <joda-time.version>2.12.7</joda-time.version>
     <maven.deploy.skip>true</maven.deploy.skip>
diff --git a/pom.xml b/pom.xml
index 7901663..8c3774d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.graylog.plugins</groupId>
         <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>
     </parent>
 
@@ -62,7 +62,7 @@
         <!-- Plugins will not be deployed by default - set to `false` if you actually want to deploy it -->
         <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>
         <guice.version>7.0.0</guice.version>
@@ -76,10 +76,6 @@
         <javax.annotation-api.version>1.3.2</javax.annotation-api.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 -->
         <license-maven.version>4.3</license-maven.version>
         <download-maven-plugin.version>1.6.8.1</download-maven-plugin.version>
@@ -184,6 +180,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>