Merge pull request #14 from eea/develop

Develop #95849
eea · Jun 22, 2018 · 06f8cf8 · 06f8cf8
2 parents 5b914c1 + c06ae39
commit 06f8cf8
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 30 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -46,4 +46,4 @@ official issue register.
 
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* [EEA packages](http://eea.github.io/docs/IT-systems/)
+* [EEA packages](https://eea.github.io/docs/IT-systems/)
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,19 +11,19 @@ pipeline {
         parallel(
 
           "ZPT Lint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-zptlint" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 zptlint'''
             }
           },
 
           "PyFlakes": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-pyflakes" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pyflakes'''
             }
           },
 
           "i18n": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name=$BUILD_TAG-i18n -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/i18ndude'''
             }
           }
@@ -36,19 +36,19 @@ pipeline {
         parallel(
 
           "WWW": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-www" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/www-devel /debug.sh bin/test -v -vv -s $GIT_NAME'''
             }
           },
 
           "KGS": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-kgs" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/kgs-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME'''
             }
           },
 
           "Plone4": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-plone4" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 -v -vv -s $GIT_NAME'''
             }
           }
@@ -62,7 +62,7 @@ pipeline {
         parallel(
 
           "JS Lint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-jslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jslint4java'''
@@ -74,7 +74,7 @@ pipeline {
           },
 
           "JS Hint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-jshint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jshint'''
@@ -86,7 +86,7 @@ pipeline {
           },
 
           "CSS Lint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-csslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/csslint'''
@@ -98,7 +98,7 @@ pipeline {
           },
 
           "PEP8": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-pep8" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pep8'''
@@ -110,7 +110,7 @@ pipeline {
           },
 
           "PyLint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-pylint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pylint'''
@@ -133,12 +133,14 @@ pipeline {
         environment name: 'CHANGE_TARGET', value: 'master'
       }
       steps {
-        node(label: 'docker-1.13') {
+        node(label: 'docker') {
           script {
             if ( env.CHANGE_BRANCH != "develop" &&  !( env.CHANGE_BRANCH.startsWith("hotfix")) ) {
                 error "Pipeline aborted due to PR not made from develop or hotfix branch"
             }
-            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow'''
+           withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
+            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_CHANGE_BRANCH="$CHANGE_BRANCH" -e GIT_CHANGE_AUTHOR="$CHANGE_AUTHOR" -e GIT_CHANGE_TITLE="$CHANGE_TITLE" -e GIT_TOKEN="$GITHUB_TOKEN" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow'''
+           }
           }
         }
       }
@@ -152,7 +154,7 @@ pipeline {
         }
       }
       steps {
-        node(label: 'docker-1.13') {
+        node(label: 'docker') {
           withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),[$class: 'UsernamePasswordMultiBinding', credentialsId: 'pypi-jenkins', usernameVariable: 'PYPI_USERNAME', passwordVariable: 'PYPI_PASSWORD']]) {
             sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME"  -e PYPI_USERNAME="$PYPI_USERNAME"  -e PYPI_PASSWORD="$PYPI_PASSWORD" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" eeacms/gitflow'''
           }

diff --git a/README.rst b/README.rst
@@ -1,8 +1,12 @@
 ==========
 EEA jQuery
 ==========
-.. image:: http://ci.eionet.europa.eu/job/eea/job/eea.jquery/job/master/badge/icon
-  :target: http://ci.eionet.europa.eu/job/eea/job/eea.jquery/job/master/display/redirect
+.. image:: https://ci.eionet.europa.eu/buildStatus/icon?job=eea/eea.jquery/develop
+  :target: https://ci.eionet.europa.eu/job/eea/job/eea.jquery/job/develop/display/redirect
+  :alt: develop
+.. image:: https://ci.eionet.europa.eu/buildStatus/icon?job=eea/eea.jquery/master
+  :target: https://ci.eionet.europa.eu/job/eea/job/eea.jquery/job/master/display/redirect
+  :alt: master
 
 Introduction
 ============
@@ -113,8 +117,8 @@ Funding
 
 EEA_ - European Environment Agency (EU)
 
-.. _EEA: http://www.eea.europa.eu/
-.. _`eea.tags`: http://eea.github.com/docs/eea.tags
+.. _EEA: https://www.eea.europa.eu/
+.. _`eea.tags`: https://eea.github.com/docs/eea.tags
 .. _`eea_screentimeanalytics`: https://github.com/collective/eea.jquery/tree/master/eea/jquery/plugins/eea_screentimeanalytics/docs
-.. _`plone.recipe.zope2instance`: http://pypi.python.org/pypi/plone.recipe.zope2instance
-.. _`zc.buildout`: http://pypi.python.org/pypi/zc.buildout
+.. _`plone.recipe.zope2instance`: https://pypi.python.org/pypi/plone.recipe.zope2instance
+.. _`zc.buildout`: https://pypi.python.org/pypi/zc.buildout
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+10.7 - (2018-06-20)
+---------------------
+* Change: updated URLs pointing to eea.europa.eu with https://
+  [alecghica refs #95849]
+
 10.6 - (2018-03-14)
 -------------------
 * Add a BBB uninstall profile.

diff --git a/eea/jquery/README.txt b/eea/jquery/README.txt
@@ -32,5 +32,5 @@ Authors
 
   EEA_ - European Environment Agency (EU)
 
-.. _EEA: http://www.eea.europa.eu/
-.. _`eea.tags`: http://eea.github.com/docs/eea.tags
+.. _EEA: https://www.eea.europa.eu/
+.. _`eea.tags`: https://eea.github.io/docs/eea.tags
diff --git a/eea/jquery/plugins/eea_screentimeanalytics/eea_screentimeanalytics.js b/eea/jquery/plugins/eea_screentimeanalytics/eea_screentimeanalytics.js
@@ -2,7 +2,7 @@
 
 /*!
  * visibly - v0.7 Page Visibility API Polyfill
- * http://github.com/addyosmani
+ * https://github.com/addyosmani
  * Copyright (c) 2011-2014 Addy Osmani
  * Dual licensed under the MIT and GPL licenses.
  *

diff --git a/eea/jquery/plugins/slickgrid/MIT-LICENSE.txt b/eea/jquery/plugins/slickgrid/MIT-LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2010 Michael Leibman, http://github.com/mleibman/slickgrid
+Copyright (c) 2010 Michael Leibman, https://github.com/mleibman/slickgrid
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/eea/jquery/plugins/slickgrid/slick.grid.js b/eea/jquery/plugins/slickgrid/slick.grid.js
@@ -1920,7 +1920,7 @@
  * @license
  * (c) 2009-2012 Michael Leibman
  * michael{dot}leibman{at}gmail{dot}com
- * http://github.com/mleibman/slickgrid
+ * https://github.com/mleibman/slickgrid
  *
  * Distributed under MIT license.
  * All rights reserved.

diff --git a/eea/jquery/plugins/visibly/visibly.js b/eea/jquery/plugins/visibly/visibly.js
@@ -1,6 +1,6 @@
 /*!
  * visibly - v0.7 Page Visibility API Polyfill
- * http://github.com/addyosmani
+ * https://github.com/addyosmani
  * Copyright (c) 2011-2014 Addy Osmani
  * Dual licensed under the MIT and GPL licenses.
  *

diff --git a/eea/jquery/version.txt b/eea/jquery/version.txt
@@ -1 +1 @@
-10.6
+10.7
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
       description="jQuery library and plugins for Plone",
       long_description=open("README.rst").read() + "\n" +
                        open(os.path.join("docs", "HISTORY.txt")).read(),
-      # http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      # https://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
           "Framework :: Zope2",
           "Framework :: Plone",
@@ -30,7 +30,7 @@
       keywords='EEA jquery plugins Add-ons Plone Zope',
       author='European Environment Agency: IDM2 A-Team',
       author_email='eea-edw-a-team-alerts@googlegroups.com',
-      download_url="http://pypi.python.org/pypi/eea.jquery",
+      download_url="https://pypi.python.org/pypi/eea.jquery",
       url='https://github.com/collective/eea.jquery',
       license='GPL',
       packages=find_packages(exclude=['ez_setup']),