Merging dev into master

.gitignore

@@ -1,12 +1,13 @@
-.asscache
 Thumbs.db
 .DS_Store
 .gradle
 build/
+out/
 .idea
 *.iml
 *.ipr
 *.iws
 .project
 .settings
 .classpath
+prodDb.mv.db

Jenkinsfile

@@ -4,13 +4,9 @@ properties([
         booleanParam(name: 'CLEAN_WORKSPACE', defaultValue: true, description: 'Clean the workspace at the end of the run')
     ]),
     pipelineTriggers([
-            [$class: "GitHubPushTrigger"],
-            [
-                $class: 'jenkins.triggers.ReverseBuildTrigger',
-                upstreamProjects: "ossim-batch-test-multibranch/${BRANCH_NAME}", threshold: hudson.model.Result.SUCCESS
-            ]
+            [$class: "GitHubPushTrigger"]
     ]),
-   [$class: 'GithubProjectProperty', displayName: '', projectUrlStr: 'https://github.com/ossimlabs/omar-oms'],
+    [$class: 'GithubProjectProperty', displayName: '', projectUrlStr: 'https://github.com/ossimlabs/omar-oms'],
     buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '3', daysToKeepStr: '', numToKeepStr: '20')),
     disableConcurrentBuilds()
 ])
@@ -36,7 +32,7 @@ node("${BUILD_NODE}"){
 
     stage ("Assemble") {
         sh """
-        gradle assemble \
+        ./gradlew assemble \
             -PossimMavenProxy=${OSSIM_MAVEN_PROXY}
         """
         archiveArtifacts "plugins/*/build/libs/*.jar"
@@ -51,7 +47,7 @@ node("${BUILD_NODE}"){
                         passwordVariable: 'MAVEN_REPO_PASSWORD']])
         {
             sh """
-            gradle publish \
+            ./gradlew publish \
                 -PossimMavenProxy=${OSSIM_MAVEN_PROXY}
             """
         }
@@ -66,7 +62,7 @@ node("${BUILD_NODE}"){
         {
             // Run all tasks on the app. This includes pushing to OpenShift and S3.
             sh """
-            gradle pushDockerImage \
+            ./gradlew pushDockerImage \
                 -PossimMavenProxy=${OSSIM_MAVEN_PROXY}
             """
         }
@@ -82,7 +78,7 @@ node("${BUILD_NODE}"){
             {
                 // Run all tasks on the app. This includes pushing to OpenShift and S3.
                 sh """
-                    gradle openshiftTagImage \
+                    ./gradlew openshiftTagImage \
                         -PossimMavenProxy=${OSSIM_MAVEN_PROXY}
 
                 """

apps/omar-oms-app/build.gradle

@@ -1,25 +1,13 @@
-// assets {
-//   minifyJs = true
-//   minifyCss = true
-//   includes = ["fonts/*"]
-//   excludes = ["**/*-debug.js", "**/*-deps.js", "**/*.gz", "**/*.txt", "**/*.less", "**/*.html", "**/i18n/**", "**/",
-//       ".grunt/**", "**/locale/**", "webjars/jquery/2.1.4/src/intro.js", "webjars/jquery/2.1.4/src/outro.js"]
-// }
-
-// sourceSets.main.output.classesDir = 'build/classes/groovy/main'
-// io.ossim.gradleDefaults.Variables.setAdditionalVariables(project)
-// io.ossim.gradleDefaults.Variables.setVersionVariables(project)
-// dockerBuildDir="${rootProject.projectDir}/docker"
-// version "${buildVersion}-${buildVersionTag}"
-// jarDestination = "${projectDir}/build/libs/${project.name}-${version}.jar"
-// io.ossim.gradleDefaults.Docker.addDockerTasks(project, dockerRegistryUrl, dockerRegistryUsername, dockerRegistryPassword, name, dockerImageTag, dockerBuildDir, jarDestination, ["BASE_IMAGE": "${dockerRegistryUrl}/${dockerBaseImage}:${dockerFromTag}"])
-// io.ossim.gradleDefaults.Openshift.addOpenshiftTasks(project, openshiftUrl, openshiftUsername, openshiftPassword, openshiftProjectName, openshiftServiceName,  dockerRegistryUrl, name, dockerImageTag)
-
 grails {
-  plugins {
-        compile project(':omar-oms-plugin')
-  }
+    plugins {
+        compile project( ":${ rootProject.name }-plugin" )
+        if ( System.getenv('O2_INLINE_BUILD') ) {
+        //    compile project(":omar-core-plugin")
+        }
+    }
 }
-
 dependencies {
+    if ( ! System.getenv('O2_INLINE_BUILD') ) {
+    // compile "io.ossim.omar.plugins:omar-core-plugin:+"
+    }
 }