Commit Graph

5254 Commits

Author SHA1 Message Date
cagache
ce60d3e89f Renamed test classes to end with Test or Tests 2019-04-12 14:32:52 +03:00
cagache
72493a9a13 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/Fix_ClassNotFoundException_logs 2019-04-12 14:17:40 +03:00
Rodica Sutu
c17fc2ac6f Merge branch 'feature/RM-6804_FixWarningsIllegalReflecticeAccess' into 'master'
RM-6804_FixWarningsIllegalReflecticeAccess

See merge request records-management/records-management!1153
2019-04-12 12:13:21 +01:00
Claudia Agache
e311f8c0ca Merge branch 'feature-3.0/Fix_ClassNotFoundException_logs' into 'release/V3.0'
RM-6822 Renamed test classes to end with Test or Tests to get rid of java.lang.ClassNotFoundException

See merge request records-management/records-management!1152
2019-04-12 09:33:17 +01:00
Rodica Sutu
3d91c28743 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6804_FixWarningsIllegalReflecticeAccess
# Conflicts:
#	pom.xml
2019-04-12 11:32:10 +03:00
Claudia Agache
99bf4bba4a Merge branch 'feature/RM-6803_JavadocNotGenerated_no' into 'master'
RM-6803 Skip Javadoc execution for not a Java classpath-capable packages

Closes RM-6803

See merge request records-management/records-management!1151
2019-04-12 08:47:23 +01:00
Rodica Sutu
107ae75f35 fix the illegal reflective access operation warning from xstream library 2019-04-12 10:31:23 +03:00
cagache
6a54f42ea6 Renamed files to end with Test or Tests to get rid of java.lang.ClassNotFoundException 2019-04-10 17:47:48 +03:00
Roxana Lucanu
400a61b7bc Merge branch 'feature/RM-6723_AGS_ACS6.1_compatibility' into 'master'
Resolve RM-6723 "Feature/ ags acs6.1 compatibility"

Closes RM-6723

See merge request records-management/records-management!1148
2019-04-10 15:18:46 +01:00
cagache
aa0a32b676 RM-6803 Skip Javadoc execution for not a Java classpath-capable packages 2019-04-10 15:39:35 +03:00
cagache
c697e37dfe Record only merge of version change. 2019-04-10 13:31:04 +03:00
Rodica Sutu
9cbdb10e6a Merge branch 'merge/RM-6787_VersionWhenClassifyFileWithCopies' into 'master'
Resolve RM-6787 "Merge/ versionwhenclassifyfilewithcopies"

Closes RM-6787

See merge request records-management/records-management!1150
2019-04-10 10:54:41 +01:00
cagache
ab27a2581c Record only merge of version change. 2019-04-10 09:57:12 +03:00
cagache
b4c29ae16d Record only merge of version change. 2019-04-10 09:54:17 +03:00
Rodica Sutu
2d06a30243 Merge remote-tracking branch 'origin/release/V3.0' into merge/RM-6787_VersionWhenClassifyFileWithCopies 2019-04-10 09:04:01 +03:00
Rodica Sutu
a4ec375afd Merge branch 'merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies' into 'release/V3.0'
Resolve RM-6787 "Merge 3.0/ versionwhenclassifyfilewithcopies"

See merge request records-management/records-management!1149
2019-04-09 16:24:43 +01:00
rlucanu
02db9e2d52 RM-6723 review changes 2019-04-09 16:45:22 +03:00
Rodica Sutu
d042925488 Update version to 2.7.2.1-SNAPSHOT 2019-04-09 11:47:20 +03:00
alfresco-build
765c163d02 [maven-release-plugin] prepare for next development iteration 2019-04-09 09:04:42 +01:00
alfresco-build
237cd19f12 [maven-release-plugin] prepare release V2.7.2 ags-2.7.2 2019-04-09 09:04:38 +01:00
Rodica Sutu
bb93c0ad4e Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspect.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/securitymarks/SecurityMarkingServiceImplUnitTest.java
2019-04-09 10:51:44 +03:00
rlucanu
166273ff0a RM-6723 code review changes 2019-04-09 09:55:43 +03:00
Ross Gale
c2a216f009 Merge branch 'feature-2.7/RM-6787_ReduceBinDuplication_V3' into 'release/V2.7'
Version change fix

