diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml index 06739bd..bdbb512 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -14,8 +14,8 @@ 4.8.0 community - 23.2.0 - 23.2.0.72 + 7.4.2 + 22.17 UTF-8 8 diff --git a/beedk-acs-platform-it-tile/tile.xml b/beedk-acs-platform-it-tile/tile.xml index c8c6c72..47bf8ae 100644 --- a/beedk-acs-platform-it-tile/tile.xml +++ b/beedk-acs-platform-it-tile/tile.xml @@ -52,10 +52,17 @@ - alfresco/alfresco-activemq:${acs-activemq.version} + apache/activemq-classic:${acs-activemq.version} acs-mq ${skipTests} + + false + alfresco + alfresco + admin + admin + ${acs-activemq.port}:8161 @@ -74,14 +81,35 @@ ${acs-platform.memory} false false - -Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \ + --add-opens=java.base/java.net=ALL-UNNAMED \ + -Dencryption.keystore.location=/tmp/metadata.keystore \ + -Dmetadata-keystore.password=alfresco \ + -Dmetadata-keystore.aliases=metadata \ + -Dmetadata-keystore.metadata.password=alfresco \ + -Dmetadata-keystore.metadata.algorithm=AES \ + -Ddir.root=/tmp/alf_data \ + -Ddb.driver=org.postgresql.Driver \ + -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \ -Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&jms.useCompression\=true \ - -Dtransform.service.enabled=${beedk.deploy.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \ + -Dmessaging.broker.username=alfresco \ + -Dmessaging.broker.password=alfresco \ + -Dtransform.service.enabled=${beedk.deploy.ats.enabled} \ + -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 \ + -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \ -Dlocal.transform.service.enabled=${beedk.deploy.alts.enabled} \ - -DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \ - -Djodconverter.enabled=false -Dsystem.workflow.engine.activiti.enabled=true \ - -Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 -Dimg.url=http://${project.artifactId}-ate-aio:8090 -Dtika.url=http://${project.artifactId}-ate-aio:8090 -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \ - -Dindex.subsystem.name=${beedk.deploy.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \ + -DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 \ + -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \ + -Djodconverter.enabled=false \ + -Dsystem.workflow.engine.activiti.enabled=false \ + -Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 \ + -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 \ + -Dimg.url=http://${project.artifactId}-ate-aio:8090 \ + -Dtika.url=http://${project.artifactId}-ate-aio:8090 \ + -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \ + -Dindex.subsystem.name=${beedk.deploy.platform.index} \ + -Dsolr.host=${project.artifactId}-acs-search \ + -Dsolr.secureComms=secret \ + -Dsolr.sharedSecret=alfresco-secret \ ${acs-platform.tomcat.opts} @@ -124,7 +152,7 @@ acs-db - alfresco/alfresco-activemq:${acs-activemq.version} + apache/activemq-classic:${acs-activemq.version} acs-mq diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/metadata.keystore b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/metadata.keystore new file mode 100644 index 0000000..2c2a1d9 Binary files /dev/null and b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/metadata.keystore differ diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml index ffe220c..e32f0ac 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml @@ -16,7 +16,7 @@ 8 4.8.0 - 23.2.0 + 7.4.2 diff --git a/beedk-acs-platform-rad-tile/README.md b/beedk-acs-platform-rad-tile/README.md index d8a790d..c69140b 100644 --- a/beedk-acs-platform-rad-tile/README.md +++ b/beedk-acs-platform-rad-tile/README.md @@ -85,7 +85,7 @@ The following properties are only intended to be defined by BeeDK components. | `beedk.rad.acs-search.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-search-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-rad-tile) tile **AFTER** this tile. | | `beedk.rad.alts.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-lts-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-rad-tile) tile **AFTER** this tile. | | `beedk.rad.ats.enabled` | | false | **Do not** set explicitly; just include the [`beedk-ats-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-ats-rad-tile) tile **AFTER** this tile. | -| `acs-api-explorer.version` | | `23.2.0` | The API Explorer version. You could use `${alfresco.platform.version}` in ACS Enterprise. This will eventually parse the ACS Platform version for the right value. | +| `acs-api-explorer.version` | | `7.4.2` | The API Explorer version. You could use `${alfresco.platform.version}` in ACS Enterprise. This will eventually parse the ACS Platform version for the right value. | ### Other APIs diff --git a/beedk-acs-platform-rad-tile/tile.xml b/beedk-acs-platform-rad-tile/tile.xml index ea020dd..20cab6e 100644 --- a/beedk-acs-platform-rad-tile/tile.xml +++ b/beedk-acs-platform-rad-tile/tile.xml @@ -99,9 +99,16 @@ - alfresco/alfresco-activemq:${acs-activemq.version} + apache/activemq-classic:${acs-activemq.version} acs-mq + + false + alfresco + alfresco + admin + admin + ${acs-activemq.port}:8161 @@ -120,14 +127,35 @@ ${acs-platform.debugger.enabled} ${acs-platform.hotswap.enabled} ${acs-platform.hotswap.disablePlugins} - -Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \ + --add-opens=java.base/java.net=ALL-UNNAMED \ + -Dencryption.keystore.location=/tmp/metadata.keystore \ + -Dmetadata-keystore.password=alfresco \ + -Dmetadata-keystore.aliases=metadata \ + -Dmetadata-keystore.metadata.password=alfresco \ + -Dmetadata-keystore.metadata.algorithm=AES \ + -Ddir.root=/tmp/alf_data \ + -Ddb.driver=org.postgresql.Driver \ + -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \ -Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&jms.useCompression\=true \ - -Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \ + -Dmessaging.broker.username=alfresco \ + -Dmessaging.broker.password=alfresco \ + -Dtransform.service.enabled=${beedk.rad.ats.enabled} \ + -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 \ + -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \ -Dlocal.transform.service.enabled=${beedk.rad.alts.enabled} \ - -DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \ - -Djodconverter.enabled=false -Dsystem.workflow.engine.activiti.enabled=true \ - -Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 -Dimg.url=http://${project.artifactId}-ate-aio:8090 -Dtika.url=http://${project.artifactId}-ate-aio:8090 -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \ - -Dindex.subsystem.name=${beedk.rad.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \ + -DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 \ + -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \ + -Djodconverter.enabled=false \ + -Dsystem.workflow.engine.activiti.enabled=false \ + -Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 \ + -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 \ + -Dimg.url=http://${project.artifactId}-ate-aio:8090 \ + -Dtika.url=http://${project.artifactId}-ate-aio:8090 \ + -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \ + -Dindex.subsystem.name=${beedk.rad.platform.index} \ + -Dsolr.host=${project.artifactId}-acs-search \ + -Dsolr.secureComms=secret \ + -Dsolr.sharedSecret=alfresco-secret \ ${acs-platform.tomcat.opts} @@ -151,6 +179,7 @@ ${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro ${beedk.deploy.platform.webDirectory}:/var/lib/tomcat/dev/web:ro ${beedk.deploy.platform.dataDirectory}:/tmp/alf_data:rw + ${basedir}/metadata.keystore:/tmp/metadata.keystore:ro @@ -266,7 +295,7 @@ 8000 - 23.2.0 + 7.4.0 1.3.2.1 12 5.18.4 diff --git a/beedk-acs-platform-self-it-tile/tile.xml b/beedk-acs-platform-self-it-tile/tile.xml index 9d50cdc..7ddffbf 100644 --- a/beedk-acs-platform-self-it-tile/tile.xml +++ b/beedk-acs-platform-self-it-tile/tile.xml @@ -99,6 +99,7 @@ 42.2.18 + ${alfresco.platform.version} ${project.build.warFile} @@ -106,7 +107,7 @@ ${project.build.extDirectory} - ${alfresco.platform.version} + ${alfresco.platform.war.version} diff --git a/beedk-acs-platform-self-rad-tile/tile.xml b/beedk-acs-platform-self-rad-tile/tile.xml index 9dfae12..4bee2f2 100644 --- a/beedk-acs-platform-self-rad-tile/tile.xml +++ b/beedk-acs-platform-self-rad-tile/tile.xml @@ -103,6 +103,7 @@ 42.2.18 + ${alfresco.platform.version} ${project.build.warFile} @@ -115,7 +116,7 @@ ${project.build.directory}/web-resources - ${alfresco.platform.version} + ${alfresco.platform.war.version} diff --git a/beedk-acs-platform-webapp-tile/tile.xml b/beedk-acs-platform-webapp-tile/tile.xml index 30c04bc..6816ef7 100644 --- a/beedk-acs-platform-webapp-tile/tile.xml +++ b/beedk-acs-platform-webapp-tile/tile.xml @@ -95,7 +95,8 @@ - ${alfresco.platform.version} + ${alfresco.platform.version} + ${alfresco.platform.war.version} diff --git a/beedk-acs-search-it-tile/tile.xml b/beedk-acs-search-it-tile/tile.xml index bda0af1..c93669d 100644 --- a/beedk-acs-search-it-tile/tile.xml +++ b/beedk-acs-search-it-tile/tile.xml @@ -42,7 +42,8 @@ ${project.artifactId}-acs-search 8983 alfresco - none + secret + -Dalfresco.secureComms.secret=alfresco-secret custom diff --git a/beedk-acs-search-rad-tile/tile.xml b/beedk-acs-search-rad-tile/tile.xml index 984d035..5c85003 100644 --- a/beedk-acs-search-rad-tile/tile.xml +++ b/beedk-acs-search-rad-tile/tile.xml @@ -49,7 +49,8 @@ ${project.artifactId}-acs-search 8983 alfresco - none + secret + -Dalfresco.secureComms.secret=alfresco-secret ${acs-search.port}:8983 diff --git a/beedk-acs-search-test-tile/tile.xml b/beedk-acs-search-test-tile/tile.xml index 5140d0c..db15ba5 100644 --- a/beedk-acs-search-test-tile/tile.xml +++ b/beedk-acs-search-test-tile/tile.xml @@ -28,7 +28,7 @@ - 2.0.8.1 + 2.0.11 diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml index 419e47e..3e0e4a4 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml @@ -16,8 +16,8 @@ 8 4.8.0 - 23.2.0 - 23.2.0.72 + 7.4.2 + 22.17 diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/pom.xml b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/pom.xml index 6d59c5a..260647f 100644 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/pom.xml +++ b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/pom.xml @@ -17,7 +17,7 @@ community - 23.2.0 + 7.4.2 ${dockerRegistryHost}