diff --git a/pom.xml b/pom.xml index 4ed1b31892..293caa8b57 100644 --- a/pom.xml +++ b/pom.xml @@ -1,340 +1,340 @@ - - - 4.0.0 - org.alfresco - alfresco-rm - pom - 2.4-SNAPSHOT - Alfresco Records Management - - - org.alfresco.maven - alfresco-sdk-parent - 2.1.1 - - - http://www.alfresco.org/ - 2005 - - Alfresco Software - http://www.alfresco.org/ - - - - scm:git:https://gitlab.alfresco.com/records-management/records-management.git - scm:git:https://gitlab.alfresco.com/records-management/records-management.git - https://gitlab.alfresco.com/records-management/records-management - - - - JIRA - https://issues.alfresco.com/jira/browse/RM - - - Bamboo - https://bamboo.alfresco.com/bamboo/browse/RM - - - - 3.2.5 - - - - - alfresco-internal - https://artifacts.alfresco.com/nexus/content/groups/private - - - - - - alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public - - - - - - alfresco-internal - https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/ - - - alfresco-internal-snapshots - https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/ - - - - - - - ${alfresco.groupId} - alfresco-platform-distribution - ${alfresco.version} - pom - import - - - - - - rm-community - rm-enterprise - rm-automation - - - - ${project.version} - false - 1.7 - 1.8 - UTF-8 - UTF-8 - -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote - - - true - false - - - - - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - 1.8 - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - regex-properties - - regex-properties - - - - - rm.module.repo.version.min - ${alfresco.version} - (\d+)\.(\d+).* - $1.$2 - false - - - rm.module.version - ${alfresco.rm.version} - (\d+)\.(\d+).* - $1.$2 - false - - - - - - add-test-source - - add-test-source - - - - src/unit-test/java - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*UnitTest.java - - - - - - - - maven-compiler-plugin - ${maven.compiler.version} - - ${maven.build.sourceVersion} - ${maven.build.sourceVersion} - - - - default-testCompile - process-test-sources - - testCompile - - - ${maven.build.testSourceVersion} - ${maven.build.testSourceVersion} - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0.0,) - - enforce - - - - - - - - - - org.codehaus.mojo - - - build-helper-maven-plugin - - - [1.9.1,) - - - regex-properties - - - - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.plugin} - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.19 - - - org.codehaus.mojo - build-helper-maven-plugin - ${maven.buildhelper.version} - - - org.codehaus.mojo - sql-maven-plugin - 1.5 - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - V@{project.version} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - org.codehaus.mojo - license-maven-plugin - 1.8 - - - ${license.verbose} - false - false - - - Alfresco Software Limited - ${project.parent.parent.basedir}/license/description.ftl - true - true - - - file:${project.parent.parent.basedir}/license - - - ${license.update.dryrun} - true - true - - - - src - - - - - **/package-info.java - **/*.properties - **/*.css - **/*.xml - **/*.json - **/*.txt - **/*.html - - - - - - first - - update-file-header - - process-sources - - - - - - - + + + 4.0.0 + org.alfresco + alfresco-rm + pom + 2.4.1-SNAPSHOT + Alfresco Records Management + + + org.alfresco.maven + alfresco-sdk-parent + 2.1.1 + + + http://www.alfresco.org/ + 2005 + + Alfresco Software + http://www.alfresco.org/ + + + + scm:git:https://gitlab.alfresco.com/records-management/records-management.git + scm:git:https://gitlab.alfresco.com/records-management/records-management.git + https://gitlab.alfresco.com/records-management/records-management + HEAD + + + + JIRA + https://issues.alfresco.com/jira/browse/RM + + + Bamboo + https://bamboo.alfresco.com/bamboo/browse/RM + + + + 3.2.5 + + + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/groups/private + + + + + + alfresco-public + https://artifacts.alfresco.com/nexus/content/groups/public + + + + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/ + + + alfresco-internal-snapshots + https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/ + + + + + + + ${alfresco.groupId} + alfresco-platform-distribution + ${alfresco.version} + pom + import + + + + + + rm-community + rm-enterprise + rm-automation + + + + ${project.version} + false + 1.7 + 1.8 + UTF-8 + UTF-8 + -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote + + + true + false + + + + + ${project.artifactId}-${project.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java + + enforce + + + + + 1.8 + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + regex-properties + + regex-properties + + + + + rm.module.repo.version.min + ${alfresco.version} + (\d+)\.(\d+).* + $1.$2 + false + + + rm.module.version + ${alfresco.rm.version} + (\d+)\.(\d+).* + $1.$2 + false + + + + + + add-test-source + + add-test-source + + + + src/unit-test/java + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*UnitTest.java + + + + + + + + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.build.sourceVersion} + ${maven.build.sourceVersion} + + + + default-testCompile + process-test-sources + + testCompile + + + ${maven.build.testSourceVersion} + ${maven.build.testSourceVersion} + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + org.codehaus.mojo + + + build-helper-maven-plugin + + + [1.9.1,) + + + regex-properties + + + + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.plugin} + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19 + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven.buildhelper.version} + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + V@{project.version} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + + + org.codehaus.mojo + license-maven-plugin + 1.8 + + + ${license.verbose} + false + false + + + Alfresco Software Limited + ${project.parent.parent.basedir}/license/description.ftl + true + true + + + file:${project.parent.parent.basedir}/license + + + ${license.update.dryrun} + true + true + + + + src + + + + + **/package-info.java + **/*.properties + **/*.css + **/*.xml + **/*.json + **/*.txt + **/*.html + + + + + + first + + update-file-header + + process-sources + + + + + + + diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index c766803616..ed3d7c3c0d 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -1,399 +1,398 @@ - - - - 4.0.0 - alfresco-rm-automation - Alfresco Records Management Automation - - - org.alfresco - alfresco-rm - 2.4-SNAPSHOT - - - - - 2.45.0 - 4.0.5.RELEASE - 1.8 - testng.xml - true - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source - - add-test-source - - - - src/unit-test/java - - - - - - - maven-surefire-plugin - - false - - ${project.build.testOutputDirectory}/${suiteXmlFile} - - ${skip.automationtests} - - - - maven-antrun-plugin - - - default-cli - - - Stopping Alfresco... - - - - - - - - - - - - org.codehaus.mojo - license-maven-plugin - - alfresco_enterprise - file:${project.parent.basedir}/license - ${project.parent.basedir}/license/description.ftl - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - license-maven-plugin - - - [1.8,) - - - - update-file-header - - - - - - - - - - - - - - - - - - org.alfresco.test - dataprep - 1.8 - - - org.alfresco.test - alfresco-testng - 1.1 - - - org.alfresco - selenium-grid - 1.4 - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.testng - testng - 6.8.8 - - - ru.yandex.qatools.htmlelements - htmlelements-all - 1.12 - - - ru.yandex.qatools.properties - properties-loader - 1.5 - test - - - com.github.tomakehurst - wiremock - 1.56 - - - org.mockito - mockito-all - test - - - - - - install-alfresco - - - - maven-antrun-plugin - - - fetch-installer - generate-test-resources - - run - - - - Recreating database... - drop database if exists alfresco; create database alfresco - Downloading Alfresco installer... - - - - Installing Alfresco... - - - - - - - - - - org.apache.ant - ant-jsch - 1.8.2 - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - - maven-dependency-plugin - - - fetch-amps - process-test-resources - - copy - - - - - org.alfresco - alfresco-rm-community-share - ${project.version} - amp - - - org.alfresco - alfresco-rm-enterprise-share - ${project.version} - amp - - - org.alfresco - alfresco-rm-community-repo - ${project.version} - amp - - - org.alfresco - alfresco-rm-enterprise-repo - ${project.version} - amp - - - ${project.build.directory}/amps - true - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - true - - - install-community-repo-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - - - - install-enterprise-repo-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - - - - install-community-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - install-enterprise-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - - - - - - run-alfresco - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - prepare-jacoco - - prepare-agent - - - - - - org.alfresco.* - - - - - maven-antrun-plugin - - - start-alfresco - process-test-classes - - run - - - - Starting Alfresco... - - - - - - - - - - stop-alfresco - post-integration-test - - run - - - - Stopping Alfresco... - - - - - - - - - - - - - + + + + 4.0.0 + alfresco-rm-automation + Alfresco Records Management Automation + + + org.alfresco + alfresco-rm + 2.4.1-SNAPSHOT + + + + + 2.45.0 + 4.0.5.RELEASE + 1.8 + testng.xml + true + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + + add-test-source + + + + src/unit-test/java + + + + + + + maven-surefire-plugin + + false + + ${project.build.testOutputDirectory}/${suiteXmlFile} + + ${skip.automationtests} + + + + maven-antrun-plugin + + + default-cli + + + Stopping Alfresco... + + + + + + + + + + + + org.codehaus.mojo + license-maven-plugin + + alfresco_enterprise + file:${project.parent.basedir}/license + ${project.parent.basedir}/license/description.ftl + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + license-maven-plugin + + + [1.8,) + + + + update-file-header + + + + + + + + + + + + + + + + + + org.alfresco.test + dataprep + 1.8 + + + org.alfresco.test + alfresco-testng + 1.1 + + + org.alfresco + selenium-grid + 1.8 + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + test + + + org.springframework + spring-test + ${spring.version} + test + + + org.testng + testng + 6.8.8 + + + ru.yandex.qatools.htmlelements + htmlelements-all + 1.12 + + + ru.yandex.qatools.properties + properties-loader + 1.5 + test + + + com.github.tomakehurst + wiremock + 1.56 + + + org.mockito + mockito-all + test + + + + + + install-alfresco + + + + maven-antrun-plugin + + + fetch-installer + generate-test-resources + + run + + + + Recreating database... + drop database if exists alfresco; create database alfresco + Downloading Alfresco installer... + + + + Installing Alfresco... + + + + + + + + + + org.apache.ant + ant-jsch + 1.8.2 + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + + + maven-dependency-plugin + + + fetch-amps + process-test-resources + + copy + + + + + org.alfresco + alfresco-rm-community-share + ${project.version} + amp + + + org.alfresco + alfresco-rm-enterprise-share + ${project.version} + amp + + + org.alfresco + alfresco-rm-community-repo + ${project.version} + amp + + + org.alfresco + alfresco-rm-enterprise-repo + ${project.version} + amp + + + ${project.build.directory}/amps + true + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + + install-community-repo-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + + + + install-enterprise-repo-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + + + + install-community-share-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + install-enterprise-share-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + + + + + + run-alfresco + + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + prepare-jacoco + + prepare-agent + + + + + + org.alfresco.* + + + + + maven-antrun-plugin + + + start-alfresco + process-test-classes + + run + + + + Starting Alfresco... + + + + + + + + + + stop-alfresco + post-integration-test + + run + + + + Stopping Alfresco... + + + + + + + + + + + + + diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 847e819e5d..1653aa3cd3 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -1,29 +1,28 @@ - - - 4.0.0 - alfresco-rm-community - Alfresco Records Management Community - pom - - - org.alfresco - alfresco-rm - 2.4-SNAPSHOT - - - - - LGPL 3 - - - - - rm-community-repo - rm-community-share - - - - 5.1.e - - + + + 4.0.0 + alfresco-rm-community + Alfresco Records Management Community + pom + + + org.alfresco + alfresco-rm + 2.4.1-SNAPSHOT + + + + + LGPL 3 + + + + + rm-community-repo + rm-community-share + + + + 5.1.e + + diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_de.properties index 14df792a4c..f18c7be569 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_de.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_de.properties @@ -1,16 +1,16 @@ -dod_dod5015.description=DOD5015 Content Model +dod_dod5015.description=DoD 5015-konformes Content-Modell -dod_dod5015.type.dod_site.title=DOD5015 Site -dod_dod5015.type.dod_site.description=DOD5015 Site +dod_dod5015.type.dod_site.title=DoD 5015-konforme Site +dod_dod5015.type.dod_site.description=DoD 5015-konforme Site -dod_dod5015.type.dod_filePlan.title=DOD5015 Ablageplan -dod_dod5015.type.dod_filePlan.description=DOD5015 Ablageplan +dod_dod5015.type.dod_filePlan.title=DoD 5015 Ablageplan +dod_dod5015.type.dod_filePlan.description=DoD 5015 Ablageplan dod_dod5015.type.dod_recordSeries.title=Record-Serien (abgelehnt) dod_dod5015.type.dod_recordSeries.description=Record-Serien (abgelehnt) -dod_dod5015.aspect.dod_dod5015record.title=DOD5015 Record -dod_dod5015.aspect.dod_dod5015record.description=DOD5015 Record +dod_dod5015.aspect.dod_dod5015record.title=DoD 5015-konformer Record +dod_dod5015.aspect.dod_dod5015record.description=DoD 5015-konformer Record dod_dod5015.property.dod_publicationDate.title=Ver\u00f6ffentlichungsdatum dod_dod5015.property.dod_publicationDate.decription=Ver\u00f6ffentlichungsdatum dod_dod5015.property.dod_originator.title=Ersteller diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties old mode 100755 new mode 100644 index 9bcafada1f..8c8bb68162 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties @@ -93,6 +93,6 @@ dod_dod5015.property.dod_captureDate.title=Vastlegdatum dod_dod5015.property.dod_captureDate.description=Vastlegdatum dod_dod5015.property.dod_contact.title=Contact dod_dod5015.property.dod_contact.description=Contact -dod_dod5015.property.dod_contentManagementSystem.title=Content Management System -dod_dod5015.property.dod_contentManagementSystem.description=Content Management System +dod_dod5015.property.dod_contentManagementSystem.title=Contentmanagementsysteem +dod_dod5015.property.dod_contentManagementSystem.description=Contentmanagementsysteem diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties index 6539846683..a82bc5cc8e 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties @@ -1 +1 @@ -dataset.dod5015.label=DOD 5015 Beispieldaten \ No newline at end of file +dataset.dod5015.label=DoD 5015 Beispieldaten \ No newline at end of file diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 202b0ff353..bc53ec5714 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 alfresco-rm-community-repo @@ -10,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.4-SNAPSHOT + 2.4.1-SNAPSHOT @@ -85,10 +84,9 @@ - + - + @@ -251,7 +249,7 @@ - + @@ -266,7 +264,7 @@ - + @@ -357,7 +355,7 @@ ${my.db.name} ${my.db.port} org.hibernate.dialect.MySQLInnoDBDialect - + jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} org.gjt.mm.mysql.Driver @@ -369,7 +367,7 @@ ${my.db.name} ${my.db.port} org.hibernate.dialect.PostgreSQLDialect - + jdbc:postgresql:template1 jdbc:postgresql:${alfresco.db.name} org.postgresql.Driver