Browse Source

renamed module

Martijn van Groningen 7 years ago
parent
commit
3fad16e76c
28 changed files with 6 additions and 4 deletions
  1. 5 3
      libs/grok/build.gradle
  2. 0 0
      libs/grok/licenses/jcodings-1.0.12.jar.sha1
  3. 0 0
      libs/grok/licenses/jcodings-LICENSE.txt
  4. 0 0
      libs/grok/licenses/jcodings-NOTICE.txt
  5. 0 0
      libs/grok/licenses/joni-2.1.6.jar.sha1
  6. 0 0
      libs/grok/licenses/joni-LICENSE.txt
  7. 0 0
      libs/grok/licenses/joni-NOTICE.txt
  8. 0 0
      libs/grok/src/main/java/org/elasticsearch/grok/Grok.java
  9. 0 0
      libs/grok/src/main/java/org/elasticsearch/grok/GrokMatchGroup.java
  10. 0 0
      libs/grok/src/main/resources/patterns/aws
  11. 0 0
      libs/grok/src/main/resources/patterns/bacula
  12. 0 0
      libs/grok/src/main/resources/patterns/bro
  13. 0 0
      libs/grok/src/main/resources/patterns/exim
  14. 0 0
      libs/grok/src/main/resources/patterns/firewalls
  15. 0 0
      libs/grok/src/main/resources/patterns/grok-patterns
  16. 0 0
      libs/grok/src/main/resources/patterns/haproxy
  17. 0 0
      libs/grok/src/main/resources/patterns/java
  18. 0 0
      libs/grok/src/main/resources/patterns/junos
  19. 0 0
      libs/grok/src/main/resources/patterns/linux-syslog
  20. 0 0
      libs/grok/src/main/resources/patterns/mcollective-patterns
  21. 0 0
      libs/grok/src/main/resources/patterns/mongodb
  22. 0 0
      libs/grok/src/main/resources/patterns/nagios
  23. 0 0
      libs/grok/src/main/resources/patterns/postgresql
  24. 0 0
      libs/grok/src/main/resources/patterns/rails
  25. 0 0
      libs/grok/src/main/resources/patterns/redis
  26. 0 0
      libs/grok/src/main/resources/patterns/ruby
  27. 0 0
      libs/grok/src/test/java/org/elasticsearch/grok/GrokTests.java
  28. 1 1
      modules/ingest-common/build.gradle

+ 5 - 3
libs/grok-common/build.gradle → libs/grok/build.gradle

@@ -21,14 +21,16 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
 
 apply plugin: 'elasticsearch.build'
 
+archivesBaseName = 'elasticsearch-grok'
+
 dependencies {
     compile 'org.jruby.joni:joni:2.1.6'
     // joni dependencies:
     compile 'org.jruby.jcodings:jcodings:1.0.12'
 
-    if (isEclipse == false || project.path == ":libs:grok-common-tests") {
+    if (isEclipse == false || project.path == ":libs:grok-tests") {
         testCompile("org.elasticsearch.test:framework:${version}") {
-            exclude group: 'org.elasticsearch', module: 'grok-common'
+            exclude group: 'org.elasticsearch', module: 'grok'
         }
     }
 }
@@ -40,7 +42,7 @@ forbiddenApisMain {
 if (isEclipse) {
     // in eclipse the project is under a fake root, we need to change around the source sets
     sourceSets {
-        if (project.path == ":libs:grok-common") {
+        if (project.path == ":libs:grok") {
             main.java.srcDirs = ['java']
             main.resources.srcDirs = ['resources']
         } else {

+ 0 - 0
libs/grok-common/licenses/jcodings-1.0.12.jar.sha1 → libs/grok/licenses/jcodings-1.0.12.jar.sha1


+ 0 - 0
libs/grok-common/licenses/jcodings-LICENSE.txt → libs/grok/licenses/jcodings-LICENSE.txt


+ 0 - 0
libs/grok-common/licenses/jcodings-NOTICE.txt → libs/grok/licenses/jcodings-NOTICE.txt


+ 0 - 0
libs/grok-common/licenses/joni-2.1.6.jar.sha1 → libs/grok/licenses/joni-2.1.6.jar.sha1


+ 0 - 0
libs/grok-common/licenses/joni-LICENSE.txt → libs/grok/licenses/joni-LICENSE.txt


+ 0 - 0
libs/grok-common/licenses/joni-NOTICE.txt → libs/grok/licenses/joni-NOTICE.txt


+ 0 - 0
libs/grok-common/src/main/java/org/elasticsearch/grok/Grok.java → libs/grok/src/main/java/org/elasticsearch/grok/Grok.java


+ 0 - 0
libs/grok-common/src/main/java/org/elasticsearch/grok/GrokMatchGroup.java → libs/grok/src/main/java/org/elasticsearch/grok/GrokMatchGroup.java


+ 0 - 0
libs/grok-common/src/main/resources/patterns/aws → libs/grok/src/main/resources/patterns/aws


+ 0 - 0
libs/grok-common/src/main/resources/patterns/bacula → libs/grok/src/main/resources/patterns/bacula


+ 0 - 0
libs/grok-common/src/main/resources/patterns/bro → libs/grok/src/main/resources/patterns/bro


+ 0 - 0
libs/grok-common/src/main/resources/patterns/exim → libs/grok/src/main/resources/patterns/exim


+ 0 - 0
libs/grok-common/src/main/resources/patterns/firewalls → libs/grok/src/main/resources/patterns/firewalls


+ 0 - 0
libs/grok-common/src/main/resources/patterns/grok-patterns → libs/grok/src/main/resources/patterns/grok-patterns


+ 0 - 0
libs/grok-common/src/main/resources/patterns/haproxy → libs/grok/src/main/resources/patterns/haproxy


+ 0 - 0
libs/grok-common/src/main/resources/patterns/java → libs/grok/src/main/resources/patterns/java


+ 0 - 0
libs/grok-common/src/main/resources/patterns/junos → libs/grok/src/main/resources/patterns/junos


+ 0 - 0
libs/grok-common/src/main/resources/patterns/linux-syslog → libs/grok/src/main/resources/patterns/linux-syslog


+ 0 - 0
libs/grok-common/src/main/resources/patterns/mcollective-patterns → libs/grok/src/main/resources/patterns/mcollective-patterns


+ 0 - 0
libs/grok-common/src/main/resources/patterns/mongodb → libs/grok/src/main/resources/patterns/mongodb


+ 0 - 0
libs/grok-common/src/main/resources/patterns/nagios → libs/grok/src/main/resources/patterns/nagios


+ 0 - 0
libs/grok-common/src/main/resources/patterns/postgresql → libs/grok/src/main/resources/patterns/postgresql


+ 0 - 0
libs/grok-common/src/main/resources/patterns/rails → libs/grok/src/main/resources/patterns/rails


+ 0 - 0
libs/grok-common/src/main/resources/patterns/redis → libs/grok/src/main/resources/patterns/redis


+ 0 - 0
libs/grok-common/src/main/resources/patterns/ruby → libs/grok/src/main/resources/patterns/ruby


+ 0 - 0
libs/grok-common/src/test/java/org/elasticsearch/grok/GrokTests.java → libs/grok/src/test/java/org/elasticsearch/grok/GrokTests.java


+ 1 - 1
modules/ingest-common/build.gradle

@@ -23,7 +23,7 @@ esplugin {
 }
 
 dependencies {
-    compile project(':libs:grok-common')
+    compile project(':libs:grok')
 }
 
 compileJava.options.compilerArgs << "-Xlint:-unchecked,-rawtypes"