Skip to content

Commit

Permalink
Merge pull request Graylog2#4592 from Graylog2/pipeline-issue-216
Browse files Browse the repository at this point in the history
Merge Pipeline Processor plugin into Graylog core

Closes Graylog2/graylog-plugin-pipeline-processor#216
  • Loading branch information
joschi authored Feb 16, 2018
2 parents ec27f5f + 4a61696 commit 92bfa94
Show file tree
Hide file tree
Showing 338 changed files with 25,321 additions and 3 deletions.
15 changes: 15 additions & 0 deletions graylog-project-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,21 @@
<artifactId>validation-api</artifactId>
<version>${validation-api.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>
Expand Down
24 changes: 24 additions & 0 deletions graylog2-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,18 @@
<groupId>javax.validation</groupId>
<artifactId>validation-api</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>
Expand Down Expand Up @@ -686,6 +698,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>
Expand Down
Loading

0 comments on commit 92bfa94

Please sign in to comment.