See merge request records-management/records-management!1147
2019-04-08 17:34:59 +01:00
rlucanu
aa04bbba90 Merge remote-tracking branch 'origin/master' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-08 14:39:48 +03:00
cagache
9384a4e5aa Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/MergeTestChangesFromV2.7 2019-04-08 09:47:19 +03:00
rlucanu
d25c8762ca RM-6723 fixing tests 2019-04-07 23:11:10 +03:00
Ross Gale
61802a8fb9 Merge branch 'feature-2.7/RM-6787_ReduceBinDuplication_V3' of git.alfresco.com:records-management/records-management into feature-2.7/RM-6787_ReduceBinDuplication_V3 2019-04-05 15:52:03 +01:00
Ross Gale
c551042eca RM-6787 adding fix for renditons 2019-04-05 15:50:33 +01:00
rlucanu
a8c7e8540e RM-6723 Added variables for versions 2019-04-05 16:07:53 +03:00
cagache
f4ecf2a125 Merge remote-tracking branch 'remotes/origin/release/V2.7' into 'merge-3.0/MergeTestChangesFromV2.7' 2019-04-05 15:07:50 +03:00
rlucanu
5c2c54a4cd Merge remote-tracking branch 'origin/master' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-05 14:47:27 +03:00
rlucanu
3ab28bb2c2 RM-6723 Added ActiveMQ 2019-04-05 14:44:30 +03:00
cagache
c4cf0ff8cb Revert "Revert "Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6787_ReduceBinDuplication_V3' into feature-2.7/RM-6787_VersionChangeTests_no""
This reverts commit eb9071fb73.
2019-04-05 13:08:38 +03:00
cagache
eb9071fb73 Revert "Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6787_ReduceBinDuplication_V3' into feature-2.7/RM-6787_VersionChangeTests_no"
This reverts commit b5d1ae792eae2bd5adf4b1211011ace1046d40b7, reversing
changes made to d5dfbe7194c9e421b52e08032d192c089191e384.
2019-04-05 12:04:27 +03:00
Claudia Agache
a68fccd169 Merge branch 'feature/RM-6790_OpenJDK11Compatibility' into 'master'
RM-6790 Make RM automation project compatible with OpenJdk 11

Closes RM-6722

See merge request records-management/records-management!1140
2019-04-03 09:44:57 +01:00
Rodica Sutu
84699c994d Merge branch 'feature/RM-6722_OpenJDK11Compatibility' into 'feature/RM-6790_OpenJDK11Compatibility'
Resolve RM-6722 "Feature/ openjdk11compatibility"

See merge request records-management/records-management!1141
2019-04-03 09:34:33 +01:00
Ross Gale
9baac01d03 RM-6787 updating copy and add behaviors for other aspects to use duplication utility class 2019-04-02 11:47:29 +01:00
Rodica Sutu
d306574122 version updates for the plugins used for OpenJDK 11 2019-04-02 12:43:16 +03:00
Rodica Sutu
f77dc61b89 tidy up 2019-04-02 12:41:22 +03:00
rlucanu
190f859464 Merge branch 'feature/RM-6722_OpenJDK11Compatibility' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-02 12:21:14 +03:00
Ross Gale
ed8f24865c RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Rodica Sutu
9d1c3770c9 fix getResourceAsStream() for OpenJdk11 2019-04-01 11:11:43 +03:00
rlucanu
3ac143c283 RM-6723 removed unwanted string 2019-03-29 12:06:01 +02:00
Rodica Sutu
abfc1fc999 update the maven java doc plugin to fix the Error fetching link: .../target/apidocs/package-list.
add the fabric8.docker.version to fix the warning "build.plugins.plugin.version' for io.fabric8:docker-maven-plugin is missing."
2019-03-29 10:14:03 +02:00
rlucanu
8df3dbb151 RM-6723 changes to be compatible with ACS6.1 2019-03-29 09:24:40 +02:00
Rodica Sutu
0a72cf0c32 update maven enforce plugin 2019-03-28 17:53:00 +02:00
Rodica Sutu
60a7f3282d update the versions for surefire and failsafe plugins and add an additional argument --illegal-access=permit to allow all reflection access for third party libraries: 2019-03-28 17:33:37 +02:00
Rodica Sutu
95249c3c24 Merge remote-tracking branch 'remotes/origin/feature/RM-6790_OpenJDK11Compatibility' into feature/RM-6722_OpenJDKCOmpatibility 2019-03-28 11:32:05 +02:00
Rodica Sutu
5afd385009 update the maven.enforcer.plugin 2019-03-28 11:19:32 +02:00
Rodica Sutu
2b6dd1861c change back alfresco-maven-plugin
comment out thejava version from the maven-enforcer-plugin
2019-03-28 09:48:45 +02:00