SDAP-227 Make Dockerfiles buildable again
diff --git a/.gitignore b/.gitignore
index 5837aed..8fa8f06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,23 +3,7 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
+.idea
# CMake
cmake-build-debug/
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index c4c9543..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectCodeStyleSettingsManager">
- <option name="PER_PROJECT_SETTINGS">
- <value />
- </option>
- <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 8f1a3b7..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <state>
- <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
- </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 1f7ddff..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <bytecodeTargetLevel>
- <module name="ningester_main" target="1.8" />
- <module name="ningester_test" target="1.8" />
- <module name="ningester_testJobs" target="1.8" />
- </bytecodeTargetLevel>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/Apache.xml b/.idea/copyright/Apache.xml
deleted file mode 100644
index bf58e0b..0000000
--- a/.idea/copyright/Apache.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
- <copyright>
- <option name="myName" value="Apache" />
- <option name="notice" value="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." />
- </copyright>
-</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index 8427c95..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
- <settings default="Apache" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding">
- <file url="PROJECT" charset="UTF-8" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 8495485..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/build" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 9b61410..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/ningester.iml" filepath="$PROJECT_DIR$/ningester.iml" />
- <module fileurl="file://$PROJECT_DIR$/.idea/modules/ningester_main.iml" filepath="$PROJECT_DIR$/.idea/modules/ningester_main.iml" group="ningester" />
- <module fileurl="file://$PROJECT_DIR$/.idea/modules/ningester_test.iml" filepath="$PROJECT_DIR$/.idea/modules/ningester_test.iml" group="ningester" />
- <module fileurl="file://$PROJECT_DIR$/.idea/modules/ningester_testJobs.iml" filepath="$PROJECT_DIR$/.idea/modules/ningester_testJobs.iml" group="ningester" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules/ningester_main.iml b/.idea/modules/ningester_main.iml
deleted file mode 100644
index 8f1ee9f..0000000
--- a/.idea/modules/ningester_main.iml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ningester:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="'org.apache.sdap'" external.system.module.type="sourceSet" external.system.module.version="1.0.0-SNAPSHOT" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/../../out/production/classes" />
- <exclude-output />
- <content url="file://$MODULE_DIR$/../../src/main">
- <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <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: 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.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.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.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.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: 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: 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.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.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" />
- <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: 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.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" />
- </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/ningester_test.iml b/.idea/modules/ningester_test.iml
deleted file mode 100644
index 1982571..0000000
--- a/.idea/modules/ningester_test.iml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ningester:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="'org.apache.sdap'" external.system.module.type="sourceSet" external.system.module.version="1.0.0-SNAPSHOT" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
- <exclude-output />
- <content url="file://$MODULE_DIR$/../../src/test">
- <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
- </content>
- <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-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: 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.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.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.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.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: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.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: 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: 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.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.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.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.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
deleted file mode 100644
index 297ebe7..0000000
--- a/.idea/modules/ningester_testJobs.iml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ningester:testJobs" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="'org.apache.sdap'" external.system.module.type="sourceSet" external.system.module.version="1.0.0-SNAPSHOT" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
- <exclude-output />
- <content url="file://$MODULE_DIR$/../../src/testJobs">
- <sourceFolder url="file://$MODULE_DIR$/../../src/testJobs/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/../../src/testJobs/resources" type="java-test-resource" />
- </content>
- <orderEntry type="inheritedJdk" />
- <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" 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: 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.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.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.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.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: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.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: 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: 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.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.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.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.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/.idea/other.xml b/.idea/other.xml
deleted file mode 100644
index 640fd80..0000000
--- a/.idea/other.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="PySciProjectComponent">
- <option name="PY_SCI_VIEW" value="true" />
- <option name="PY_SCI_VIEW_SUGGESTED" value="true" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
old mode 100644
new mode 100755
index c451ef6..d763aff
--- a/build.gradle
+++ b/build.gradle
@@ -14,24 +14,40 @@
* limitations under the License.
*/
+buildscript {
+ repositories {
+ mavenLocal()
+ maven { url "https://repo.spring.io/plugins-release" }
+ }
+ dependencies {
+ classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
+ }
+}
+
plugins {
id 'java'
id 'idea'
- id 'propdeps' version '0.0.9.RELEASE'
- id 'propdeps-maven' version '0.0.9.RELEASE'
- id 'propdeps-idea' version '0.0.9.RELEASE'
- id 'propdeps-eclipse' version '0.0.9.RELEASE'
id 'org.springframework.boot' version '1.5.9.RELEASE'
id 'org.unbroken-dome.test-sets' version '1.4.2'
id 'net.researchgate.release' version '2.6.0'
}
+apply plugin: 'propdeps'
+
+configurations.compile.transitive = false
+configurations.provided.transitive = false
+configurations.optional.transitive = false
+
+
repositories {
mavenCentral()
- maven {
mavenLocal()
+ maven {
url "https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases/"
}
+ maven {
+ url "https://repo.spring.io/plugins-release/"
+ }
}
ext{
@@ -52,12 +68,16 @@
}
dependencies {
+ provided("org.springframework:spring-core:4.0.2.RELEASE")
+ optional("org.springframework:spring-context:4.0.2.RELEASE")
+
optional "org.springframework.boot:spring-boot-configuration-processor"
compile("org.springframework.boot:spring-boot-starter-batch")
compile("org.springframework:spring-web")
compile("org.springframework.data:spring-data-cassandra")
compile("org.springframework.data:spring-data-solr")
+ compile("org.json:json:20190722")
compile("com.h2database:h2")
compile("mysql:mysql-connector-java")
@@ -65,7 +85,7 @@
compile("com.google.protobuf:protobuf-java-util:$protobufUtilVersion")
compile("edu.ucar:cdm:${netcdfJavaVersion}")
- compile("com.google.guava:guava")
+ compile("com.google.guava:guava")
compile("com.amazonaws:aws-java-sdk-s3")
compile("com.amazonaws:aws-java-sdk-dynamodb")
@@ -76,4 +96,4 @@
testJobsCompile sourceSets.test.output
}
-compileJava.dependsOn(processResources)
\ No newline at end of file
+compileJava.dependsOn(processResources)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8b1df50..306958a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,6 +40,7 @@
/usr/local/anaconda2/bin/conda config --add channels conda-forge
ENV PATH /usr/local/anaconda2/bin:$PATH
+ARG rebuild_flag=0
# Install nexusproto
ARG APACHE_NEXUSPROTO=https://github.com/apache/incubator-sdap-nexusproto.git
diff --git a/docker/aws/Dockerfile b/docker/aws/Dockerfile
index 5466f72..5555595 100644
--- a/docker/aws/Dockerfile
+++ b/docker/aws/Dockerfile
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ARG BASE_TAG_VERSION=1.0.0-SNAPSHOT
-FROM sdap/ningester:${BASE_TAG_VERSION}
+ARG BASE_TAG_VERSION=1.1.2
+FROM nexusjpl/ningester:${BASE_TAG_VERSION}
MAINTAINER dev@sdap.apache.org
diff --git a/docker/install_ningester.sh b/docker/install_ningester.sh
index 9a5c7ab..380d01e 100755
--- a/docker/install_ningester.sh
+++ b/docker/install_ningester.sh
@@ -18,7 +18,7 @@
APACHE_NINGESTER="https://github.com/apache/incubator-sdap-ningester.git"
MASTER="master"
-GIT_REPO=${1:-APACHE_NINGESTER}
+GIT_REPO=${1:-$APACHE_NINGESTER}
GIT_BRANCH=${2:-$MASTER}
mkdir ningester
@@ -27,4 +27,4 @@
git pull ${GIT_REPO} ${GIT_BRANCH}
./gradlew bootRepackage
-popd
\ No newline at end of file
+popd
diff --git a/docker/install_ningesterpy.sh b/docker/install_ningesterpy.sh
index faa9e23..bfcf0c6 100755
--- a/docker/install_ningesterpy.sh
+++ b/docker/install_ningesterpy.sh
@@ -18,7 +18,7 @@
APACHE_NINGESTERPY="https://github.com/apache/incubator-sdap-ningesterpy.git"
MASTER="master"
-GIT_REPO=${1:-APACHE_NINGESTERPY}
+GIT_REPO=${1:-$APACHE_NINGESTERPY}
GIT_BRANCH=${2:-$MASTER}
mkdir ningesterpy
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2c2bbe5..565df7c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Jan 27 14:38:44 PST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
