Merge pull request #329 from LeonaLog/4.4.1

release v4.4.1

Author: ciusji

.gitignore

@@ -28,6 +28,10 @@ dependency-reduced-pom.xml
 /plugin/
 *_gl2plugin.jar
 
+
+/docker/leonalog/leona/plugin/graylog-storage-elasticsearch7-4.4.0-SNAPSHOT.jar
+/docker/leonalog/leona/leona-server-4.4.1-SNAPSHOT-shaded.jar
+
 *.iml
 *.ipr
 *.iws

distribution/src/main/assembly/graylog.xml

@@ -36,7 +36,7 @@
     </fileSets>
     <files>
         <file>
-            <source>${project.basedir}/../graylog2-server/target/graylog2-server-${project.version}-shaded.jar</source>
+            <source>${project.basedir}/../log2-server/target/graylog2-server-${project.version}-shaded.jar</source>
             <destName>graylog.jar</destName>
             <outputDirectory>.</outputDirectory>
         </file>
@@ -51,11 +51,11 @@
             <outputDirectory>.</outputDirectory>
         </file>
         <file>
-            <source>${project.basedir}/../graylog-storage-elasticsearch6/target/graylog-storage-elasticsearch6-${project.version}.jar</source>
+            <source>${project.basedir}/../log-storage-elasticsearch6/target/graylog-storage-elasticsearch6-${project.version}.jar</source>
             <outputDirectory>plugin/</outputDirectory>
         </file>
         <file>
-            <source>${project.basedir}/../graylog-storage-elasticsearch7/target/graylog-storage-elasticsearch7-${project.version}.jar</source>
+            <source>${project.basedir}/../log-storage-elasticsearch7/target/graylog-storage-elasticsearch7-${project.version}.jar</source>
             <outputDirectory>plugin/</outputDirectory>
         </file>
     </files>

full-backend-tests/pom.xml

@@ -24,7 +24,7 @@
         <groupId>org.graylog</groupId>
         <artifactId>graylog-project-parent</artifactId>
         <version>4.4.1-SNAPSHOT</version>
-        <relativePath>../graylog-project-parent</relativePath>
+        <relativePath>../log-project-parent</relativePath>
     </parent>
 
     <artifactId>full-backend-tests</artifactId>

graylog-plugin-archetype/.gitignore log-plugin-archetype/.gitignoregraylog-plugin-archetype/.gitignore renamed to log-plugin-archetype/.gitignore

@@ -23,11 +23,11 @@
         <groupId>org.graylog</groupId>
         <artifactId>graylog-project-parent</artifactId>
         <version>4.4.1-SNAPSHOT</version>
-        <relativePath>../graylog-project-parent</relativePath>
+        <relativePath>../log-project-parent</relativePath>
     </parent>
 
     <artifactId>graylog-plugin-archetype</artifactId>
-    <name>graylog-plugin-archetype</name>
+    <name>log-plugin-archetype</name>
     <url>https://www.graylog.org/</url>
     <packaging>maven-archetype</packaging>
 

graylog-plugin-archetype/.mailmap log-plugin-archetype/.mailmapgraylog-plugin-archetype/.mailmap renamed to log-plugin-archetype/.mailmap

@@ -24,7 +24,7 @@
         </requiredProperty>
 
         <requiredProperty key="serverCheckoutPath">
-            <defaultValue>../graylog2-server</defaultValue>
+            <defaultValue>../log2-server</defaultValue>
         </requiredProperty>
     </requiredProperties>