Merge pull request #4 from FlorianLautenschlager/master

Upgrade to Chronix-Server 0.3

Author: Florian Lautenschlager

build.gradle

@@ -58,7 +58,7 @@ subprojects {
     apply plugin: 'com.jfrog.bintray'
     apply plugin: 'com.github.hierynomus.license'
 
-    version = "0.2"
+    version = "0.3"
 
     license {
         includes(["**/*.java", "**/*.groovy"])

chronix-importer/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     compile 'org.yaml:snakeyaml:1.17'
 
     compile 'de.qaware.chronix:chronix-api:0.1'
-    compile 'de.qaware.chronix:chronix-server-client:0.2'
+    compile 'de.qaware.chronix:chronix-server-client:0.3'
     compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.2'
     compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.2'
 
@@ -30,5 +30,5 @@ jar {
 
 task buildRelease(type: Copy) {
     into "$projectDir/release/lib"
-    from "$buildDir/libs/chronix-importer-0.2.jar"
+    from "$buildDir/libs/chronix-importer-0.3.jar"
 }

chronix-importer/release/config.yml

@@ -19,7 +19,7 @@ csvDelimiter: ;
 attributeFields:
  - host
  - group
- - process
+ - source
 
 
 #Will parse the csv files without importing them.

chronix-importer/release/import.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-java -Dlog4j.configurationFile=log4j2.xml -jar lib/chronix-importer-0.2.jar config.yml data/
+java -Dlog4j.configurationFile=log4j2.xml -jar lib/chronix-importer-0.3.jar config.yml data/

chronix-server-integration/build.gradle

@@ -31,7 +31,7 @@ dependencies {
 
     //Chronix
     compile 'de.qaware.chronix:chronix-api:0.1'
-    compile 'de.qaware.chronix:chronix-server-client:0.2'
+    compile 'de.qaware.chronix:chronix-server-client:0.3'
 
     //Kassiopeia-Simple
     compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.2'
@@ -42,6 +42,6 @@ dependencies {
     compile 'de.qaware.chronix:chronix-kassiopeia-converter:0.2'
 
     //Solr
-    compile 'org.apache.solr:solr-solrj:6.0.1'
+    compile 'org.apache.solr:solr-solrj:6.1.0'
 
 }

chronix-timeseries-exploration/build.gradle

@@ -24,12 +24,12 @@ dependencies {
     compile 'org.apache.logging.log4j:log4j-core:2.4'
 
     //Chronix libs
-    compile 'org.apache.solr:solr-solrj:6.0.0'
+    compile 'org.apache.solr:solr-solrj:6.1.0'
     //Solr need commons logging
     compile 'commons-logging:commons-logging:1.2'
 
     compile 'de.qaware.chronix:chronix-api:0.1'
-    compile 'de.qaware.chronix:chronix-server-client:0.2'
+    compile 'de.qaware.chronix:chronix-server-client:0.3'
     compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.2'
     compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.2'
 }