Merge pull request #20 from eea/develop

Release
eea · Nov 1, 2021 · e399de6 · e399de6
2 parents dda2363 + 7ffbd09
commit e399de6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -155,7 +155,7 @@ pipeline {
             def nodeJS = tool 'NodeJS11';
             withSonarQubeEnv('Sonarqube') {
                 sh '''sed -i "s|/plone/instance/src/$GIT_NAME|$(pwd)|g" coverage.xml'''
-                sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPath=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+                sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
                 sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
             }
           }

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+11.3 - (2021-11-01)
+---------------------------
+* Change: Explicitly load zcml of dependencies, instead of using includeDependencies
+  [avoinea]
+
 11.2 - (2020-02-28)
 --------------------------
 * Change: patch slick.grid.js to use dispatch.call instead of handle.call

diff --git a/eea/jquery/plone.zcml b/eea/jquery/plone.zcml
@@ -3,7 +3,7 @@
   xmlns:zcml="http://namespaces.zope.org/zcml"
   i18n_domain="eea">
 
-  <includeDependencies package="." />
+  <include package="collective.js.jqueryui" />
   <include zcml:condition="have plone-5"
            file="profiles.zcml" />
   <include zcml:condition="not-have plone-5"

diff --git a/eea/jquery/version.txt b/eea/jquery/version.txt
@@ -1 +1 @@
-11.2
+11.3