Commit Graph

24749 Commits

Author SHA1 Message Date
Travis CI User
e837f9507a [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-19 13:52:49 +00:00
Travis CI User
15e0236aa8 [maven-release-plugin][skip ci] prepare release 8.303 8.303 2020-10-19 13:52:40 +00:00
Alex Mukha
c583e905a5 SEARCH-2454 Remove dev branch from travis config 2020-10-19 14:17:33 +01:00
Alex Mukha
7ddb31d5e8 SEARCH-2454 Remove old lucene (#23)
This PR removes legacy Lucene code and dependency to the lucene 2.4.1 library.
The data type analysers were removed with an exception of the definitions in models (datadictionaryModel.xml and cmisModel.xml) to be backwards compatible with existing components (like older versions of Search Services) and to ensure the current old-style models can still work with repository and pass validation.
2020-10-19 14:15:27 +01:00
Travis CI User
88cb7a0be2 [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-16 17:04:49 +00:00
Travis CI User
03cb9f442b [maven-release-plugin][skip ci] prepare release 8.302 8.302 2020-10-16 17:04:42 +00:00
Chris Shields
669a177a02 ACS-771: Fix update event to handle content and property update from null (#35)
* ACS-771: Fix update event to handle content and property update from null.
2020-10-16 17:34:06 +01:00
Travis CI User
9b26b8e79e [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-15 08:16:35 +00:00
Travis CI User
b848c200c4 [maven-release-plugin][skip ci] prepare release 8.301 8.301 2020-10-15 08:16:28 +00:00
Denis Ungureanu
a4c70b772c MNT-21871 : [Security] Multiple jackson-databind vulnerabilities (#33)
- upgrade to 2.11.2
   - reconfigure object mapper with different inclusion criteria for value and contents
   - add test for custom model with no aspects, types or constraints - verifying https://issues.alfresco.com/jira/browse/APPS-560
2020-10-15 10:15:38 +03:00
Travis CI User
123cd3d22f [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-14 08:26:19 +00:00
Travis CI User
2e48bb46b9 [maven-release-plugin][skip ci] prepare release 8.300 8.300 2020-10-14 08:26:12 +00:00
Alan Davis
a0b42842fc Removed -TEST[0-9]* from the pom version 2020-10-14 08:46:46 +01:00
Travis CI User
bd6290a6ca [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-13 16:13:09 +00:00
Travis CI User
4ae2c46d26 [maven-release-plugin][skip ci] prepare release 8.300-TEST10 8.300-TEST10 2020-10-13 16:13:02 +00:00
Alan Davis
c48b1ded12 Should be using TRAVIS_ACCESS_TOKEN rather than TRAVIS_ACCESS_TOKEN_TEMP 2020-10-13 16:40:47 +01:00
Travis CI User
84a1e63547 [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-13 11:25:25 +00:00
Travis CI User
cee36e4eab [maven-release-plugin][skip ci] prepare release 8.300-TEST9 8.300-TEST9 2020-10-13 11:25:19 +00:00
Alan Davis
39228ea707 Remove old feature branch 2020-10-13 11:31:31 +01:00
Alan Davis
f2d5c529b1 Merge remote-tracking branch 'origin/master' 2020-10-13 11:28:27 +01:00
Alan Davis
a5604ff03c Merge 7.0.0-A8 changes to new projects:
acs-packaging 7.0.0-A8
   alfresco-remote-api 8.238
   alfresco-repository 8.286
   alfresco-data-model 8.158
   alfresco-core 8.50

ACS-525: org.alfresco.surf:spring-webscripts:8.8 & acs-packaging test failure (#1705)

* Bump alfresco-sprint-webscripts to 8.10,

* Remove extra / in alfresco url due to empty RestAssured.basePath and adjust it accordingly

* Bump alfresco-repository and surf-webscripts which include fix for CSRF Filter

* Bump alfresco-data-model version that contain revert of cmis 1.1.0 to 1.0.0 to avoid conflicts with alfresco-repository

(cherry picked from commit 8b26c99c6b072e32a26650d89ad86270668bcdb7)

on branches merge/700_A8, origin/merge/700_A8

MNT-21936 : Audit query Rest API does not return the correct totalItems (#838)

* MNT-21936 : Audit query Rest API does not return the correct totalItems
   Retrieve audit entries count if it has more items
   Require new release of alfresco-repository.

* MNT-21936 : introduced skipTotalItems property for AuditImpl#listAuditEntries

* MNT-21936 : Change skipTotalItems to omitTotalItems to align with API Spec

* update alfresco-repository dependency

(cherry picked from commit 91c49be12a21b23a87cd04b7584c230b2ec4b569)
Bump dependency.webscripts.version from 8.8 to 8.10 (#1252)

Bumps `dependency.webscripts.version` from 8.8 to 8.10.

Updates `spring-surf-core-configservice` from 8.8 to 8.10

Updates `spring-webscripts` from 8.8 to 8.10
- [Release notes](https://github.com/Alfresco/surf-webscripts/releases)
- [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-8.8...spring-surf-webscripts-parent-8.10)

Updates `spring-webscripts-api` from 8.8 to 8.10

Updates `spring-webscripts` from 8.8 to 8.10
- [Release notes](https://github.com/Alfresco/surf-webscripts/releases)
- [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-8.8...spring-surf-webscripts-parent-8.10)

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 8434f5f06fbd973c24688e5c7ec3d54b8513d858)
MNT-21936 : Audit query Rest API does not return the correct totalItems (#1253)

* MNT-21936 : Audit query Rest API does not return the correct totalItems
   Add CountAuditEntryId select, that provides the total number of items for a specific auditApp
   Add getAuditEntriesCountByApp(long appId) in AuditDAO interface and its implementation in AuditDAOImpl
   Add getAuditEntriesCountByApp(String applicationName) in AuditComponent interface and its implementation in AuditComponentImpl
   Add getAuditEntriesCountByApp(String applicationName) in AuditService interface and its implementation in AuditServiceImpl

* MNT-21936 : Added default implementation for getAuditEntriesCountByApp() in AuditComponent AuditService and AuditDAOImpl

(cherry picked from commit 706251642bb5ef6dbb0a059bf6a0cd4f7b72ab43)

on branches merge/700_A8, origin/merge/700_A8
2020-10-13 11:27:07 +01:00
Lucian Tuca
c0f30603ab MNT-21879 : [Security] Multiple json-java vulnerabilities (#32)
- added upgrade & fix
2020-10-13 13:18:19 +03:00
Alan Davis
39d19b6ce9 Add feature branch to travis 2020-10-13 10:00:18 +01:00
Alan Davis
3d3a02a697 Pick up acs-packaging changes too.
ACS-525: org.alfresco.surf:spring-webscripts:8.8 & acs-packaging test failure (#1705)

* Bump alfresco-sprint-webscripts to 8.10,

* Remove extra / in alfresco url due to empty RestAssured.basePath and adjust it accordingly

* Bump alfresco-repository and surf-webscripts which include fix for CSRF Filter

* Bump alfresco-data-model version that contain revert of cmis 1.1.0 to 1.0.0 to avoid conflicts with alfresco-repository

(cherry picked from commit 8b26c99c6b072e32a26650d89ad86270668bcdb7)
2020-10-13 09:10:14 +01:00
Alan Davis
30892c28d1 Merge 7.0.0-A8 changes to new projects:
alfresco-remote-api 8.238
   alfresco-repository 8.286
   alfresco-data-model 8.158
   alfresco-core 8.50

MNT-21936 : Audit query Rest API does not return the correct totalItems (#838)

* MNT-21936 : Audit query Rest API does not return the correct totalItems
   Retrieve audit entries count if it has more items
   Require new release of alfresco-repository.

* MNT-21936 : introduced skipTotalItems property for AuditImpl#listAuditEntries

* MNT-21936 : Change skipTotalItems to omitTotalItems to align with API Spec

* update alfresco-repository dependency

(cherry picked from commit 91c49be12a21b23a87cd04b7584c230b2ec4b569)
Bump dependency.webscripts.version from 8.8 to 8.10 (#1252)

Bumps `dependency.webscripts.version` from 8.8 to 8.10.

Updates `spring-surf-core-configservice` from 8.8 to 8.10

Updates `spring-webscripts` from 8.8 to 8.10
- [Release notes](https://github.com/Alfresco/surf-webscripts/releases)
- [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-8.8...spring-surf-webscripts-parent-8.10)

Updates `spring-webscripts-api` from 8.8 to 8.10

Updates `spring-webscripts` from 8.8 to 8.10
- [Release notes](https://github.com/Alfresco/surf-webscripts/releases)
- [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-8.8...spring-surf-webscripts-parent-8.10)

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 8434f5f06fbd973c24688e5c7ec3d54b8513d858)
MNT-21936 : Audit query Rest API does not return the correct totalItems (#1253)

* MNT-21936 : Audit query Rest API does not return the correct totalItems
   Add CountAuditEntryId select, that provides the total number of items for a specific auditApp
   Add getAuditEntriesCountByApp(long appId) in AuditDAO interface and its implementation in AuditDAOImpl
   Add getAuditEntriesCountByApp(String applicationName) in AuditComponent interface and its implementation in AuditComponentImpl
   Add getAuditEntriesCountByApp(String applicationName) in AuditService interface and its implementation in AuditServiceImpl

* MNT-21936 : Added default implementation for getAuditEntriesCountByApp() in AuditComponent AuditService and AuditDAOImpl

(cherry picked from commit 706251642bb5ef6dbb0a059bf6a0cd4f7b72ab43)
2020-10-13 08:53:28 +01:00
Travis CI User
c59fd7ffe2 [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-11 07:52:53 +00:00
Travis CI User
272891dcca [maven-release-plugin][skip ci] prepare release 8.300-TEST8 8.300-TEST8 2020-10-11 07:52:46 +00:00
Alan Davis
24eca8c054 Merge changes on master 7.0.0-A7 projects since 7.0.0-A3 to release/master (#30)
Does not include chemistry-opencmis 1.1.0 (downgraded to 1.0.0) or jackson-databind 2.11.2 (downgraded to 2.10.1) due to test failures. Original upgrades by dependabot.
 
* Fix latest T-Engine versions and remove redundantly versions in pom.xml files

* Changes from acs-packaging

* From alfresco-core (included json change after 7.0.0-A7)

Bump commons-io from 2.7 to 2.8.0 (#160)

(cherry picked from commit c5a8f5ffb3988bd87719aa43b7089851607b7308)
MNT-21879 : [Security] Multiple json-java vulnerabilities
   - updated org.json.json version

(cherry picked from commit edaffa350b29157bdcd1de3737fa491b88093378)
[revert] MNT-21879 : [Security] Multiple json-java vulnerabilities
   - updated org.json.json version

(cherry picked from commit 48e2cffb287adb5c5a1d5092ae7fde895c8d0836)

* from alfresco-data-model

SEARCH-2362: Consider changing properties from mandatory/enforced/pro… (#313)

* SEARCH-2362: Consider changing properties from mandatory/enforced/protected to NON mandatory/enforced/protected as incremental changes

* SEARCH-2362 Update tests to check whole set of returned diffs at once.

Co-authored-by: Tom Page <thomas.page@alfresco.com>

(cherry picked from commit 576601564251038311627f230f286b96ea950383)
Bump dependency.cxf.version from 3.3.7 to 3.4.0 (#309)

(cherry picked from commit dc689a911d83b608d49572cada5c2d16441c1eea)
Bump chemistry-opencmis-commons-impl from 1.0.0 to 1.1.0 (#305)

(cherry picked from commit 98fa7b66851aeada1bb6ea05bd6e747e3c55b342)
Bump commons-compress from 1.19 to 1.20 (#303)

(cherry picked from commit f6a950d4a36f05083536638cc5ff7866436f191d)
Bump pdfbox from 2.0.17 to 2.0.20 (#304)

(cherry picked from commit 435b786817ee18c28b84d093c6fbfbc330434e4c)

* From alfresco-remote-api

MNT-21702 : Kerberos SSO fallback mechanism for WebDAV (#765)

Reinstated 'part' of the reverted code change originally made in MNT-16931 to handle fallback correctly for WebDAV in a kerberos environment.

(cherry picked from commit 4091cb9d4b1cd643f9678a4c5c9654963a72c266)
[MNT-21758] Cannot map an AOS / WebDAV drive with Kerberos SSO enabled (#784)

- Add multi catch for Illegal Argument and Not Found when findWebScript is called.

(cherry picked from commit 59517076d2dfc0477870007a7d136cdf907e322f)
SEARCH-2363: Escape special characters when serializing ChildAssociationRefs and AssociationRefs objects (#788)

(cherry picked from commit f941a6e283517c0949f57fefdb1e7e8d7cfb46c4)
ACS-580: Direct access urls - revert initial api version (#792)

(cherry picked from commit 7f4959fdfaeaf1b7debd78df5dcacd4a5b9e809a)

* From alfresco-repository

SEARCH-2289: Restore the support for SOLR 4 in ACS 6.2+ deployments. (#1063)

This configuration is recommended for upgrading scenarios, where you need to upgrade ACS and to re-index the repository with SOLR 6 while using the system with SOLR 4.

(cherry picked from commit e8bba3ca13880be782c2e4c1d82223e70c370f28)
[MNT-21847] - Aync permissions fail when new nodes are created (#1188)

Fix:
*Changed method setFixedAcls on class ADMAccessControlListDAO to continue to propagate through children to apply the correct acl not only when the current child acl matches the shared acl to replace but also when the current child acl matches the new shared acl
Unit Test:
*Refactored the unit test FixedAclUpdaterTest to be able to add in a new test without repeating code: separating the operations that set the permissions from the one that triggers the job into separate methods
*As it was if one test failed, leaving aspects to be processed, the test would run indefinitely (it was programmed to keep running the job while there where nodes with the aspect). Added a verification to stop triggering the job if the number of nodes with the pendingFixAcl did not change between executions.
*Also, if one test failed, it would leave nodes with pendingFixAcl aspect in the database, and the other tests that ran after would also fail, not completing the goal of processing all nodes with the aspect. If a test fails, the folder structure it ran is now deleted so no nodes with the aspect from that structure are processed by the other tests.
*Added a test to find the first folder in a tree where permissions where set async that has the pendingFixAcl aspect and that creates a new node in it to verify the issue

(cherry picked from commit 443e5e226430a2760492fb82214ad520e7e1cb75)
Bump dependency.pdfbox.version from 2.0.20 to 2.0.21 (#1170)

(cherry picked from commit b93d73dec5f0e94d83f62721842b92e617dfba79)
Bump rhino from 1.7.12 to 1.7.13 (#1185)

(cherry picked from commit a5b5f072c64511999d3d27087a1a82f949371ac8)
Bump spring-security-core from 5.2.1.RELEASE to 5.3.4.RELEASE (#1167)

(cherry picked from commit 54f68d823333254cef74343288e99107494b1e28)
REPO-5339 Improve concurrency of SimplePermissionReference (#1189)

* REPO-5339 Improve concurrency of SimplePermissionReference

* REPO-5339 Change locks to synchronised block

* [REPO-5339] Improve concurrency of SimplePermissionReference
- Move to ConcurrentHashMap
- Capacity set to hold Repo + RM + slight overage for custom permissions
- Getting new SimplePermissionReference will not block while getting existing value.
- If a new value needs to be added to the Map, it will block when adding
- If blocked it will wait, in order, until it can attempt to add
- If it was blocked before it will check first if another operation added before adding as an atomic action

* [REPO-5339] Improve concurrency of SimplePermissionReference
- Simplify getPermissionReference by removing Future

* [REPO-5339] Thread Lock detected for AclReadersGet invocations
- Add load capacity and concurrency level

Co-authored-by: Jared Ottley <jared.ottley@alfresco.com>

(cherry picked from commit 39ded1cc0a364d24f737584eed22bef0918a5359)
[MNT-21766]: Significant degradation of performance as file and site count increase (#1217)

* [MNT-21766]: Significant degradation of performance as file and site
count increase
- Added the following indexes on alf_transaction:
idx_alf_txn_ctms_sc, cols (commit_time_ms)
idx_alf_txn_id_ctms, cols (id, commit_time_ms)
- Added the following indexes on alf_node:
idx_alf_node_ver, cols (version)
idx_alf_node_txn, cols (transaction_id)
- Created patch patch.db-V6.3-add-indexes-node-transaction
- Updated version.schema to 14002
- Added system property system.new-node-transaction-indexes.ignored, set
as true by default to not apply the patch automatically
- Created the MySQL update dbscripts to add the new indexes - and also
drop and recreate the pre-existing index idx_alf_txn_ctms on alf_transaction that was
inconsistent with the other DBMS: was indexing only commit_time_ms when
on all other DBMS index idx_alf_txn_ctms was on (commit_time_ms, id)
- Created the Postgres update dbscripts to add the new indexes

(cherry picked from commit d70746f63a6e6a2154d2e37c577955a17c42256e)
SEARCH-2450 Don't expose properties from solr endpoint if the model says not to index them. (#1228)

(cherry picked from commit 2fea6c9484def402e2bfd7c3717071ff8df69c01)
Fix/MNT-21800 CMIS Web Service Check Out returns error (#1232)

* MNT-21800 : CMIS Web Service Check Out returns error
   Integrate path into codebase.

(cherry picked from commit 51a7793668ba1c969c5de37603190244e3839cd0)

* Revert dependency.opencmis.version change 1.1.0 back to 1.0.0 done by dependabot on 08/09/2020 as the upgraded failed in alfresco-remote-api tests which are now part of the same repo.

* Trial build with previous rino version

* Revert cxf upgrade to 3.4.0 from 3.7.7    as dependabot failed to apply it in acs-packaging
Revert org-json to 20160212 from 20090211 as dependabot failed to apply it in alfresco-repository

* Revert "Trial build with previous rino version"

This reverts commit 40f8120d5d.

* Remove READMEs that have been moved to the top level.

* Fix location of keystore
Only copy win64 and linux pdf-renderer to dist zip
Sort out what get included in dist jar and zip

* jackson databind revert
2020-10-11 08:23:32 +01:00
Travis CI User
5a745710ac [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-06 10:44:44 +00:00
Travis CI User
01b66c392a [maven-release-plugin][skip ci] prepare release 8.300-TEST7 8.300-TEST7 2020-10-06 10:44:37 +00:00
Angel Borroy
6efc2f72de Merge pull request #31 from Alfresco/feature/SEARCH-2445_ElasticSearchSubsystem_Master
SEARCH-2445: Adding Elasticsearch Search Subsystem as Only Enterprise…
2020-10-06 12:15:02 +02:00
Angel Borroy
dfd5af550a SEARCH-2445: Adding Elasticsearch Search Subsystem as Only Enterprise option 2020-10-06 10:08:42 +02:00
Travis CI User
7b99a414b0 [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-02 16:00:56 +00:00
Travis CI User
b9dea2fe1e [maven-release-plugin][skip ci] prepare release 8.300-TEST6 8.300-TEST6 2020-10-02 16:00:49 +00:00
Alan Davis
409ae4b03c REPO-5358 Deployment modules should extend each other
To support the keystore changes in the new project structure, this commit moves the keystore back to
alfresco-community-repo's deployment module and has alfresco-enterprise-repo and acs-packaging
extend it in their own deployment modules. This also avoids duplication of licenses between projects.

(cherry picked from commit bad162c91f)
2020-10-02 16:32:18 +01:00
Travis CI User
f283acf6f5 [maven-release-plugin][skip ci] prepare for next development iteration 2020-10-01 08:36:25 +00:00
Travis CI User
2da0cf60f5 [maven-release-plugin][skip ci] prepare release 8.300-TEST5 8.300-TEST5 2020-10-01 08:36:18 +00:00
Alan Davis
bbaaafde4b Added note about Docker experimental feature to README 2020-10-01 09:06:39 +01:00
Cezar.Leahu
8480a79380 REPO-5111 Enable update_downstream.sh script [skip tests] [no release] 2020-09-28 16:41:03 +03:00
Cezar.Leahu
c71837ac15 REPO-5111 Test update_downstream.sh fix (2) [skip tests] [no release] 2020-09-28 13:21:55 +03:00
Cezar.Leahu
b7d9cfe81e REPO-5111 Test update_downstream.sh fix [skip tests] [no release] 2020-09-28 12:30:55 +03:00
Travis CI User
764953d7b7 [maven-release-plugin][skip ci] prepare for next development iteration 2020-09-27 10:19:10 +00:00
Travis CI User
5f80dc0d87 [maven-release-plugin][skip ci] prepare release 8.300-TEST4 8.300-TEST4 2020-09-27 10:19:04 +00:00
Alan Davis
4e4f10d63e REPO-5271 Backport new structure to master (#22)
- Simplify dependencies and standardise order
- README updated
- Green builds
- Changes to make Jars in enterprise war match
- Changes to make files in enterprise image match
- Added travis_wait 40 to the initial build as it can take 20 minutes to download artifacts
2020-09-27 10:50:16 +01:00
Travis CI User
3eb4b282ee [maven-release-plugin][skip ci] prepare for next development iteration 2020-09-14 14:04:18 +00:00
Travis CI User
72aa9ec203 [maven-release-plugin][skip ci] prepare release 8.300-TEST3 8.300-TEST3 2020-09-14 14:04:12 +00:00
Cezar.Leahu
f6197a2bd4 ACS-550 Trigger test release 2020-09-14 16:11:33 +03:00
Cezar.Leahu
c96cfd801d ACS-550 Test downstream repo update (4) [no release] 2020-09-14 14:36:18 +03:00
Cezar.Leahu
56f926af5d ACS-550 Test downstream repo update (3) [skip tests] [no release] 2020-09-14 13:02:59 +03:00
Cezar.Leahu
7fc31b9c12 ACS-550 Test downstream repo update (2) [skip tests] [no release] 2020-09-14 12:19:08 +03:00