EPROC-22642/select2-update

.circleci/config.yml

@@ -13,22 +13,26 @@ aliases:
     context:
       - shared-creds
 
-defaults: &defaults
-  docker:
-    - image: opuscapita/minsk-core-ci:4
-      <<: *docker_auth
-  working_directory: ~/build
+executors:
+  default-executor:
+    docker:
+      - image: opuscapita/minsk-core-ci:4
+        <<: *docker_auth
+    working_directory: ~/build
 
-jobs:
-  init:
+  machine-user-executor:
     docker:
       - image: opuscapita/minsk-core-machineuser-env:2
         <<: *docker_auth
+
+jobs:
+  init:
+    executor: machine-user-executor
     steps:
       - run: circle_ci_add_env.sh GH_MAIL GH_NAME
 
   build:
-    <<: *defaults
+    executor: default-executor
     steps:
       - checkout
       - restore_cache:
@@ -64,15 +68,14 @@ jobs:
           paths: ~/.m2/repository
 
   release:
-    <<: *defaults
+    executor: default-executor
     steps:
       - checkout
       - run:
           name: Executing release scrtipt.
           command: .circleci/release.sh
 
 workflows:
-  version: 2
   release-and-build:
     jobs:
       - init:

GrailsflowGrailsPlugin.groovy

@@ -11,7 +11,7 @@ import com.jcatalog.grailsflow.status.ProcessStatusEnum
 import com.jcatalog.grailsflow.scheduling.triggers.ConfigurableSimpleTrigger
 
 class GrailsflowGrailsPlugin {
-    def version = "1.10.1-SNAPSHOT"
+    def version = "1.10.1-EPROC-22642-select2-SNAPSHOT"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "2.3 > *"
     def dependsOn = [quartz: "1.0.1 > *"]

application.properties

@@ -1,3 +1,3 @@
 app.grails.version = 2.4.4
 app.name = grailsflow
-app.version = 1.10.1-SNAPSHOT
+app.version = 1.10.1-EPROC-22642-select2-SNAPSHOT

grails-app/conf/BuildConfig.groovy

@@ -30,7 +30,7 @@ grails.project.dependency.resolution = {
         mavenRepo "http://repository.jboss.com/maven2/"
         mavenRepo "http://repo.grails.org/grails/core"
     }
-    
+
     dependencies {
         compile ("com.sdicons.jsontools:jsontools-core:1.7",
                  "org.apache.httpcomponents.client5:httpclient5:5.2.3",
@@ -46,16 +46,18 @@ grails.project.dependency.resolution = {
         }
         test "org.grails:grails-datastore-test-support:1.0.1-grails-2.4"
     }
-    
+
     plugins {
         // plugins for the build system only
         build   ":tomcat:7.0.55"
         build   ":release:3.0.1"
 
         runtime ":hibernate:3.6.10.18"
         runtime(":resources:1.2.8",
-                ":jquery:1.11.1",
-                ":jquery-ui:1.10.4")
+//                ":jquery:1.11.1",
+//                ":jquery-ui:1.10.4"
+                'com.jcatalog.grailsplugins:jcatalog-js-libraries:7.42.GA.1-select2-SNAPSHOT'
+        )
         runtime ':font-awesome-resources:4.3.0.1'
         compile ":twitter-bootstrap:3.3.1"
         compile ":export:1.6"

grails-app/conf/GrailsflowResources.groovy

@@ -1,24 +1,6 @@
 // Resource declarations for Resources plugin
-// This is a bit ugly, we'll find a way to make this better in future
-def plugin = grails.util.Holders.getGrailsApplication().getMainContext().getBean("pluginManager")?.getGrailsPlugin("jquery-ui")
-def jqver = plugin.instance.JQUERYUI_VERSION
 
 modules = {
-    overrides {
-        'jquery-theme' {
-            resource id:'theme',
-            url:[ plugin: 'jqueryUi', dir: 'jquery-ui/themes/ui-lightness',
-                  file:'jquery-ui-'+jqver+'.custom.css'],
-            attrs:[media:'screen, projection']
-        }
-
-
-        'jquery-ui' {
-            dependsOn 'jquery', 'jquery-theme'
-            resource id:'js', url:[plugin: 'jqueryUi', dir:'jquery-ui/js', file:"jquery-ui-${jqver}.custom.min.js"],
-            nominify: true, disposition: 'head'
-        }
-    }
     grailsflow {
         dependsOn 'jquery'
         resource url: [plugin: 'grailsflow', file: 'js/grailsflow/common.js']