diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 6341a0871b..2c4e8de8d0 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -16,46 +16,16 @@ - /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 - 8.15 - 7.0.0 - - 7.0.0 - - 61616 - 5672 - 3.7.0 - /share - - 3.1.0 true - 3.2.2 - false - 11 - ${java.version} - ${java.version} - ${java.version} + 1.9.1 3.8.0 3.0.0-M2 3.1.0 8080 - 2.12.1 - 2.12.1 - 0.34.1 - 1.10.19 - UTF-8 UTF-8 - -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote true false @@ -64,80 +34,39 @@ src/main/amp ../${project.build.finalName} true - ${project.build.directory}/ - WARN ** src/main/properties/local ** src/test/properties/local - - 2.4.0-b180830.0359 - 3.0.0-M4 - 4.0.1 - 1.19 - - - - org.mockito - mockito-all - ${mockito.version} - - - org.alfresco.surf - spring-webscripts - ${alfresco-spring-webscripts.version} - tests - - - postgresql - postgresql - ${alfresco.postgres.version} - - - mysql - mysql-connector-java - ${dependency.mysql.version} - - - - - - junit - junit - 4.13.2 - test - - javax.xml.bind - jaxb-api - ${javax-jaxb.version} + jakarta.jws + jakarta.jws-api provided - - org.apache.camel - camel-mock - ${camel.mock.version} - test - + + + + + + - - com.sun.xml.bind - jaxb-impl - ${javax-jaxb-impl.version} - provided - + + + + + - - org.apache.bcel - bcel - 6.2.99 - provided - + + + + + + @@ -178,7 +107,7 @@ ags.module.repo.version.min - ${alfresco.min.version} + ${amp.min.version} (\d+)\.(\d+).* $1.$2 false @@ -221,7 +150,6 @@ maven-javadoc-plugin - ${maven.javadoc.version} none @@ -252,7 +180,6 @@ maven-install-plugin - 2.5.2 default-install @@ -286,14 +213,6 @@ site - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - default-deploy @@ -301,24 +220,8 @@ deploy - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - @@ -353,36 +256,6 @@ - - maven-surefire-plugin - 2.22.1 - - - --illegal-access=permit - - - - - maven-install-plugin - 2.5.2 - - - maven-jar-plugin - 3.1.0 - - - maven-assembly-plugin - 3.1.0 - - - org.alfresco.maven.plugin - alfresco-maven-plugin - 2.1.1 - true - - true - - maven-compiler-plugin ${maven.compiler.version} @@ -398,8 +271,8 @@ testCompile - ${testJavaVersion} - ${testJavaVersion} + ${java.version} + ${java.version} @@ -593,18 +466,17 @@ maven-war-plugin - ${maven.war.plugin.version} org.apache.commons commons-compress - ${apache-compress.version} + ${dependency.apache-compress.version} org.alfresco.maven.plugin alfresco-maven-plugin - 2.1.1 + ${alfresco.maven-plugin.version} @@ -672,6 +544,15 @@ + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + @@ -719,7 +600,6 @@ maven-javadoc-plugin - ${maven.javadoc.version} com.docflex.javadoc.Doclet ${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index a83000e57a..2fdcfcf9a8 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -28,31 +28,6 @@ spring-test ${dependency.spring.version} - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index a358e10a02..3e352d91fd 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -12,24 +12,7 @@ - ${basedir}/target/alf_test_data - org.alfresco.repo.domain.dialect.MySQLInnoDBDialect - alfresco - alfresco - alfresco - localhost - alfresco-test - - 5.7.23 - 3306 - 3307 - - 5432 - - 5431 - alfresco-platform - 9.1-901.jdbc4 alfresco/alfresco-governance-repository-community @@ -99,7 +82,7 @@ test - postgresql + org.postgresql postgresql test @@ -563,7 +546,7 @@ - mysql:${mysql.version} + mysql:${dependency.mysql-image.version} ${mysql.tests.port}:${mysql.port} diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index ea502f70e8..1993ca3f96 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -12,8 +12,6 @@ false - UTF-8 - UTF-8 @@ -68,7 +66,7 @@ org.alfresco api-explorer - ${api.explorer.version} + ${alfresco.api-explorer.version} war diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index cbe5cd465a..1e8f49c69f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -183,7 +183,6 @@ maven-war-plugin - 3.3.1 diff --git a/pom.xml b/pom.xml index 4dc130f93a..fb4567c9b7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ 1 0 + ${acs.version.major}.0.0 Community community @@ -38,6 +39,8 @@ 11 11 11 + 3.2.2 + 3.2.0 ${project.build.directory}/alf_data @@ -63,6 +66,7 @@ 8.18 1.68 3.8.0 + 1.10.19 20210307 1.4-DBCP330 2.8.0 @@ -83,8 +87,10 @@ 3.4.1.Final 3.7.1 5.16.1 + 1.20 1.2.5 4.0.3 + 3.38.0 2.3.3 2.3.3 @@ -99,9 +105,12 @@ 3.2.1 1.4.0 + 7.0.0 + 2.2.0 42.2.19 8.0.23 + 8 2.7.2 3.0.44 3.3.0 @@ -111,6 +120,22 @@ 1.6 1.5 2.6 + + + 61616 + 5672 + 5432 + 5431 + 3306 + 3307 + + ${basedir}/target/alf_test_data + org.alfresco.repo.domain.dialect.MySQLInnoDBDialect + alfresco + alfresco + alfresco + localhost + alfresco-test @@ -474,6 +499,16 @@ jackson-databind ${dependency.jackson-databind.version} + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${dependency.jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${dependency.jackson.version} + com.fasterxml.jackson.core jackson-annotations @@ -607,7 +642,7 @@ org.apache.commons commons-compress - 1.20 + ${dependency.apache-compress.version} org.apache.commons @@ -696,7 +731,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -705,6 +740,12 @@ ${dependency.antlr.version} test + + org.mockito + mockito-all + ${dependency.mockito-all.version} + test + org.mockito mockito-core @@ -824,14 +865,29 @@ docker-maven-plugin 0.34.1 + + maven-surefire-plugin + 2.22.2 + + true + alphabetical + + --illegal-access=permit + + + maven-jar-plugin 3.2.0 + + maven-war-plugin + ${maven.war.plugin.version} + org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven.javadoc.plugin.version} org.apache.maven.plugins @@ -843,6 +899,16 @@ maven-dependency-plugin 3.1.2 + + maven-assembly-plugin + 3.3.0 + + + org.alfresco.maven.plugin + alfresco-maven-plugin + ${alfresco.maven-plugin.version} + true +