mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
* Cherry pick (merge) changes from original projects in 7.0.0-A3) Bump spring-surf-core-configservice from 8.5 to 8.6 (#144) (cherry picked from commit 43e2592b264a6876da779d694f9a54f944c674c8) Bump dependency.spring.version from 5.2.7.RELEASE to 5.2.8.RELEASE (#143) (cherry picked from commit 9310346f19d6f4fb10317b6acbfb03df0bdefbd7) Bump spring-surf-core-configservice from 8.6 to 8.7 (#145) (cherry picked from commit 7ad131f31cd73b5ec103d279831fbc1fa8241496) Bump spring-surf-core-configservice from 8.7 to 8.8 (#147) (cherry picked from commit fcb5bd88e8331cfabf5a9a40e3c00e2aa013265a) Bump mockito-core from 3.4.4 to 3.4.6 (#149) (cherry picked from commit 1febbc71c8a52bb71620d218a15c2d7ff40350bb) [SEARCH-2354] (#298) Added support for DAYOFWEEK and DAYOFYEAR sql date functions (cherry picked from commit 48bf24654945626eb8b26ff2ac0144bd92fe3302) Bump jackson-annotations from 2.11.1 to 2.11.2 (#300) (cherry picked from commit cde846f16f25e111b191eb8db4b46a967f40ff8e) SEARCH-2273: Add detailed message when ignoring nodes in SOLR without… (#1111) * SEARCH-2273: Add detailed message when ignoring nodes in SOLR without type or with types not registered in Dictionary Service. * SEARCH-2273: Using non-registered type name. * SEARCH-2273: Creating node without type using DB Service. * SEARCH-2273: Check the right exception is produced when using a non registered TYPE. * SEARCH-2273: Simplified case identification for exception message. * SEARCH-2273: Remove unused library. (cherry picked from commit f4bdc8c888dab01a1180715441c1669ac20e564d) Bump dependency.spring.version from 5.2.6.RELEASE to 5.2.8.RELEASE (#1116) (cherry picked from commit b7fc60bb60f483745f0461b9709b52e47d21e453) Bump dependency.webscripts.version from 8.5 to 8.6 (#1117) (cherry picked from commit 137013790b7852e549f7316c60b5305dff5f68f8) SEARCH-800: Get values in DBResultSetRow in the same way they are rec… (#1114) * SEARCH-800: Get values in DBResultSetRow in the same way they are recovered in SolrJSONResultSetRow. This will provide the same behaviour when using getValue() method from Search ResultSet. * SEARCH-800: Testing that using TRANSACTIONAL query consistency allows getting values using "getValue" method. (cherry picked from commit 695113f4c40e34dcd8663d28e0ee56c956930a5e) MNT-21317 Move on Update Folder Rule triggers unexpectedly for MOVED content. (#1115) * MNT-21317_fix folder rule trigger * MNT-21317_folder rule test case added * Update .travis.yml * Update OnPropertyUpdateRuleTrigger.java * MNT-21317 updated test (cherry picked from commit 33ca87046019416875fd23b72293e84b912f4cd9) Bump aspectjrt from 1.9.5 to 1.9.6 (#1124) (cherry picked from commit 330bb0820d2ce9608612eba9fed5acd76786853a) Bump groovy-all from 2.4.19 to 2.4.20 (#1125) (cherry picked from commit 4ab253bb21348f23a4df7e79ded43c16a9347e7c) Bump dependency.webscripts.version from 8.6 to 8.7 (#1127) (cherry picked from commit ac270757a7ff4bcd477375008902cf53bc220838) Bump mariadb-java-client from 2.6.1 to 2.6.2 (#1128) (cherry picked from commit 1f633aef1020aaeb31a71e0e4fed883f5a677f0f) Bump gytheio-messaging-camel from 0.11.3 to 0.11.6 (#1095) Bumps gytheio-messaging-camel from 0.11.3 to 0.11.6. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> (cherry picked from commit 16179db5fc4524c339097f1f3a9a6409dd895b11) Bump dependency.webscripts.version from 8.7 to 8.8 (#1133) (cherry picked from commit d363862d653e85e9366367817a82353580b2c6ce) Bump dependency.transform.model.version from 1.0.2.10 to 1.0.2.11 (#1143) (cherry picked from commit beaccd28608d2c70ef9eaf640d47a2e86a59ced4) ATS-811: Updated T-engines to 2.3.3 (#1145) (cherry picked from commit cbe6d78767741cb2b5f38d17cf4556dbda7c5311) MNT-21614: LDAP sync communication error leads to group members deletion (#1149) * Catch reported exceptions to filter ldap sync aborts (cherry picked from commit 7e8cbd044e9ec2d31e05d072c0d47aa2d22ef771) Bump commons-net from 3.6 to 3.7 (#1153) (cherry picked from commit 3b5503bbf1c231a844536c54c639ad41a9c1b6aa) ATS-817: Updated T-engines to 2.3.4 (#1151) (cherry picked from commit b7f9ae0b71b599e27a59787ec3fe584ab64f1330) [REPO-5239] - Added filter by displayName to /groups endpoint (#706) * [REPO-5239] - Added filter by displayName to /groups endpoint * [REPO-5239] - minor fix, brackets style * [REPO-5239] Refactoring * [REPO-5239] Fix to avoid the usage of displayName filter implemented in authorityService.getAuthoritiesInfo (cherry picked from commit a01b80448ef48c5bb68978159b0ea134382ee653) * Include branch in build * More changes as a result of merging to alfresco-enterprise-repo. Dependencies now defined in community * ACS-222: tests jobs using AIMS fail (#1464) * Added a 3 minutes sleep after the curl request is succeeded preventing tests from starting immediately Reimplemented from commit a6abc8a2c952d8c8d894bdeb50efe42f695d13cf on acs-packaging master. Now takes a second optional parameter for the extra wait, so no all uses have to wait. Only AIMS. * Merge commit to do with base-tomcat:8.5.51
44 lines
1.2 KiB
Bash
Executable File
44 lines
1.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
export ALFRESCO_URL=$1
|
|
export EXTRA_WAIT_INTERVAL=$2
|
|
|
|
if [ -z "$ALFRESCO_URL" ]
|
|
then
|
|
echo "Please provide the Alfresco URL to check, for example: \"${0##*/} http://localhost:8080/alfresco\""
|
|
exit 1
|
|
fi
|
|
|
|
WAIT_INTERVAL=1
|
|
COUNTER=0
|
|
TIMEOUT=300
|
|
t0=$(date +%s)
|
|
|
|
echo "Waiting for alfresco to start"
|
|
until $(curl --output /dev/null --silent --head --fail ${ALFRESCO_URL}) || [ "$COUNTER" -eq "$TIMEOUT" ]; do
|
|
printf '.'
|
|
sleep $WAIT_INTERVAL
|
|
COUNTER=$(($COUNTER+$WAIT_INTERVAL))
|
|
done
|
|
|
|
if (("$COUNTER" < "$TIMEOUT")) ; then
|
|
t1=$(date +%s)
|
|
delta=$((($t1 - $t0)/60))
|
|
echo "Alfresco Started in $delta minutes"
|
|
|
|
if [ -n "$EXTRA_WAIT_INTERVAL" ]
|
|
then
|
|
echo "Waiting an extra $EXTRA_WAIT_INTERVAL for all the containers to initialise..."
|
|
sleep $EXTRA_WAIT_INTERVAL
|
|
echo "Waited $EXTRA_WAIT_INTERVAL seconds"
|
|
fi
|
|
else
|
|
echo "Waited $COUNTER seconds"
|
|
echo "Alfresco Could not start in time."
|
|
echo "All started containers:"
|
|
docker ps -a
|
|
ALFCONTAINER=`docker ps -a | grep _alfresco | awk '{ print $1 }'`
|
|
echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:"
|
|
docker logs --tail=200 $ALFCONTAINER
|
|
exit 1
|
|
fi |