mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83757: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) << Bringing back the commit just reverted. Needed to revert another commit 80358 which changed pom.xml files to include the correct versions of external libs including open cmiss 0.11 >> 80966: Revere merged HEAD-BUG-FIX (5.0/Cloud) << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >> 80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud) << And added alfresco-opencmis-extension 1.0 >> 79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128 rather than the changes from V4.2-BUG-FIX >> 79166: Reverse merged V4.2-BUG-FIX (4.2.4) << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0 and Steve is on holiday for a week. >> << The original commits are already merged to HBF for ACE-484 so will revert them too. >> 79070: Merged DEV to V4.2-BUG-FIX (4.2.4) 67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Updated OpenCMIS to 0.11 version. 79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades 80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 79166: Reverse merged V4.2-BUG-FIX (4.2.4) << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0 and Steve is on holiday for a week. >> << The original commits are already merged to HBF for ACE-484 so will revert them too. >> 79070: Merged DEV to V4.2-BUG-FIX (4.2.4) 67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Updated OpenCMIS to 0.11 version. 79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades 80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc 80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again 80814: MNT-11223: Fix build (pt1) - 80366: pom.xml contained a reference to an external surf which is now back in house. 80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions 80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS. 80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor. 80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Changed Solr to Lucene for tests. 83745: Reverse Merge HEAD-BUG-FIX (5.0/Cloud) 83699: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) VIA EOL 81016: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Fixed TestCMIS to check for secondary types list to be null. 81017: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Disabled assert for tests run by maven. 82255: Merged V4.2-BUG-FIX (4.2.4) to EOL (5.0/Cloud) 82252: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Disabled QueryRootFolderTest. - RECORD ONLY merge from V4.2-BUG-FIX extra commits not required on HEAD-BUG-FIX: 80373,80397,80840-80841,81707,81741,82245 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -152,6 +152,7 @@ public class ResourceWebScriptHelper
|
||||
* @param selectParam
|
||||
* @return List<String> bean property names potentially using JSON Pointer syntax
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public static List<String> getSelectClause(String selectParam) throws InvalidArgumentException
|
||||
{
|
||||
if (selectParam == null) return Collections.emptyList();
|
||||
@@ -167,8 +168,7 @@ public class ResourceWebScriptHelper
|
||||
{
|
||||
return Arrays.asList(selectedPropsTree.getText());
|
||||
}
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Tree> children = (List<Tree>)selectedPropsTree.getChildren();
|
||||
List<Tree> children = (List<Tree>) selectedPropsTree.getChildren();
|
||||
if (children!= null && !children.isEmpty())
|
||||
{
|
||||
List<String> properties = new ArrayList<String>(children.size());
|
||||
|
Reference in New Issue
Block a user