From d79b798fb6d130c6399beaa82654c53c9a1ab4db Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Fri, 22 Jun 2018 14:27:32 +0300 Subject: [PATCH 1/3] temporary fix for module.properties issue --- pom.xml | 152 ------------------------ rm-community/rm-community-repo/pom.xml | 153 +++++++++++++++++++++++++ 2 files changed, 153 insertions(+), 152 deletions(-) diff --git a/pom.xml b/pom.xml index 960c830995..5620947738 100644 --- a/pom.xml +++ b/pom.xml @@ -175,158 +175,6 @@ - - - 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} - - - - - - - - - diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 789d50bbcf..7ac23a239f 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -478,6 +478,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} + + + + + + + + + use-mysql From a0663b2cf8ecc1df8e7f2ea93ecd81fce4d8cf91 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Mon, 25 Jun 2018 13:50:58 +0300 Subject: [PATCH 2/3] temporary solution --- pom.xml | 43 ++++ rm-community/rm-community-repo/pom.xml | 260 ++++++++++--------------- 2 files changed, 151 insertions(+), 152 deletions(-) diff --git a/pom.xml b/pom.xml index 44ea26ebbd..929abe753b 100644 --- a/pom.xml +++ b/pom.xml @@ -175,6 +175,49 @@ + + + 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} + + + + + + + + + diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 6cfcc3391c..86e755123f 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -481,158 +481,6 @@ - - - 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} - - - - - - - - - use-mysql @@ -808,6 +656,114 @@ + + + + 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} + + + + + + + + From c957ce332ec349fbd98d0385689046f57e246fee Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Mon, 25 Jun 2018 16:04:16 +0300 Subject: [PATCH 3/3] fix the values set into module properties --- pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 108 ------------------------- 2 files changed, 1 insertion(+), 109 deletions(-) diff --git a/pom.xml b/pom.xml index 929abe753b..b63e5cdbec 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 86e755123f..5623289ec5 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -656,114 +656,6 @@ - - - - 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} - - - - - - - -