Merge pull request #1862 from sylus/7.x-1.x

Prepare for legacy release.
wet-boew · Jun 20, 2016 · 950f3b9 · 950f3b9
2 parents bdb62ee + a23473b
commit 950f3b9
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,21 @@
+# Ignore Development Files
+compass_app_log.txt
+*.DS_Store
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*.sass-cache
+
+# Ignore Contributed Modules
+/modules/
+
+# Ignore Contributed Libraries
+/libraries/
+
+# Ignore Contributed Themes
+/themes/
diff --git a/.travis.yml b/.travis.yml
@@ -89,26 +89,26 @@ install:
   #
   # @see https://www.drupal.org/node/2537902
   # @see https://github.com/minkphp/MinkSelenium2Driver/issues/213
-  - wget http://mirror.pcbeta.com/google/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_43.0.2357.134-1_amd64.deb -O google-chrome-stable.deb
-  - sudo apt-get install gdebi
-  - sudo gdebi -n google-chrome-stable.deb
+  # - wget http://mirror.pcbeta.com/google/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_43.0.2357.134-1_amd64.deb -O google-chrome-stable.deb
+  # - sudo apt-get install gdebi
+  # - sudo gdebi -n google-chrome-stable.deb
   # Install chromedriver.
-  - wget http://chromedriver.storage.googleapis.com/2.16/chromedriver_linux64.zip
-  - unzip -a chromedriver_linux64.zip
+  #- wget http://chromedriver.storage.googleapis.com/2.16/chromedriver_linux64.zip
+  #- unzip -a chromedriver_linux64.zip
 
   # Insane hack from jsdevel:
   #   https://github.com/jsdevel/travis-debugging/blob/master/shim.bash
   # This allows chrome-sandbox to work in side of OpenVZ, because I can't
   # figure out how to start chrome with --no-sandbox.
-  - export CHROME_SANDBOX=/opt/google/chrome/chrome-sandbox
-  - sudo rm -f $CHROME_SANDBOX
-  - sudo wget https://googledrive.com/host/0B5VlNZ_Rvdw6NTJoZDBSVy1ZdkE -O $CHROME_SANDBOX
-  - sudo chown root:root $CHROME_SANDBOX; sudo chmod 4755 $CHROME_SANDBOX
-  - sudo md5sum $CHROME_SANDBOX
+  #- export CHROME_SANDBOX=/opt/google/chrome/chrome-sandbox
+  #- sudo rm -f $CHROME_SANDBOX
+  #- sudo wget https://googledrive.com/host/0B5VlNZ_Rvdw6NTJoZDBSVy1ZdkE -O $CHROME_SANDBOX
+  #- sudo chown root:root $CHROME_SANDBOX; sudo chmod 4755 $CHROME_SANDBOX
+  #- sudo md5sum $CHROME_SANDBOX
 
   # Get Selenium
   - wget http://selenium-release.storage.googleapis.com/2.46/selenium-server-standalone-2.46.0.jar
-  - java -jar selenium-server-standalone-2.46.0.jar -Dwebdriver.chrome.driver=`pwd`/chromedriver > /dev/null 2>&1 &
+  - java -jar selenium-server-standalone-2.46.0.jar > /dev/null 2>&1 &
   - sleep 5
 
   # Disable sendmail
@@ -140,7 +140,7 @@ script:
   - if [[ "$UPGRADE" == none ]]; then ./bin/behat --config behat.travis.yml; fi
 
   # Then run some Chrome-only tests.
-  - if [[ "$UPGRADE" == none ]]; then ./bin/behat --config behat.travis.yml -p chrome; fi
+  # - if [[ "$UPGRADE" == none ]]; then ./bin/behat --config behat.travis.yml -p chrome; fi
 
 after_script:
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # CHANGELOG.md
 
+## v1.14
+
+Security Update(s):
+
+  - Drupal Core (7.44)
+  - Entity Translation
+  - Features
+  - Views
+
+Fixes:
+
+  - (Commit: [69ff875][R1.14-Commit-69ff875]) Security updates to features, views, and entity_translation.
+  - (Commit: [81ef7aa][R1.14-Commit-81ef7aa]) #[2750027][R1.14-Issue-2750027] - Drupal Core - Moderately Critical - Multiple Vulnerabilities - SA-CORE-2016-002
+
 ## v1.13
 
 Security Update(s):
