Commit Graph

33879 Commits

Author SHA1 Message Date
Cezar.Leahu
8d527a532a Exclude javax dependencies 2021-05-06 18:15:38 +03:00
Travis CI User
d6ff933ce5 [maven-release-plugin][skip ci] prepare for next development iteration 2021-05-06 15:00:00 +00:00
Travis CI User
dfd3edf6a4 [maven-release-plugin][skip ci] prepare release 11.22 11.22 2021-05-06 14:59:56 +00:00
davidcanonieto
e5223c4b1c [MNT-22183] Use absolute paths for stylesheets (#383)
* [MNT-22183] Use absolut paths for stylesheets

* added slash

* added context prefix

Co-authored-by: dhrn <dharan.g@muraai.com>
2021-05-06 15:25:30 +01:00
alandavis
fe491d3720 Reset pom version 2021-05-06 15:06:13 +01:00
alandavis
eac6e5f330 Merge branch 'feature/ags-reorg-align-deps' into feature/ags-reorg 2021-05-06 14:58:12 +01:00
alandavis
4bc9d80253 commons-collections4 in AGS only 2021-05-06 12:21:45 +01:00
alandavis
7e1f900083 Downgrade gson 2.8.5
[ags]
2021-05-06 11:09:13 +01:00
Travis CI User
8e88cb21e5 [maven-release-plugin][skip ci] prepare for next development iteration 2021-05-06 10:07:37 +00:00
Travis CI User
1971a4e9aa [maven-release-plugin][skip ci] prepare release 11.21 11.21 2021-05-06 10:07:32 +00:00
alandavis
03c6710357 Downgrade junit 4.13.1 gson 2.8.5
Use default commons-collections4 4.4 rather than 4.1.2
[ags]
2021-05-06 11:05:04 +01:00
alandavis
6bee748ada Align community pom with what is on master: mockito-core 3.9.0 and tas-restapi 1.58
[ags]
2021-05-06 10:33:45 +01:00
Sara
bdecc02ed8 Fix/acs 1425 fix community sql (#433)
* ACS-1425 Fix non-accelerated SQL

* ACS-1425 Fix non-accelerated SQL
2021-05-06 10:01:32 +01:00
alandavis
9caeca4a18 Temporary fix of 2 RM tests by using the wrong version of jackson databind 2021-05-06 00:24:16 +01:00
alandavis
bb74b84a66 Fix up poms plus
Feature/apps 939 (#432)

* change artifacts target path [ags][skip db][no downstream]

* Round 1 [ags][skip repo]

* Remove eclipse-specific plugins [ags][skip repo][skip db][skip tas]

* Remove a few unnecessary pom properties [skip ci]

* Delete unused build scripts [ags][ags on MySQL]

* [skip ci]

Co-authored-by: Cezar.Leahu <cezar.leahu@ness.com>
(cherry picked from commit b51a2b33302c3cc31424d70cd787d5447c9013ab)
2021-05-05 21:53:22 +01:00
alandavis
22c4b7f68b Pom and build cleanup [skip ci] (#431)
* change artifacts target path [ags][skip db][no downstream]

* Round 1 [ags][skip repo]

* Remove eclipse-specific plugins [ags][skip repo][skip db][skip tas]

* Remove a few unnecessary pom properties [skip ci]

* Delete unused build scripts [ags][ags on MySQL]

* [skip ci]

Co-authored-by: Claudia Agache <claudia.agache@ness.com>
(cherry picked from commit 96847b1f1c)

# Conflicts:
#	amps/ags/pom.xml
#	amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
#	amps/ags/rm-community/rm-community-repo/pom.xml
#	pom.xml
2021-05-05 21:31:20 +01:00
alandavis
2aa3b605ec Remove docker push profile [skip ci]
(cherry picked from commit 75988a345b)
2021-05-05 21:27:38 +01:00
alandavis
42bcc60652 Revert changes except for dependency.jackson-databind.version:2.7.9.1
(cherry picked from commit 016019f9f55644571306bbaf0682fcb7d1014571)
2021-05-05 21:27:14 +01:00
alandavis
d1b56aad8e Fewer changes. Might fixes the 2 failing tests.
[skip repo][skip db][skip tas][ags]

(cherry picked from commit f1d69ded9929a0f9a4c9c9599d0d63640e56ff65)
2021-05-05 21:26:52 +01:00
alandavis
f0fe4c99a6 Too many changes, but think it fixes the 2 failing tests.
[skip repo][skip db][skip tas][ags]

(cherry picked from commit f461667be9d8f4d14cba5f4fdb79f552f3702841)
2021-05-05 21:26:34 +01:00
alandavis
79095ce544 Simplify dependencies so they are inherited.
Includes Cezar's removal of eclipse profiles.

[ags]

(cherry picked from commit cd2afea3be4a89f25b1585af3f5d4f7519e9d464)
2021-05-05 21:26:14 +01:00
alandavis
58fd863cf8 Travis AWS... to AGS_AWS... property changes
(cherry picked from commit 0fc694105f)
2021-05-05 21:24:53 +01:00
alandavis
b447272ee3 common versions pt1
(cherry picked from commit 6ddf2afb0b)
2021-05-05 21:24:35 +01:00
alandavis
525842a77c alfresco.api-explorer.version 7.0.0 + alfresco.maven-plugin.version 2.2.0 [ags]
(cherry picked from commit 17ed9181c8)
2021-05-05 21:24:14 +01:00
alandavis
f8ac3870cd Move common ags vars to community-repo [ags]
(cherry picked from commit 79017a6055)
2021-05-05 21:23:38 +01:00
alandavis
93d8760121 Fix: [WARNING] Reporting configuration should be done in <reporting> section,...
(cherry picked from commit c592fd7c02)
2021-05-05 21:23:20 +01:00
alandavis
3ad9fbdc2f Undo alfresco-maven-plugin change in last commit - build failures
(cherry picked from commit 66eae76a75)
2021-05-05 21:23:04 +01:00
alandavis
2f9f5698cb Simplify poms 1
Upgrade maven-surefire-plugin 2.22.1 -> 2.22.2
Upgrade maven-jar-plugin 3.1.0 (in ags) to -> 3.2.0 (was in repo)
Upgrade alfresco-maven-plugin 2.1.1 (ags), 3.0.1 (c-pack) -> 4.0.1 (was in e-pack)

swagger-ui.version 3.38  moved to community-repo
stripped out java versions from ags poms
alfresco-maven-plugin removed snapshotToTimestamp as we now use releases in ags
moved project...Encoding to the 2 top level ags poms - did not want to try system wide - too big a change

[ags]

(cherry picked from commit 1237c3c810)
2021-05-05 21:22:47 +01:00
alandavis
9b721592fb Only run one DB job of feature branches
(cherry picked from commit 06c4cc8ef3)
2021-05-05 21:19:15 +01:00
alandavis
282bbd2ef2 Travis typo [skip db][skip tas][skip ags]
(cherry picked from commit 3aa9994d38)
2021-05-05 21:18:54 +01:00
alandavis
3f8a23fe1e Missing s in travis job name [skip ci]
(cherry picked from commit 861d777360)
2021-05-05 21:18:33 +01:00
alandavis
7b5667a4fa Include tests for Share Services
(cherry picked from commit f7987d1a32)
2021-05-05 21:18:08 +01:00
alandavis
0865a9dde4 Addition of [skip repo], [skip tas] and {skip ags]
* Bug Fix: Extended the branch check for tas jobs to release branches in addition to master
* Provides flexibility to enable or disable test jobs that are disabled or enabled based on the branch.

Test the build with the existing [skip db] and [ags] too

(cherry picked from commit f286d233d9)
2021-05-05 21:17:53 +01:00
alandavis
58d361b792 Revert/replace some of the previous changes
(cherry picked from commit 177ab7d221)
2021-05-05 21:17:29 +01:00
alandavis
1f9e4fb4f6 Add AMPS env var to alias to optionally build AMPs
Removed trigger of downstream project on feature branch to save agents

(cherry picked from commit f6c87dddbe)

# Conflicts:
#	scripts/travis/maven_release.sh
2021-05-05 21:17:00 +01:00
alandavis
4bdbfc2de0 ACS-1464 Rename the Maven *internal* profile into *publish-docker-images*
(cherry picked from commit 176b1d2c86)
2021-05-05 21:10:40 +01:00
alandavis
ad15447446 ACS-1464 Rename the local docker build profiles into *build-docker-images*
(cherry picked from commit 878eb3750f)
2021-05-05 21:10:18 +01:00
alandavis
669e4db5a4 Remove redundant Maven profiles with project structure (modules)
(cherry picked from commit 4d04559a26)
2021-05-05 21:09:56 +01:00
alandavis
07d0878f88 Remove unnecessary AGS distributionManagement settings
(cherry picked from commit ed625a89af)
2021-05-05 21:09:30 +01:00
alandavis
07d5c281d2 Remove trigger_downstream jobs
(cherry picked from commit 6ee980c754)
2021-05-05 21:09:10 +01:00
alandavis
ccc210cd6c Update build configuration
- remove some unneeded pom properties

[skip ci]

(cherry picked from commit 5ca3179cc8)
2021-05-05 21:08:32 +01:00
alandavis
2655a8cc3b Apps 937 Run AGS community tests (#407) [skip tests]
* APPS-937 execute AGS tests [skip tests]

* APPS-937 Added missing file [ags][ags on MySQL][skip db][no downstream]

* APPS-937 tests postgres 13.1 [ags][skip db][no downstream]

* APPS-937 code review comments [skip tests]

(cherry picked from commit 66eda8dccc)
2021-05-05 21:07:01 +01:00
alandavis
67b04d4a4b Creation of feature/ags-merge branch with all previous commits but without excessive history
Note pom.xml versions have been reset to the values that were on the feature/ags/master
branches to simplify getting local changes onto this new branch.

alfresco-communiy-repo    11.14-ags-1.0-SNAPSHOT -> 11.7-ags-1.0-SNAPSHOT
alfresco-enterprise-repo  11.18-ags-1.0-SNAPSHOT -> 11.8-ags-1.0-SNAPSHOT
alfresco-enterprise-share 11.5-ags-1.0-SNAPSHOT -> 11.4-ags-1.0-SNAPSHOT

(cherry picked from commit 5857919ca1)

# Conflicts:
#	amps/ags/pom.xml
#	amps/ags/rm-automation/pom.xml
#	amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
#	amps/ags/rm-community/pom.xml
#	amps/ags/rm-community/rm-community-repo/pom.xml
#	amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
#	amps/pom.xml
#	amps/share-services/pom.xml
#	core/pom.xml
#	data-model/pom.xml
#	packaging/distribution/pom.xml
#	packaging/docker-alfresco/pom.xml
#	packaging/pom.xml
#	packaging/tests/pom.xml
#	packaging/tests/tas-cmis/pom.xml
#	packaging/tests/tas-email/pom.xml
#	packaging/tests/tas-integration/pom.xml
#	packaging/tests/tas-restapi/pom.xml
#	packaging/tests/tas-webdav/pom.xml
#	packaging/war/pom.xml
#	pom.xml
#	remote-api/pom.xml
#	repository/pom.xml
2021-05-05 21:06:09 +01:00
alandavis
7aa93a4073 Merged in share-services master 2021-05-05 19:43:50 +01:00
alandavis
72af2594c5 Move share-services to amps/share-services 2021-05-05 19:43:48 +01:00
alandavis
3a2e10bc71 Change POM version to 11.21-ags-1.0-SNAPSHOT 2021-05-05 19:42:59 +01:00
alandavis
ba16561c75 Merged in governance-services master 2021-05-05 19:42:46 +01:00
alandavis
36ddba20b2 Move governance-services code to amps/ags 2021-05-05 19:41:33 +01:00
Travis CI User
ec3760b50c [maven-release-plugin][skip ci] prepare for next development iteration 2021-05-04 15:34:37 +00:00
Travis CI User
5542ad3d53 [maven-release-plugin][skip ci] prepare release 11.20 11.20 2021-05-04 15:34:32 +00:00