Merge branch 'master' into cef-issue-21

dkhamitov · Feb 16, 2018 · ded3c02 · ded3c02
2 parents 20ab3b6 + 92bfa94
commit ded3c02
Show file tree

Hide file tree

Showing 383 changed files with 28,034 additions and 738 deletions.
diff --git a/graylog-project-parent/pom.xml b/graylog-project-parent/pom.xml
@@ -500,6 +500,21 @@
                 <artifactId>cef-parser</artifactId>
                 <version>${cef-parser.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>${antlr.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jooq</groupId>
+                <artifactId>jool</artifactId>
+                <version>${jool.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup</groupId>
+                <artifactId>javapoet</artifactId>
+                <version>${javapoet.version}</version>
+            </dependency>
 
             <!-- Test dependencies -->
             <dependency>

diff --git a/graylog2-server/pom.xml b/graylog2-server/pom.xml
@@ -489,6 +489,18 @@
             <groupId>org.graylog.cef</groupId>
             <artifactId>cef-parser</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jooq</groupId>
+            <artifactId>jool</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup</groupId>
+            <artifactId>javapoet</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
@@ -690,6 +702,18 @@
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>antlr</id>
+                        <goals>
+                            <goal>antlr4</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>