@@ -916,6 +930,15 @@ Bug Fixes:
 
 <!-- Links Referenced -->
 
+<!-- Commits R1.14 -->
+
+[R1.14-Commit-69ff875]: http://drupalcode.org/project/wetkit.git/commit/69ff875
+[R1.14-Commit-81ef7aa]: http://drupalcode.org/project/wetkit.git/commit/81ef7aa
+
+<!-- Issues R1.14 -->
+
+[R1.14-Issue-2750027]: http://drupal.org/node/2750027
+
 <!-- Commits R1.13 -->
 
 [R1.13-Commit-579ffd4]: http://drupalcode.org/project/wetkit.git/commit/579ffd4

diff --git a/build-wetkit-dev.make b/build-wetkit-dev.make
@@ -2,7 +2,7 @@ api = 2
 core = 7.x
 
 ; Drupal.org packaging standards
-projects[drupal][version] = 7.43
+projects[drupal][version] = 7.44
 
 projects[wetkit][type] = profile
 projects[wetkit][download][type] = git

diff --git a/build-wetkit-release.make b/build-wetkit-release.make
@@ -2,7 +2,7 @@ api = 2
 core = 7.x
 
 ; Drupal.org packaging standards
-projects[drupal][version] = 7.43
+projects[drupal][version] = 7.44
 
 projects[wetkit][type] = profile
-projects[wetkit][version] = 1.13
+projects[wetkit][version] = 1.14
diff --git a/build-wetkit.make b/build-wetkit.make
@@ -2,7 +2,7 @@ api = 2
 core = 7.x
 
 ; Drupal.org packaging standards
-projects[drupal][version] = 7.43
+projects[drupal][version] = 7.44
 
 projects[wetkit][type] = profile
 projects[wetkit][download][type] = git

diff --git a/drupal-org-core.make b/drupal-org-core.make
@@ -1,7 +1,7 @@
 api = 2
 core = 7.x
 
-projects[drupal][version] = 7.43
+projects[drupal][version] = 7.44
 projects[drupal][type] = core
 
 ; Patches for Drupal Core

diff --git a/drupal-org-release.make b/drupal-org-release.make
@@ -12,7 +12,7 @@ projects[wetkit_bean][subdir] = custom
 projects[wetkit_breadcrumbs][version] = 1.8
 projects[wetkit_breadcrumbs][subdir] = custom
 
-projects[wetkit_core][version] = 1.23
+projects[wetkit_core][version] = 1.24
 projects[wetkit_core][subdir] = custom
 
 projects[wetkit_demo][version] = 1.1
@@ -24,7 +24,7 @@ projects[wetkit_deployment][subdir] = custom
 projects[wetkit_images][version] = 1.7
 projects[wetkit_images][subdir] = custom
 
-projects[wetkit_language][version] = 1.13
+projects[wetkit_language][version] = 1.14
 projects[wetkit_language][subdir] = custom
 
 projects[wetkit_layouts][version] = 1.6

diff --git a/drupal-org.make b/drupal-org.make
@@ -12,7 +12,7 @@ projects[wetkit_bean][subdir] = custom
 projects[wetkit_breadcrumbs][version] = 1.8
 projects[wetkit_breadcrumbs][subdir] = custom
 
-projects[wetkit_core][version] = 1.23
+projects[wetkit_core][version] = 1.24
 projects[wetkit_core][subdir] = custom
 
 projects[wetkit_demo][version] = 1.1
@@ -24,7 +24,7 @@ projects[wetkit_deployment][subdir] = custom
 projects[wetkit_images][version] = 1.7
 projects[wetkit_images][subdir] = custom
 
-projects[wetkit_language][version] = 1.13
+projects[wetkit_language][version] = 1.14
 projects[wetkit_language][subdir] = custom
 
 projects[wetkit_layouts][version] = 1.6

diff --git a/tests/behat/composer.json b/tests/behat/composer.json
@@ -1,4 +1,10 @@
 {
+  "repositories": [
+    {
+      "url": "https://github.com/jhedstrom/drupalextension.git",
+      "type": "git"
+    }
+  ],
   "require": {
     "drupal/drupal-extension": "1.0.0",