diff --git a/pom.xml b/pom.xml index a97b4f3d73..78ac1e1d1e 100644 --- a/pom.xml +++ b/pom.xml @@ -171,8 +171,9 @@ -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote true false - 1.1.0 + 6.0.0 2.9.5 + 5.0.4.RELEASE @@ -192,7 +193,6 @@ 4.12 test - com.fasterxml.jackson.core jackson-core @@ -208,11 +208,81 @@ jackson-databind ${dependency.jackson.version} - com.fasterxml.jackson.datatype jackson-datatype-joda ${dependency.jackson.version} + + + org.springframework + spring-aop + ${dependency.spring.version} + + + org.springframework + spring-beans + ${dependency.spring.version} + + + org.springframework + spring-context + ${dependency.spring.version} + + + org.springframework + spring-context-support + ${dependency.spring.version} + + + org.springframework + spring-core + ${dependency.spring.version} + + + org.springframework + spring-expression + ${dependency.spring.version} + + + org.springframework + spring-jdbc + ${dependency.spring.version} + + + org.springframework + spring-jms + ${dependency.spring.version} + + + org.springframework + spring-orm + ${dependency.spring.version} + + + org.springframework + spring-tx + ${dependency.spring.version} + + + org.springframework + spring-web + ${dependency.spring.version} + + + org.springframework + spring-webmvc + ${dependency.spring.version} + + + org.springframework + spring-test + ${dependency.spring.version} + test + + + org.mockito + mockito-all + 1.10.19 test diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 81e55d50d6..a4e51ab7f5 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -44,10 +44,8 @@ 6.0.5-ea - 6.0.a true - diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 5ab5870216..84b7011675 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -13,6 +13,7 @@ + ${basedir}/target/alf_test_data org.alfresco.repo.domain.dialect.MySQLInnoDBDialect alfresco @@ -21,7 +22,7 @@ localhost alfresco-platform 9.1-901.jdbc4 - 5.1.31 + 5.1.40 alfresco-rm-community-repo true ${project.build.directory}/solr/home @@ -32,29 +33,14 @@ 8.5 6.50 6.31 - 1.0.8 - 6.0 - 1.1 - 2.3 - 7.0 - 6.0 - 1.2.8 - 5.0.4.RELEASE - 3.5.37 + 6.17 6.0.a 6.0.a - - 3.1.0-RC1 - - 1.2.0-RC2 6.7 - ${project.version} - alfresco-community - ${alfresco.package.name}-distribution 42.2.1 5.1.40 @@ -327,92 +313,29 @@ - - - org.alfresco - alfresco-data-model - ${dependency.alfresco-data-model.version} - - - - org.springframework - spring-aop - ${dependency.spring.version} - - - org.springframework - spring-beans - ${dependency.spring.version} - - - org.springframework - spring-context - ${dependency.spring.version} - - - org.springframework - spring-context-support - ${dependency.spring.version} - - - org.springframework - spring-core - ${dependency.spring.version} - - - org.springframework - spring-expression - ${dependency.spring.version} - - - org.springframework - spring-jdbc - ${dependency.spring.version} - - - org.springframework - spring-jms - ${dependency.spring.version} - - - org.springframework - spring-orm - ${dependency.spring.version} - - - org.springframework - spring-tx - ${dependency.spring.version} - - - org.springframework - spring-web - ${dependency.spring.version} - - - org.springframework - spring-webmvc - ${dependency.spring.version} - ${alfresco.groupId} alfresco-remote-api ${dependency.alfresco-remote-api.version} provided - + + org.alfresco + alfresco-data-model + ${dependency.alfresco-data-model.version} + javax.servlet javax.servlet-api provided + + org.alfresco.surf + spring-webscripts + ${dependency.alfresco-spring-webscripts.version} + tests + test + io.takari.junit takari-cpsuite @@ -424,25 +347,6 @@ junit test - - org.alfresco.surf - spring-webscripts - 6.13 - tests - test - - - org.mockito - mockito-all - 1.10.19 - test - - - org.springframework - spring-test - 5.0.4.RELEASE - test - ${alfresco.groupId} alfresco-core @@ -482,21 +386,6 @@ ${dependency.mysql.version} test - org.reflections reflections