More compile fixes and upstream mergesa

2019-10-09 16:15:26 -04:00
parent 67b3fa054a
commit da3019ae3d
16 changed files with 191 additions and 159 deletions
--- a/buildSrc/src/main/kotlin/PlatformConfig.kt
+++ b/buildSrc/src/main/kotlin/PlatformConfig.kt
@@ -24,7 +24,7 @@ fun Project.applyPlatformAndCoreConfiguration() {
    apply(plugin = "maven")
    //apply(plugin = "checkstyle")
    apply(plugin = "com.github.johnrengelman.shadow")
-    apply(plugin = "com.jfrog.artifactory")
+    //apply(plugin = "com.jfrog.artifactory")

    ext["internalVersion"] = "$version;${rootProject.ext["gitCommitHash"]}"