From ead61904ce03a8b8c61005805cbd3b5eddca5b6c Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 4 Jun 2018 16:57:55 +0100 Subject: [PATCH 1/6] RM-6295 Remove dependency on Alfresco Maven SDK. --- pom.xml | 486 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 414 insertions(+), 72 deletions(-) diff --git a/pom.xml b/pom.xml index 422d515fff..39068d690a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,6 @@ 3.0.0-SNAPSHOT Alfresco Records Management - - org.alfresco.maven - alfresco-sdk-parent - 2.1.1 - - http://www.alfresco.org/ 2005 @@ -24,8 +18,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - HEAD - + JIRA @@ -41,17 +34,39 @@ + + alfresco-internal + Alfresco Internal Repository + https://artifacts.alfresco.com/nexus/content/groups/internal/ + alfresco-public https://artifacts.alfresco.com/nexus/content/groups/public + + alfresco-public-snapshots + https://artifacts.alfresco.com/nexus/content/groups/public-snapshots + + + alfresco-private + Alfresco Internal Repository + https://artifacts.alfresco.com/nexus/content/groups/private + alfresco-public https://artifacts.alfresco.com/nexus/content/groups/public + + alfresco-plugin-public + https://artifacts.alfresco.com/nexus/content/groups/public + + + alfresco-plugin-public-snapshots + https://artifacts.alfresco.com/nexus/content/groups/public-snapshots + @@ -181,6 +196,68 @@ true false + + ${project.build.directory}/${project.build.finalName}-war + 2.2 + alfresco + + 1.4 + /alfresco + alfresco + 2.5 + true + 2.1.1 + 1.9.1 + jdbc:h2:${session.executionRootDirectory}/alf_data_dev/h2_data/alf_dev;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE + 2.5 + 1.10.19 + org.alfresco + */*-enterprise/* + true + src/main/amp + 1.4.185 + ${session.executionRootDirectory}/alf_data_dev + 5.0.d + 2.2 + ** + local + /share + ** + 1.7 + 2.5.2 + 2.9 + 42.2.1 + 5.0.1 + ${project.build.directory}/ + 2.5.1 + 5.1.40 + src/test/properties/local + https://github.com/Alfresco/alfresco-sdk + ../../target/staging/poms/alfresco-sdk-parent + + 1.7 + 3.0.0-SNAPSHOT + 2.3 + org.h2.jdbcx.JdbcDataSource + ../${project.build.finalName} + runtime + 1.5.3 + true + 2.7 + 2.18 + 1.7 + alfresco + 5.0.d + 1.2.3.RELEASE + src/main/properties/local + share + 1.5.11 + 3.2 + alf_dev + 8080 + WARN + alfresco + 2.6.1 @@ -257,9 +334,29 @@ ${project.artifactId}-${project.version} - org.apache.maven.plugins maven-enforcer-plugin + 1.4 + + enforce-sdk-requirements + + enforce + + + + + alfresco.version + The SDK 2.1.x is supported only for Alfresco 5.0.d Community and above or + Alfresco Enterprise 5.0.1 and above + ^(5\.(0\.[d-z1-9]|[1-9])|6\.).*$ + + + 3.2.2 + + + true + + enforce-java @@ -278,6 +375,7 @@ org.codehaus.mojo build-helper-maven-plugin + 1.9.1 regex-properties @@ -289,8 +387,8 @@ rm.module.repo.version.min ${alfresco.version} - (\d+)\.(\d+).* - $1.$2 + (\d+)\.(\d+).* + $1.$2 false @@ -317,8 +415,8 @@ - org.apache.maven.plugins maven-surefire-plugin + 2.18 **/*UnitTest.java @@ -326,7 +424,6 @@ - org.apache.maven.plugins maven-source-plugin 3.0.1 @@ -339,7 +436,6 @@ - org.apache.maven.plugins maven-javadoc-plugin 2.10.4 @@ -348,12 +444,155 @@ jar + + -Xdoclint:none + + + + + -Xdoclint:none + + + + maven-clean-plugin + 2.6.1 + + + default-clean + clean + + clean + + + maven-install-plugin + 2.5.2 + + + default-install + install + + install + + + + + + maven-deploy-plugin + 2.7 + + + default-deploy + deploy + + deploy + + + + + + maven-site-plugin + 3.3 + + + default-site + site + + site + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + default-deploy + site-deploy + + deploy + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + org.apache.maven.archetype + archetype-packaging + 2.2 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.2 + + + + + src/main/resources + ${app.filtering.enabled} + + + ${app.amp.folder} + ${app.amp.output.folder} + ${app.filtering.enabled} + + + + + src/test/resources + ${app.filtering.enabled} + + + + maven-surefire-plugin + 2.18 + + + maven-install-plugin + 2.5.2 + + + maven-jar-plugin + 2.5 + + + maven-assembly-plugin + 2.2-beta-5 + + + org.alfresco.maven.plugin + alfresco-maven-plugin + 2.1.1 + true + + true + + maven-compiler-plugin ${maven.compiler.version} @@ -396,7 +635,7 @@ - + org.codehaus.mojo @@ -406,20 +645,19 @@ [1.9.1,) - - regex-properties - - - - - + + regex-properties + + + + + - org.apache.maven.plugins maven-enforcer-plugin ${maven.enforcer.plugin} @@ -429,12 +667,10 @@ 1.0-alpha-2 - org.apache.maven.plugins maven-failsafe-plugin 2.19 - org.apache.maven.plugins maven-antrun-plugin 1.8 @@ -451,76 +687,73 @@ - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - V@{project.version} - + maven-release-plugin + 2.5.3 + + V@{project.version} + - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - + maven-javadoc-plugin + + -Xdoclint:none + - org.codehaus.mojo - license-maven-plugin - 1.8 - + org.codehaus.mojo + license-maven-plugin + 1.8 + ${license.verbose} - false - false + false + false - Alfresco Software Limited - ${project.parent.parent.basedir}/license/description.ftl - true - true + Alfresco Software Limited + ${project.parent.parent.basedir}/license/description.ftl + true + true - file:${project.parent.parent.basedir}/license + file:${project.parent.parent.basedir}/license ${license.update.dryrun} - true - true + true + true - - src - + + src + - - **/package-info.java - **/*.properties - **/*.css - **/*.xml - **/*.json - **/*.txt - **/*.html - + + **/package-info.java + **/*.properties + **/*.css + **/*.xml + **/*.json + **/*.txt + **/*.html + - - - - first - - update-file-header - - process-sources - - + + + + first + + update-file-header + + process-sources + + - org.apache.maven.plugins maven-resources-plugin ${maven.resources.version} @@ -530,6 +763,115 @@ 3.1.1 + + UTF-8 + + ftl + acp + jpg + png + gif + svg + pdf + doc + docx + xls + xlsx + ppt + pptx + bin + lic + swf + zip + msg + jar + ttf + eot + woff + woff2 + css + ico + psd + + + + + maven-war-plugin + 2.5 + + + org.alfresco.maven.plugin + alfresco-maven-plugin + 2.1.1 + + + + false + + + true + + + + + + maven-clean-plugin + 2.6.1 + + + maven-dependency-plugin + 2.9 + + + maven-archetype-plugin + 2.2 + + ${skipTests} + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + + com.h2database + h2 + 1.4.185 + + + + true + + + + net.alchim31.maven + yuicompressor-maven-plugin + 1.5.1 + + + compress-js + process-resources + + compress + + + + **/webscripts/** + **/site-webscripts/** + **/*.lib.js + **/*.css + + src/main/resources/META-INF + false + + + From 6110fe2689636941888b61627915fc0002fce3fa Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 6 Jun 2018 11:37:09 +0100 Subject: [PATCH 2/6] RM-6295 Get enterprise integration tests working. --- pom.xml | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/pom.xml b/pom.xml index 39068d690a..f18d2dbca4 100644 --- a/pom.xml +++ b/pom.xml @@ -174,6 +174,159 @@ + + + + enable-amp + + + src/main/amp/module.properties + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + + + maven-resources-plugin + + + add-module-properties-to-test-classpath + process-test-resources + + copy-resources + + + ${project.build.testOutputDirectory} + + + ${app.amp.folder} + + module.properties + + ${app.filtering.enabled} + alfresco/module/${project.artifactId} + + + + + + add-module-config-to-test-classpath + process-test-resources + + copy-resources + + + ${project.build.testOutputDirectory} + + + ${app.amp.folder}/config + + **/* + + ${app.filtering.enabled} + + + + + + + + + + + + + enable-properties-filtering + + + + src/main/properties + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven.buildhelper.version} + + + add-env-properties + generate-resources + + add-resource + + + + + ${app.properties.folder} + + ${app.properties.include} + + ${app.filtering.enabled} + + + + + + + + + + + enable-test-properties-filtering + + + + src/test/properties + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven.buildhelper.version} + + + add-env-test-properties + generate-resources + + add-test-resource + + + + + ${app.properties.test.folder} + + ${app.properties.test.include} + + ${app.filtering.enabled} + + + + + + + + + From 1493e63f81d5954c58455e9e5f4c8521054aab53 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 6 Jun 2018 14:33:27 +0100 Subject: [PATCH 3/6] RM-6295 Remove unneeded properties from root pom. --- pom.xml | 111 +++++++++++++------------------------------------------- 1 file changed, 25 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index f18d2dbca4..00dcfd2f57 100644 --- a/pom.xml +++ b/pom.xml @@ -330,12 +330,28 @@ + /alfresco + ${session.executionRootDirectory}/alf_data_dev + org.gjt.mm.mysql.Driver + alf_dev AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE + alfresco + jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} + alfresco + org.alfresco + share 6.17 + /share + false 1.8 1.8 + 1.9.1 + 3.2 + 1.4 + 2.7 + 8080 2.9.5 5.0.4.RELEASE @@ -350,67 +366,17 @@ true false - ${project.build.directory}/${project.build.finalName}-war - 2.2 - alfresco - - 1.4 - /alfresco - alfresco - 2.5 - true - 2.1.1 - 1.9.1 - jdbc:h2:${session.executionRootDirectory}/alf_data_dev/h2_data/alf_dev;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE - 2.5 - 1.10.19 - org.alfresco - */*-enterprise/* - true - src/main/amp - 1.4.185 - ${session.executionRootDirectory}/alf_data_dev - 5.0.d - 2.2 - ** - local - /share - ** - 1.7 - 2.5.2 - 2.9 - 42.2.1 - 5.0.1 - ${project.build.directory}/ - 2.5.1 - 5.1.40 - src/test/properties/local - https://github.com/Alfresco/alfresco-sdk - ../../target/staging/poms/alfresco-sdk-parent - - 1.7 - 3.0.0-SNAPSHOT - 2.3 - org.h2.jdbcx.JdbcDataSource - ../${project.build.finalName} - runtime - 1.5.3 - true - 2.7 - 2.18 - 1.7 alfresco - 5.0.d - 1.2.3.RELEASE - src/main/properties/local - share - 1.5.11 - 3.2 - alf_dev - 8080 + ${project.build.directory}/${project.build.finalName}-war + src/main/amp + ../${project.build.finalName} + true + ${project.build.directory}/ WARN - alfresco - 2.6.1 + ** + src/main/properties/local + ** + src/test/properties/local @@ -490,26 +456,6 @@ maven-enforcer-plugin 1.4 - - enforce-sdk-requirements - - enforce - - - - - alfresco.version - The SDK 2.1.x is supported only for Alfresco 5.0.d Community and above or - Alfresco Enterprise 5.0.1 and above - ^(5\.(0\.[d-z1-9]|[1-9])|6\.).*$ - - - 3.2.2 - - - true - - enforce-java @@ -537,13 +483,6 @@ - - rm.module.repo.version.min - ${alfresco.version} - (\d+)\.(\d+).* - $1.$2 - false - rm.module.version ${project.version} From 8110e689306faeba9ef95b8064f6bb4bb9b96087 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 6 Jun 2018 14:47:18 +0100 Subject: [PATCH 4/6] RM-6295 Remove dependency on h2. --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 00dcfd2f57..8944f23bf7 100644 --- a/pom.xml +++ b/pom.xml @@ -930,13 +930,6 @@ org.apache.tomcat.maven tomcat7-maven-plugin 2.2 - - - com.h2database - h2 - 1.4.185 - - true From 8b035560a10d116b9cccfffdcf5d57f21f472005 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 7 Jun 2018 11:55:14 +0100 Subject: [PATCH 5/6] Set rm.module.repo.version.min using regex-properties. --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8944f23bf7..5260cb6941 100644 --- a/pom.xml +++ b/pom.xml @@ -341,6 +341,8 @@ org.alfresco share 6.17 + + 0.0 /share @@ -474,7 +476,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.9.1 regex-properties @@ -483,6 +484,13 @@ + + rm.module.repo.version.min + ${alfresco.version} + (\d+)\.(\d+).* + $1.$2 + false + rm.module.version ${project.version} From 6e323107ec4b75c92cca113093222baf1d63935d Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 7 Jun 2018 14:33:07 +0100 Subject: [PATCH 6/6] RM-6295 Remove unused definition of app.amp.client.war.artifactId. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5260cb6941..8d900944de 100644 --- a/pom.xml +++ b/pom.xml @@ -368,7 +368,6 @@ true false - alfresco ${project.build.directory}/${project.build.finalName}-war src/main/amp ../${project.build.finalName}