This is an automated email from the ASF dual-hosted git repository.
fgreg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-ningester.git
The following commit(s) were added to refs/heads/master by this push:
new 7209b75 Updated docker image to include RANDOMIZE_NINGESTERPY_PORT
environment variable. If this variable is set to anything but "false", the port
that ningesterpy runs on will be a random available port. (#11)
7209b75 is described below
commit 7209b75f6f7e8aacdaa6727010f0564e70e4fcb7
Author: fgreg <[email protected]>
AuthorDate: Wed Aug 29 09:33:53 2018 -0700
Updated docker image to include RANDOMIZE_NINGESTERPY_PORT environment
variable. If this variable is set to anything but "false", the port that
ningesterpy runs on will be a random available port. (#11)
---
.idea/modules/ningester_main.iml | 128 ++++++++++++++--------------
.idea/modules/ningester_test.iml | 158 +++++++++++++++++------------------
.idea/modules/ningester_testJobs.iml | 158 +++++++++++++++++------------------
docker/Dockerfile | 10 ++-
docker/aws/Dockerfile | 53 +-----------
docker/aws/entrypoint.sh | 32 ++++++-
docker/aws/install_nexusproto.sh | 32 -------
docker/aws/install_ningester.sh | 30 -------
docker/aws/install_ningesterpy.sh | 30 -------
docker/entrypoint.sh | 36 +++++++-
10 files changed, 285 insertions(+), 382 deletions(-)
diff --git a/.idea/modules/ningester_main.iml b/.idea/modules/ningester_main.iml
index ecd2147..8f1ee9f 100644
--- a/.idea/modules/ningester_main.iml
+++ b/.idea/modules/ningester_main.iml
@@ -14,85 +14,83 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-batch:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-web:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-cassandra:2.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-solr:3.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.197"
level="project" />
- <orderEntry type="library" name="Gradle:
mysql:mysql-connector-java:5.1.46" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-batch:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-web:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-cassandra:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-solr:2.1.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.196"
level="project" />
+ <orderEntry type="library" name="Gradle:
mysql:mysql-connector-java:5.1.44" level="project" />
<orderEntry type="library" name="Gradle:
org.apache.sdap:nexusproto:1.0.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Gradle:
com.google.protobuf:protobuf-java-util:3.5.1" level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:cdm:4.6.9"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-cql:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Gradle: com.google.guava:guava:19.0"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-starter-aws:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-dynamodb:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-core:4.0.1.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-autoconfigure:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-context:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-autoconfigure:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-context:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-tx:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-commons:2.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-core:2.0.0.RELEASE" level="project"
/>
- <orderEntry type="library" name="Gradle:
org.springframework:spring-aop:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-beans:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-expression:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-infrastructure:4.0.1.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-core:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
com.datastax.cassandra:cassandra-driver-core:3.4.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-dynamodb:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-s3:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-jdbc:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-core:3.0.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-context:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-commons:1.13.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-jdbc:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-tx:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-beans:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-expression:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-infrastructure:3.0.8.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.retry:spring-retry:1.2.1.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-core:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
com.datastax.cassandra:cassandra-driver-core:3.1.4" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-logging:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle: org.slf4j:jcl-over-slf4j:1.7.25"
level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:httpservices:4.6.9"
level="project" />
- <orderEntry type="library" name="Gradle:
org.quartz-scheduler:quartz:2.3.0" level="project" />
- <orderEntry type="library" name="Gradle: com.zaxxer:HikariCP:2.7.9"
level="project" />
- <orderEntry type="library" name="Gradle:
io.dropwizard.metrics:metrics-core:3.2.6" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-logging:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-classic:1.2.3" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
+ <orderEntry type="library" name="Gradle:
org.quartz-scheduler:quartz:2.2.0" level="project" />
+ <orderEntry type="library" name="Gradle:
io.dropwizard.metrics:metrics-core:3.1.5" level="project" />
+ <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-classic:1.1.11" level="project" />
<orderEntry type="library" name="Gradle: org.slf4j:jul-to-slf4j:1.7.25"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.commons:commons-lang3:3.7" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.solr:solr-solrj:6.6.4"
level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-s3:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-kms:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-ec2:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-cloudformation:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-core:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:jmespath-java:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.commons:commons-lang3:3.1" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.solr:solr-solrj:5.5.5"
level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-kms:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-core:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-databind:2.8.10" level="project" />
<orderEntry type="library" name="Gradle:
com.google.protobuf:protobuf-java:3.5.1" level="project" />
- <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5"
level="project" />
+ <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2"
level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:udunits:4.6.9"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpmime:4.5.5" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpclient:4.5.5" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpcore:4.4.9" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpmime:4.5.3" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpclient:4.5.3" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpcore:4.4.8" level="project" />
<orderEntry type="library" name="Gradle: joda-time:joda-time:2.9.9"
level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6"
level="project" />
<orderEntry type="library" name="Gradle: net.jcip:jcip-annotations:1.0"
level="project" />
<orderEntry type="library" name="Gradle: com.beust:jcommander:1.35"
level="project" />
- <orderEntry type="library" name="Gradle:
javax.annotation:javax.annotation-api:1.3.2" level="project" />
- <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.19"
level="project" />
- <orderEntry type="library" name="Gradle: javax.batch:javax.batch-api:1.0"
level="project" />
+ <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.17"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.tomcat:tomcat-jdbc:8.5.23" level="project" />
+ <orderEntry type="library" name="Gradle:
com.ibm.jbatch:com.ibm.jbatch-tck-spi:1.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.thoughtworks.xstream:xstream:1.4.7" level="project" />
<orderEntry type="library" name="Gradle:
org.codehaus.jettison:jettison:1.2" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-jcl:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-handler:4.1.25.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-handler:4.0.37.Final" level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-posix:3.0.27"
level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-ffi:2.0.7"
level="project" />
<orderEntry type="library" name="Gradle: commons-io:commons-io:2.4"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.commons:commons-math3:3.4.1" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.zookeeper:zookeeper:3.4.10" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.zookeeper:zookeeper:3.4.6" level="project" />
<orderEntry type="library" name="Gradle: org.noggit:noggit:0.6"
level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.6" level="project"
/>
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
- <orderEntry type="library" name="Gradle:
com.mchange:mchange-commons-java:0.2.11" level="project" />
- <orderEntry type="library" name="Gradle:
software.amazon.ion:ion-java:1.0.2" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-codec:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-transport:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-buffer:4.1.25.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.10"
level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-core:2.8.10" level="project" />
+ <orderEntry type="library" name="Gradle: c3p0:c3p0:0.9.1.1"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.tomcat:tomcat-juli:8.5.23" level="project" />
+ <orderEntry type="library" name="Gradle: javax.batch:javax.batch-api:1.0"
level="project" />
+ <orderEntry type="library" name="Gradle: xmlpull:xmlpull:1.1.3.1"
level="project" />
+ <orderEntry type="library" name="Gradle: xpp3:xpp3_min:1.1.4c"
level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-codec:4.0.37.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-transport:4.0.37.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-buffer:4.0.37.Final" level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jffi:1.2.10"
level="project" />
<orderEntry type="library" name="Gradle:
com.github.jnr:jffi:native:1.2.10" level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-commons:5.0.3"
level="project" />
@@ -102,11 +100,9 @@
<orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-x86asm:1.0.2"
level="project" />
<orderEntry type="library" name="Gradle:
com.github.jnr:jnr-constants:0.9.0" level="project" />
- <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-core:1.2.3" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-resolver:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-common:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-configuration-processor:2.0.3.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-core:1.1.11" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-common:4.0.37.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
</component>
<component name="PyDocumentationSettings">
<option name="renderExternalDocumentation" value="true" />
diff --git a/.idea/modules/ningester_test.iml b/.idea/modules/ningester_test.iml
index 74a181b..1982571 100644
--- a/.idea/modules/ningester_test.iml
+++ b/.idea/modules/ningester_test.iml
@@ -15,119 +15,111 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="ningester_main" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-batch:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-web:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-cassandra:2.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-solr:3.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.197"
level="project" />
- <orderEntry type="library" name="Gradle:
mysql:mysql-connector-java:5.1.46" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Gradle:
com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-batch:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-web:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-cassandra:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-solr:2.1.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.196"
level="project" />
+ <orderEntry type="library" name="Gradle:
mysql:mysql-connector-java:5.1.44" level="project" />
<orderEntry type="library" name="Gradle:
org.apache.sdap:nexusproto:1.0.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Gradle:
com.google.protobuf:protobuf-java-util:3.5.1" level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:cdm:4.6.9"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-cql:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Gradle: com.google.guava:guava:19.0"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-starter-aws:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-dynamodb:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-test:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-test:4.0.1.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-core:4.0.1.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-autoconfigure:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-context:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-test-autoconfigure:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-test:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-autoconfigure:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-context:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-tx:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-commons:2.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-core:2.0.0.RELEASE" level="project"
/>
- <orderEntry type="library" name="Gradle:
org.springframework:spring-aop:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-beans:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-expression:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-test:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-infrastructure:4.0.1.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-core:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
com.datastax.cassandra:cassandra-driver-core:3.4.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-dynamodb:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-s3:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-test:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-test:3.0.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-jdbc:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-core:3.0.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-test-autoconfigure:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-test:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-context:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-commons:1.13.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-jdbc:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-tx:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-beans:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-expression:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-test:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-infrastructure:3.0.8.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.retry:spring-retry:1.2.1.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-core:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
com.datastax.cassandra:cassandra-driver-core:3.1.4" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-logging:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle: org.slf4j:jcl-over-slf4j:1.7.25"
level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:httpservices:4.6.9"
level="project" />
- <orderEntry type="library" name="Gradle:
org.quartz-scheduler:quartz:2.3.0" level="project" />
- <orderEntry type="library" name="Gradle:
com.jayway.jsonpath:json-path:2.4.0" level="project" />
- <orderEntry type="library" name="Gradle: com.zaxxer:HikariCP:2.7.9"
level="project" />
- <orderEntry type="library" name="Gradle:
io.dropwizard.metrics:metrics-core:3.2.6" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-logging:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-classic:1.2.3" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
+ <orderEntry type="library" name="Gradle:
org.quartz-scheduler:quartz:2.2.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.jayway.jsonpath:json-path:2.2.0" level="project" />
+ <orderEntry type="library" name="Gradle:
io.dropwizard.metrics:metrics-core:3.1.5" level="project" />
+ <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-classic:1.1.11" level="project" />
<orderEntry type="library" name="Gradle: org.slf4j:jul-to-slf4j:1.7.25"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.commons:commons-lang3:3.7" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.solr:solr-solrj:6.6.4"
level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-s3:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-kms:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-ec2:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-cloudformation:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-core:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:jmespath-java:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.commons:commons-lang3:3.1" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.solr:solr-solrj:5.5.5"
level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-kms:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-core:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-databind:2.8.10" level="project" />
<orderEntry type="library" name="Gradle:
com.google.protobuf:protobuf-java:3.5.1" level="project" />
- <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5"
level="project" />
+ <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2"
level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:udunits:4.6.9"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpmime:4.5.5" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpclient:4.5.5" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpcore:4.4.9" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpmime:4.5.3" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpclient:4.5.3" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpcore:4.4.8" level="project" />
<orderEntry type="library" name="Gradle: joda-time:joda-time:2.9.9"
level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6"
level="project" />
<orderEntry type="library" name="Gradle: net.jcip:jcip-annotations:1.0"
level="project" />
<orderEntry type="library" name="Gradle: com.beust:jcommander:1.35"
level="project" />
<orderEntry type="library" name="Gradle: junit:junit:4.12" level="project"
/>
- <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.9.1"
level="project" />
- <orderEntry type="library" name="Gradle: org.mockito:mockito-core:2.15.0"
level="project" />
+ <orderEntry type="library" name="Gradle: org.assertj:assertj-core:2.6.0"
level="project" />
+ <orderEntry type="library" name="Gradle: org.mockito:mockito-core:1.10.19"
level="project" />
<orderEntry type="library" name="Gradle:
org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3"
level="project" />
- <orderEntry type="library" name="Gradle: org.skyscreamer:jsonassert:1.5.0"
level="project" />
- <orderEntry type="library" name="Gradle: org.xmlunit:xmlunit-core:2.5.1"
level="project" />
+ <orderEntry type="library" name="Gradle: org.skyscreamer:jsonassert:1.4.0"
level="project" />
<orderEntry type="library" name="Gradle:
commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Gradle: commons-io:commons-io:2.4"
level="project" />
- <orderEntry type="library" name="Gradle:
javax.annotation:javax.annotation-api:1.3.2" level="project" />
- <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.19"
level="project" />
- <orderEntry type="library" name="Gradle: javax.batch:javax.batch-api:1.0"
level="project" />
+ <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.17"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.tomcat:tomcat-jdbc:8.5.23" level="project" />
+ <orderEntry type="library" name="Gradle:
com.ibm.jbatch:com.ibm.jbatch-tck-spi:1.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.thoughtworks.xstream:xstream:1.4.7" level="project" />
<orderEntry type="library" name="Gradle:
org.codehaus.jettison:jettison:1.2" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-jcl:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-handler:4.1.25.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-handler:4.0.37.Final" level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-posix:3.0.27"
level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-ffi:2.0.7"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.commons:commons-math3:3.4.1" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.zookeeper:zookeeper:3.4.10" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.zookeeper:zookeeper:3.4.6" level="project" />
<orderEntry type="library" name="Gradle: org.noggit:noggit:0.6"
level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.6" level="project"
/>
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
- <orderEntry type="library" name="Gradle:
com.mchange:mchange-commons-java:0.2.11" level="project" />
- <orderEntry type="library" name="Gradle:
software.amazon.ion:ion-java:1.0.2" level="project" />
- <orderEntry type="library" name="Gradle: net.minidev:json-smart:2.3"
level="project" />
- <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy:1.7.11"
level="project" />
- <orderEntry type="library" name="Gradle:
net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
- <orderEntry type="library" name="Gradle: org.objenesis:objenesis:2.6"
level="project" />
- <orderEntry type="library" name="Gradle:
com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-codec:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-transport:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-buffer:4.1.25.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.10"
level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-core:2.8.10" level="project" />
+ <orderEntry type="library" name="Gradle: c3p0:c3p0:0.9.1.1"
level="project" />
+ <orderEntry type="library" name="Gradle: net.minidev:json-smart:2.2.1"
level="project" />
+ <orderEntry type="library" name="Gradle: org.objenesis:objenesis:2.1"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.tomcat:tomcat-juli:8.5.23" level="project" />
+ <orderEntry type="library" name="Gradle: javax.batch:javax.batch-api:1.0"
level="project" />
+ <orderEntry type="library" name="Gradle: xmlpull:xmlpull:1.1.3.1"
level="project" />
+ <orderEntry type="library" name="Gradle: xpp3:xpp3_min:1.1.4c"
level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-codec:4.0.37.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-transport:4.0.37.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-buffer:4.0.37.Final" level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jffi:1.2.10"
level="project" />
<orderEntry type="library" name="Gradle:
com.github.jnr:jffi:native:1.2.10" level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-commons:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-analysis:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-util:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-tree:5.0.3"
level="project" />
- <orderEntry type="library" name="Gradle: net.minidev:accessors-smart:1.2"
level="project" />
- <orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.4"
level="project" />
+ <orderEntry type="library" name="Gradle: net.minidev:accessors-smart:1.1"
level="project" />
+ <orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-x86asm:1.0.2"
level="project" />
<orderEntry type="library" name="Gradle:
com.github.jnr:jnr-constants:0.9.0" level="project" />
- <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-core:1.2.3" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-resolver:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-common:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-configuration-processor:2.0.3.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-core:1.1.11" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-common:4.0.37.Final" level="project" />
</component>
<component name="TestModuleProperties" production-module="ningester_main" />
</module>
\ No newline at end of file
diff --git a/.idea/modules/ningester_testJobs.iml
b/.idea/modules/ningester_testJobs.iml
index 7604d98..297ebe7 100644
--- a/.idea/modules/ningester_testJobs.iml
+++ b/.idea/modules/ningester_testJobs.iml
@@ -16,118 +16,110 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="ningester_main" />
<orderEntry type="module" module-name="ningester_test"
production-on-test="" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-batch:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-web:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-cassandra:2.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-solr:3.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.197"
level="project" />
- <orderEntry type="library" name="Gradle:
mysql:mysql-connector-java:5.1.46" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Gradle:
com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-batch:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-web:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-cassandra:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-solr:2.1.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.196"
level="project" />
+ <orderEntry type="library" name="Gradle:
mysql:mysql-connector-java:5.1.44" level="project" />
<orderEntry type="library" name="Gradle:
org.apache.sdap:nexusproto:1.0.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Gradle:
com.google.protobuf:protobuf-java-util:3.5.1" level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:cdm:4.6.9"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-cql:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Gradle: com.google.guava:guava:19.0"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-starter-aws:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-dynamodb:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-test:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-test:4.0.1.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-core:4.0.1.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-autoconfigure:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-context:2.0.0.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-test-autoconfigure:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-test:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-autoconfigure:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-context:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-tx:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-commons:2.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.cloud:spring-cloud-aws-core:2.0.0.RELEASE" level="project"
/>
- <orderEntry type="library" name="Gradle:
org.springframework:spring-aop:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-beans:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-expression:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-test:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-infrastructure:4.0.1.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-core:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
com.datastax.cassandra:cassandra-driver-core:3.4.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-dynamodb:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-s3:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-test:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-test:3.0.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-jdbc:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-core:3.0.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-test-autoconfigure:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-test:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-context:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.data:spring-data-commons:1.13.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-jdbc:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-tx:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-beans:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-expression:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-test:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.batch:spring-batch-infrastructure:3.0.8.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.retry:spring-retry:1.2.1.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework:spring-core:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Gradle:
com.datastax.cassandra:cassandra-driver-core:3.1.4" level="project" />
+ <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-logging:1.5.9.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle: org.slf4j:jcl-over-slf4j:1.7.25"
level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:httpservices:4.6.9"
level="project" />
- <orderEntry type="library" name="Gradle:
org.quartz-scheduler:quartz:2.3.0" level="project" />
- <orderEntry type="library" name="Gradle:
com.jayway.jsonpath:json-path:2.4.0" level="project" />
- <orderEntry type="library" name="Gradle: com.zaxxer:HikariCP:2.7.9"
level="project" />
- <orderEntry type="library" name="Gradle:
io.dropwizard.metrics:metrics-core:3.2.6" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-starter-logging:2.0.3.RELEASE"
level="project" />
- <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-classic:1.2.3" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
+ <orderEntry type="library" name="Gradle:
org.quartz-scheduler:quartz:2.2.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.jayway.jsonpath:json-path:2.2.0" level="project" />
+ <orderEntry type="library" name="Gradle:
io.dropwizard.metrics:metrics-core:3.1.5" level="project" />
+ <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-classic:1.1.11" level="project" />
<orderEntry type="library" name="Gradle: org.slf4j:jul-to-slf4j:1.7.25"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.commons:commons-lang3:3.7" level="project" />
- <orderEntry type="library" name="Gradle: org.apache.solr:solr-solrj:6.6.4"
level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-s3:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-kms:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-ec2:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-cloudformation:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-core:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.amazonaws:jmespath-java:1.11.336" level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.commons:commons-lang3:3.1" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.solr:solr-solrj:5.5.5"
level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-kms:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.amazonaws:aws-java-sdk-core:1.10.77" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-databind:2.8.10" level="project" />
<orderEntry type="library" name="Gradle:
com.google.protobuf:protobuf-java:3.5.1" level="project" />
- <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5"
level="project" />
+ <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2"
level="project" />
<orderEntry type="library" name="Gradle: edu.ucar:udunits:4.6.9"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpmime:4.5.5" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpclient:4.5.5" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpcore:4.4.9" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpmime:4.5.3" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpclient:4.5.3" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.httpcomponents:httpcore:4.4.8" level="project" />
<orderEntry type="library" name="Gradle: joda-time:joda-time:2.9.9"
level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6"
level="project" />
<orderEntry type="library" name="Gradle: net.jcip:jcip-annotations:1.0"
level="project" />
<orderEntry type="library" name="Gradle: com.beust:jcommander:1.35"
level="project" />
<orderEntry type="library" name="Gradle: junit:junit:4.12" level="project"
/>
- <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.9.1"
level="project" />
- <orderEntry type="library" name="Gradle: org.mockito:mockito-core:2.15.0"
level="project" />
+ <orderEntry type="library" name="Gradle: org.assertj:assertj-core:2.6.0"
level="project" />
+ <orderEntry type="library" name="Gradle: org.mockito:mockito-core:1.10.19"
level="project" />
<orderEntry type="library" name="Gradle:
org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3"
level="project" />
- <orderEntry type="library" name="Gradle: org.skyscreamer:jsonassert:1.5.0"
level="project" />
- <orderEntry type="library" name="Gradle: org.xmlunit:xmlunit-core:2.5.1"
level="project" />
+ <orderEntry type="library" name="Gradle: org.skyscreamer:jsonassert:1.4.0"
level="project" />
<orderEntry type="library" name="Gradle:
commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Gradle: commons-io:commons-io:2.4"
level="project" />
- <orderEntry type="library" name="Gradle:
javax.annotation:javax.annotation-api:1.3.2" level="project" />
- <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.19"
level="project" />
- <orderEntry type="library" name="Gradle: javax.batch:javax.batch-api:1.0"
level="project" />
+ <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.17"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.tomcat:tomcat-jdbc:8.5.23" level="project" />
+ <orderEntry type="library" name="Gradle:
com.ibm.jbatch:com.ibm.jbatch-tck-spi:1.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.thoughtworks.xstream:xstream:1.4.7" level="project" />
<orderEntry type="library" name="Gradle:
org.codehaus.jettison:jettison:1.2" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework:spring-jcl:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-handler:4.1.25.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-handler:4.0.37.Final" level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-posix:3.0.27"
level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-ffi:2.0.7"
level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.commons:commons-math3:3.4.1" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.zookeeper:zookeeper:3.4.10" level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.zookeeper:zookeeper:3.4.6" level="project" />
<orderEntry type="library" name="Gradle: org.noggit:noggit:0.6"
level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.6" level="project"
/>
- <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
- <orderEntry type="library" name="Gradle:
com.mchange:mchange-commons-java:0.2.11" level="project" />
- <orderEntry type="library" name="Gradle:
software.amazon.ion:ion-java:1.0.2" level="project" />
- <orderEntry type="library" name="Gradle: net.minidev:json-smart:2.3"
level="project" />
- <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy:1.7.11"
level="project" />
- <orderEntry type="library" name="Gradle:
net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
- <orderEntry type="library" name="Gradle: org.objenesis:objenesis:2.6"
level="project" />
- <orderEntry type="library" name="Gradle:
com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-codec:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-transport:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-buffer:4.1.25.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.10"
level="project" />
+ <orderEntry type="library" name="Gradle:
com.fasterxml.jackson.core:jackson-core:2.8.10" level="project" />
+ <orderEntry type="library" name="Gradle: c3p0:c3p0:0.9.1.1"
level="project" />
+ <orderEntry type="library" name="Gradle: net.minidev:json-smart:2.2.1"
level="project" />
+ <orderEntry type="library" name="Gradle: org.objenesis:objenesis:2.1"
level="project" />
+ <orderEntry type="library" name="Gradle:
org.apache.tomcat:tomcat-juli:8.5.23" level="project" />
+ <orderEntry type="library" name="Gradle: javax.batch:javax.batch-api:1.0"
level="project" />
+ <orderEntry type="library" name="Gradle: xmlpull:xmlpull:1.1.3.1"
level="project" />
+ <orderEntry type="library" name="Gradle: xpp3:xpp3_min:1.1.4c"
level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-codec:4.0.37.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-transport:4.0.37.Final" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-buffer:4.0.37.Final" level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jffi:1.2.10"
level="project" />
<orderEntry type="library" name="Gradle:
com.github.jnr:jffi:native:1.2.10" level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-commons:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-analysis:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-util:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: org.ow2.asm:asm-tree:5.0.3"
level="project" />
- <orderEntry type="library" name="Gradle: net.minidev:accessors-smart:1.2"
level="project" />
- <orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.4"
level="project" />
+ <orderEntry type="library" name="Gradle: net.minidev:accessors-smart:1.1"
level="project" />
+ <orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.3"
level="project" />
<orderEntry type="library" name="Gradle: com.github.jnr:jnr-x86asm:1.0.2"
level="project" />
<orderEntry type="library" name="Gradle:
com.github.jnr:jnr-constants:0.9.0" level="project" />
- <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-core:1.2.3" level="project" />
- <orderEntry type="library" name="Gradle:
org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-resolver:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
io.netty:netty-common:4.1.25.Final" level="project" />
- <orderEntry type="library" name="Gradle:
org.springframework.boot:spring-boot-configuration-processor:2.0.3.RELEASE"
level="project" />
+ <orderEntry type="library" name="Gradle:
ch.qos.logback:logback-core:1.1.11" level="project" />
+ <orderEntry type="library" name="Gradle:
io.netty:netty-common:4.0.37.Final" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 110c584..8b1df50 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,8 +60,14 @@ COPY --chown=ningester:ningester install_ningester.sh
./install_ningester.sh
RUN ./install_ningester.sh $APACHE_NINGESTER $APACHE_NINGESTER_BRANCH && \
export NINGESTER_JAR=`find ningester/build/libs -name ningester*.jar`
-VOLUME /data
-VOLUME /config
+RUN mkdir /home/ningester/data && \
+ mkdir /home/ningester/config && \
+ ln -s /data /home/ningester/data && \
+ ln -s /config /home/ningester/config
+
+VOLUME /home/ningester/data
+VOLUME /home/ningester/config
COPY --chown=ningester:ningester entrypoint.sh ./entrypoint.sh
+
ENTRYPOINT ["./entrypoint.sh"]
diff --git a/docker/aws/Dockerfile b/docker/aws/Dockerfile
index 985a32a..5466f72 100644
--- a/docker/aws/Dockerfile
+++ b/docker/aws/Dockerfile
@@ -13,60 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM openjdk:8-jdk
+ARG BASE_TAG_VERSION=1.0.0-SNAPSHOT
+FROM sdap/ningester:${BASE_TAG_VERSION}
MAINTAINER [email protected]
-RUN apt-get update && apt-get install -y \
- bzip2 \
- git \
- gcc \
- python3 \
- wget && \
- addgroup ningester && \
- adduser --system --group ningester && \
- rm -rf /var/lib/apt/lists/* && \
- chgrp ningester /usr/local
-
-USER ningester
-WORKDIR /tmp
-
-# ########################
-# # Anaconda #
-# ########################
-RUN wget -q
https://repo.continuum.io/miniconda/Miniconda3-4.3.31-Linux-x86_64.sh -O
install_anaconda.sh && \
- /bin/bash install_anaconda.sh -b -p /usr/local/anaconda2 && \
- rm install_anaconda.sh && \
- /usr/local/anaconda2/bin/conda config --add channels conda-forge
-ENV PATH /usr/local/anaconda2/bin:$PATH
-
-
-# Install nexusproto
-ARG APACHE_NEXUSPROTO=https://github.com/apache/incubator-sdap-nexusproto.git
-ARG APACHE_NEXUSPROTO_BRANCH=master
-COPY --chown=ningester:ningester install_nexusproto.sh ./install_nexusproto.sh
-RUN ./install_nexusproto.sh $APACHE_NEXUSPROTO $APACHE_NEXUSPROTO_BRANCH
-
-# Install ningesterpy
-ARG APACHE_NINGESTERPY=https://github.com/apache/incubator-sdap-ningesterpy.git
-ARG APACHE_NINGESTERPY_BRANCH=master
-COPY --chown=ningester:ningester install_ningesterpy.sh
./install_ningesterpy.sh
-RUN ./install_ningesterpy.sh $APACHE_NINGESTERPY $APACHE_NINGESTERPY_BRANCH
-
-# Install ningester
-ARG APACHE_NINGESTER=https://github.com/apache/incubator-sdap-ningester.git
-ARG APACHE_NINGESTER_BRANCH=master
-COPY --chown=ningester:ningester install_ningester.sh ./install_ningester.sh
-RUN ./install_ningester.sh $APACHE_NINGESTER $APACHE_NINGESTER_BRANCH && \
- export NINGESTER_JAR=`find ningester/build/libs -name ningester*.jar`
-
RUN pip install awscli && \
- aws --version && \
- mkdir /home/ningester/data && \
- mkdir /home/ningester/config
-
-VOLUME /home/ningester/data
-VOLUME /home/ningester/config
+ aws --version
COPY --chown=ningester:ningester entrypoint.sh ./entrypoint.sh
ENTRYPOINT ["./entrypoint.sh"]
diff --git a/docker/aws/entrypoint.sh b/docker/aws/entrypoint.sh
index 9b572f9..8854a05 100755
--- a/docker/aws/entrypoint.sh
+++ b/docker/aws/entrypoint.sh
@@ -28,13 +28,41 @@ CONFIG_FILES=`find /home/ningester/config -name "*.yml" |
awk -vORS=, '{ print $
aws s3 cp ${2} /home/ningester/data
GRANULE=`find /home/ningester/data -type f -print -quit`
+export NINGESTERPY_SETTINGS=/home/ningester/ningesterpy_settings.py
+random_port=${RANDOMIZE_NINGESTERPY_PORT:="false"}
+if [ ${random_port} == "false" ]
+then
+ NINGESTER_PY_SERVER_NAME="127.0.0.1:5000"
+else
+ NINGESTERPY_PORT_FILE="/home/ningester/current_port"
+ NINGESTER_PY_SERVER_NAME="127.0.0.1:0"
+ echo "CREATE_PORT_FILE=True" >> ${NINGESTERPY_SETTINGS}
+ echo "PORT_FILE='${NINGESTERPY_PORT_FILE}'" >> ${NINGESTERPY_SETTINGS}
+fi
+echo "SERVER_NAME='${NINGESTER_PY_SERVER_NAME}'" >> ${NINGESTERPY_SETTINGS}
+
echo "Launching ningesterpy. Logs from this process will be prefixed with
[ningesterpy]"
python -u -m sdap.ningesterpy 2>&1 | stdbuf -o0 sed -e 's/^/[ningesterpy] /' &
-until $(curl --output /dev/null --silent --head --fail
http://127.0.0.1:5000/healthcheck); do
+if [ ! ${random_port} == "false" ]; then
+ until [ -f "${NINGESTERPY_PORT_FILE}" ]; do
+ sleep 1
+ done
+ port=$(<${NINGESTERPY_PORT_FILE})
+ NINGESTER_PY_SERVER_NAME="127.0.0.1:${port}"
+fi
+
+NEXT_WAIT_TIME=0
+until $(curl --output /dev/null --silent --head --fail
http://${NINGESTER_PY_SERVER_NAME}/healthcheck) || [ ${NEXT_WAIT_TIME} -eq 10
]; do
+ echo "Checking http://${NINGESTER_PY_SERVER_NAME}/healthcheck";
sleep 1
+ NEXT_WAIT_TIME=$((NEXT_WAIT_TIME+1))
done
+if [ ${NEXT_WAIT_TIME} -eq 10 ]; then
+ echo "Timed out waiting for ningesterpy to start" >&2
+ exit 1
+fi
echo "Launching ningester. Logs from this process will be prefixed with
[ningester]"
-java -Dspring.profiles.active=${3}
-Dspring.config.location=classpath:/application.yml,${CONFIG_FILES} -jar
${NINGESTER_JAR} granule=file://${GRANULE} ${@:4} 2>&1 | sed -e
's/^/[ningester] /'
+java -Dspring.profiles.active=${3}
-Dspring.config.location=classpath:/application.yml,${CONFIG_FILES} -jar
${NINGESTER_JAR} granule=file://${GRANULE} ${@:4}
--ningester.pythonChainProcessor.base_url="http://${NINGESTER_PY_SERVER_NAME}/";
2>&1 | sed -e 's/^/[ningester] /'
diff --git a/docker/aws/install_nexusproto.sh b/docker/aws/install_nexusproto.sh
deleted file mode 100755
index e629d28..0000000
--- a/docker/aws/install_nexusproto.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-set -e
-
-APACHE_NEXUSPROTO="https://github.com/apache/incubator-sdap-nexusproto.git";
-MASTER="master"
-
-GIT_REPO=${1:-$APACHE_NEXUSPROTO}
-GIT_BRANCH=${2:-$MASTER}
-
-mkdir nexusproto
-pushd nexusproto
-git init
-git pull ${GIT_REPO} ${GIT_BRANCH}
-
-./gradlew pythonInstall --info
-
-./gradlew install --info
-popd
\ No newline at end of file
diff --git a/docker/aws/install_ningester.sh b/docker/aws/install_ningester.sh
deleted file mode 100755
index 9a5c7ab..0000000
--- a/docker/aws/install_ningester.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-set -e
-
-APACHE_NINGESTER="https://github.com/apache/incubator-sdap-ningester.git";
-MASTER="master"
-
-GIT_REPO=${1:-APACHE_NINGESTER}
-GIT_BRANCH=${2:-$MASTER}
-
-mkdir ningester
-pushd ningester
-git init
-git pull ${GIT_REPO} ${GIT_BRANCH}
-
-./gradlew bootRepackage
-popd
\ No newline at end of file
diff --git a/docker/aws/install_ningesterpy.sh
b/docker/aws/install_ningesterpy.sh
deleted file mode 100755
index faa9e23..0000000
--- a/docker/aws/install_ningesterpy.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-set -e
-
-APACHE_NINGESTERPY="https://github.com/apache/incubator-sdap-ningesterpy.git";
-MASTER="master"
-
-GIT_REPO=${1:-APACHE_NINGESTERPY}
-GIT_BRANCH=${2:-$MASTER}
-
-mkdir ningesterpy
-pushd ningesterpy
-git init
-git pull ${GIT_REPO} ${GIT_BRANCH}
-
-python setup.py install
-popd
\ No newline at end of file
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 1f12ef4..32f2a8f 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -21,16 +21,44 @@ set -eb
set -o pipefail
NINGESTER_JAR=`find ningester/build/libs -name ningester*.jar`
-CONFIG_FILES=`find /config -name "*.yml" | awk -vORS=, '{ print $1 }'`
-GRANULE=`find /data -type f -print -quit`
+CONFIG_FILES=`find /home/ningester/config -name "*.yml" | awk -vORS=, '{ print
$1 }'`
+GRANULE=`find /home/ningester/data -type f -print -quit`
+
+export NINGESTERPY_SETTINGS=/home/ningester/ningesterpy_settings.py
+random_port=${RANDOMIZE_NINGESTERPY_PORT:="false"}
+if [ ${random_port} == "false" ]
+then
+ NINGESTER_PY_SERVER_NAME="127.0.0.1:5000"
+else
+ NINGESTERPY_PORT_FILE="/home/ningester/current_port"
+ NINGESTER_PY_SERVER_NAME="127.0.0.1:0"
+ echo "CREATE_PORT_FILE=True" >> ${NINGESTERPY_SETTINGS}
+ echo "PORT_FILE='${NINGESTERPY_PORT_FILE}'" >> ${NINGESTERPY_SETTINGS}
+fi
+echo "SERVER_NAME='${NINGESTER_PY_SERVER_NAME}'" >> ${NINGESTERPY_SETTINGS}
echo "Launching ningesterpy. Logs from this process will be prefixed with
[ningesterpy]"
python -u -m sdap.ningesterpy 2>&1 | stdbuf -o0 sed -e 's/^/[ningesterpy] /' &
-until $(curl --output /dev/null --silent --head --fail
http://127.0.0.1:5000/healthcheck); do
+if [ ! ${random_port} == "false" ]; then
+ until [ -f "${NINGESTERPY_PORT_FILE}" ]; do
+ sleep 1
+ done
+ port=$(<${NINGESTERPY_PORT_FILE})
+ NINGESTER_PY_SERVER_NAME="127.0.0.1:${port}"
+fi
+
+NEXT_WAIT_TIME=0
+until $(curl --output /dev/null --silent --head --fail
http://${NINGESTER_PY_SERVER_NAME}/healthcheck) || [ ${NEXT_WAIT_TIME} -eq 10
]; do
+ echo "Checking http://${NINGESTER_PY_SERVER_NAME}/healthcheck";
sleep 1
+ NEXT_WAIT_TIME=$((NEXT_WAIT_TIME+1))
done
+if [ ${NEXT_WAIT_TIME} -eq 10 ]; then
+ echo "Timed out waiting for ningesterpy to start" >&2
+ exit 1
+fi
echo "Launching ningester. Logs from this process will be prefixed with
[ningester]"
-java -Dspring.profiles.active=$1
-Dspring.config.location=classpath:/application.yml,${CONFIG_FILES} -jar
${NINGESTER_JAR} granule=file://${GRANULE} ${@:2} 2>&1 | sed -e
's/^/[ningester] /'
+java -Dspring.profiles.active=$1
-Dspring.config.location=classpath:/application.yml,${CONFIG_FILES} -jar
${NINGESTER_JAR} granule=file://${GRANULE} ${@:2}
--ningester.pythonChainProcessor.base_url="http://${NINGESTER_PY_SERVER_NAME}/";
2>&1 | sed -e 's/^/[ningester] /'
