Upgrade dkan to 1.15 (#501)

* Upgrade dkan core to 1.15

* Updates default

* Re-runs ahoy build post-build

* Adds cmd-proxy to rebuild steps

* One more remake

* Reads site

* Add version info to the .info files

.ahoy/site/build.ahoy.yml

@@ -34,22 +34,19 @@ commands:
   remake:
     usage: Rebuild all the dkan projects from the build.make file.
     cmd: |
-      set -e
-      AHOY_CMD_PROXY=''
       DIRNAME=${PWD##*/}
       # IF this is dkan_starter
       if [[ "$DIRNAME" == "dkan_starter" ]]; then
         # Building in a new directory
         # drush make is stupid, delete docroot_new just in case
-        rm -rf docroot_new
+        ahoy cmd-proxy rm -rf docroot_new
         ahoy drush -y make build.make --no-recursion --no-cache --verbose docroot_new
-        rm -rf docroot
-        mv docroot_new docroot
+        ahoy cmd-proxy rm -rf docroot
+        ahoy cmd-proxy mv docroot_new docroot
         # Move dkan folder from docroot/profiles to base folder
-        mv dkan dkan_old
-        mv docroot/profiles/dkan ./
-        ln -s ../../dkan docroot/profiles/dkan
-        rm -rf dkan_old
+        ahoy cmd-proxy mv "dkan dkan_old; mv docroot/profiles/dkan ./"
+        ahoy cmd-proxy ln "-s ../../dkan docroot/profiles/dkan"
+        ahoy cmd-proxy rm "-rf dkan_old"
         # No recursive prevents dkan build to happen. Run it now from dkan remake.
         ahoy dkan remake
       fi
@@ -125,35 +122,35 @@ commands:
     usage: Runs (what used to be buildmanager) post build commands.
     cmd: |
       # Setup a folder for contrib modules and themes.
-      mkdir -p docroot/sites/all/modules/contrib
-      mkdir -p docroot/sites/all/themes/contrib
+      ahoy cmd-proxy "mkdir -p docroot/sites/all/modules/contrib"
+      ahoy cmd-proxy "mkdir -p docroot/sites/all/themes/contrib"
       # Replace the default .htaccess file with our own that includes a working non-www to www example for acquia.
       if [ -f config/.htaccess ]; then
-        rm -rf docroot/.htaccess
-        ln -s ../config/.htaccess docroot/.htaccess
+        ahoy cmd-proxy "rm -rf docroot/.htaccess"
+        ahoy cmd-proxy "ln -s ../config/.htaccess docroot/.htaccess"
       fi
       # Replace sites/default with our own sites/default outside of the drupal root.
-      rm -rf docroot/sites/default;
-      ln -s ../../assets/sites/default docroot/sites/default
+      ahoy cmd-proxy "rm -rf docroot/sites/default;"
+      ahoy cmd-proxy "ln -s ../../assets/sites/default docroot/sites/default"
       # Add .htaccess to the files directory if it does not exist.
       if [ ! -f docroot/sites/default/files/.htaccess ]; then
-        ln -s ../../config/files/.htaccess docroot/sites/default/files/.htaccess
+        ahoy cmd-proxy "ln -s ../../config/files/.htaccess docroot/sites/default/files/.htaccess"
       fi
       # Clean out any .gitignore files imported from other modules, libraries, and profiles.
-      find dkan -type f -name .gitignore -exec rm -rf {} \;
-      find dkan -type d -name .git -exec rm -rf {} \;
-      find docroot/sites/all -type f -name .gitignore -exec rm -rf {} \;
-      find docroot/sites/all -type d -name .git -exec rm -rf {} \;
+      ahoy cmd-proxy "find dkan -type f -name .gitignore -exec rm -rf {} \;"
+      ahoy cmd-proxy "find dkan -type d -name .git -exec rm -rf {} \;"
+      ahoy cmd-proxy "find docroot/sites/all -type f -name .gitignore -exec rm -rf {} \;"
+      ahoy cmd-proxy "find docroot/sites/all -type d -name .git -exec rm -rf {} \;"
       # Setup custom modules folder outside of the drupal root.
-      rm -rf docroot/sites/all/modules/custom
-      rm -rf docroot/sites/all/modules/data_config
-      ln -s ../../../../assets/modules/data_config docroot/sites/all/modules/data_config
-      ln -s ../../../../config/modules/custom docroot/sites/all/modules/custom
-      ln -s ../../../../config/themes/custom docroot/sites/all/themes/custom
+      ahoy cmd-proxy "rm -rf docroot/sites/all/modules/custom"
+      ahoy cmd-proxy "rm -rf docroot/sites/all/modules/data_config"
+      ahoy cmd-proxy "ln -s ../../../../assets/modules/data_config docroot/sites/all/modules/data_config"
+      ahoy cmd-proxy "ln -s ../../../../config/modules/custom docroot/sites/all/modules/custom"
+      ahoy cmd-proxy "ln -s ../../../../config/themes/custom docroot/sites/all/themes/custom"
       # Remove README/INSTALL files for security reasons CIVIC-3122
-      find ./docroot -type f -name "README*" -exec rm -f {} \;
-      find ./docroot -type f -name "INSTALL*" -exec rm -f {} \;
-      find ./docroot -type f -name "CHANGELOG*" -exec rm -rf {} \;
+      ahoy cmd-proxy find ./docroot -type f -name "README*" -exec rm -f {} \;
+      ahoy cmd-proxy find ./docroot -type f -name "INSTALL*" -exec rm -f {} \;
+      ahoy cmd-proxy find ./docroot -type f -name "CHANGELOG*" -exec rm -rf {} \;
       if [ "$(ahoy custom | grep post-build)" != '' ]
       then
         ahoy custom post-build

build-dkan.make

@@ -8,4 +8,4 @@ projects:
     download:
       type: git
       url: https://github.com/GetDKAN/dkan.git
-      tag: 7.x-1.14.5
+      tag: 7.x-1.15

config/tests/behat.custom.yml

@@ -1,10 +1,10 @@
----
-default:
-  suites:
-    custom:
-      paths:
-      - '%paths.base%/../config/tests/features'
-      contexts:
+--- 
+default: 
+  suites: 
+    custom: 
+      paths: 
+      - "%paths.base%/../config/tests/features"
+      contexts: 
       - CustomContext
       - FeatureContext
       - Drupal\DrupalExtension\Context\MinkContext

config/themes/custom/custom

@@ -0,0 +1 @@
+../../../../config/themes/custom

dkan/.ahoy/.docker/etc/solr/3.x/elevate.xml

@@ -15,7 +15,7 @@
  Otherwise, place it with the other configuration files into the conf/
  directory.
 
- See http://wiki.apache.org/solr/QueryElevationComponent for more information.
+ See https://wiki.apache.org/solr/QueryElevationComponent for more information.
 -->
 
 <elevate>

dkan/.ahoy/.docker/etc/solr/3.x/schema.xml

@@ -7,7 +7,7 @@
  or located where the classloader for the Solr webapp can find it.
 
  For more information, on how to customize this file, please see
- http://wiki.apache.org/solr/SchemaXml
+ https://wiki.apache.org/solr/SchemaXml
 -->
 
 <schema name="drupal-4.3-solr-3.x" version="1.3">
@@ -101,7 +101,7 @@
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
          is a more restricted form of the canonical representation of dateTime
-         http://www.w3.org/TR/xmlschema-2/#dateTime
+         https://www.w3.org/TR/xmlschema-2/#dateTime
          The trailing "Z" designates UTC time and is mandatory.
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
          All other components are mandatory.
@@ -133,7 +133,7 @@
          matching across fields.
 
          For more info on customizing your analyzer chain, please see
-         http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters
+         https://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters
      -->
 
     <!-- One can also specify an existing Analyzer class that has a
@@ -326,14 +326,14 @@
     <fieldType name="location" class="solr.LatLonType" subFieldType="tdouble"/>
 
     <!-- A Geohash is a compact representation of a latitude longitude pair in a single field.
-         See http://wiki.apache.org/solr/SpatialSearch
+         See https://wiki.apache.org/solr/SpatialSearch
      -->
     <fieldtype name="geohash" class="solr.GeoHashField"/>
     <!-- End added Solr 3.4+ types -->
   </types>
 
   <!-- Following is a dynamic way to include other types, added by other contrib modules -->
-  <xi:include href="schema_extra_types.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="schema_extra_types.xml" xmlns:xi="https://www.w3.org/2001/XInclude">
     <xi:fallback></xi:fallback>
   </xi:include>
 
@@ -499,7 +499,7 @@
     <dynamicField name="zm_*" type="string"   indexed="false"  stored="true" multiValued="true"/>
 
     <!-- Begin added fields to use features in Solr 3.4+
-         http://wiki.apache.org/solr/SpatialSearch#geodist_-_The_distance_function -->
+         https://wiki.apache.org/solr/SpatialSearch#geodist_-_The_distance_function -->
     <dynamicField name="points_*" type="point" indexed="true"  stored="true" multiValued="false"/>
     <dynamicField name="pointm_*" type="point" indexed="true"  stored="true" multiValued="true"/>
     <dynamicField name="locs_*" type="location" indexed="true"  stored="true" multiValued="false"/>
@@ -528,7 +528,7 @@
   </fields>
 
   <!-- Following is a dynamic way to include other fields, added by other contrib modules -->
-  <xi:include href="schema_extra_fields.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="schema_extra_fields.xml" xmlns:xi="https://www.w3.org/2001/XInclude">
     <xi:fallback></xi:fallback>
   </xi:include>