diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/pom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/pom.xml index 804e4e5..1c1cc7e 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/pom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/pom.xml @@ -42,7 +42,7 @@ io.repaint.maven tiles-maven-plugin - 2.40 + 2.44 true diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-webapp/pom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-webapp/pom.xml index fb0184d..2d816fe 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-webapp/pom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-webapp/pom.xml @@ -35,7 +35,7 @@ io.repaint.maven tiles-maven-plugin - 2.40 + 2.44 true 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 bdbb512..84b205e 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 @@ -12,14 +12,15 @@ ${shortname} ACS All-in-one Parent Project - 4.8.0 + 4.15.0 community - 7.4.2 - 22.17 + 26.1.0 + 26.1.0 UTF-8 - 8 - 8 + 11 + 11 + 11 diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/pom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/pom.xml index 86f19a0..e4eed99 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/pom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/pom.xml @@ -44,7 +44,7 @@ io.repaint.maven tiles-maven-plugin - 2.40 + 2.44 true diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-webapp/pom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-webapp/pom.xml index ea62e50..f5f5eaf 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-webapp/pom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-webapp/pom.xml @@ -35,7 +35,7 @@ io.repaint.maven tiles-maven-plugin - 2.40 + 2.44 true diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/tengine-A/pom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/tengine-A/pom.xml index bba8621..47f8562 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/tengine-A/pom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/tengine-A/pom.xml @@ -16,9 +16,8 @@ ${shortname} Alfresco T-Engine A - 2.3.6 - 2.3.5.RELEASE - 5.15.8 + 5.2.5 + 3.5.7 ${dockerRegistryHost} ${dockerImagePrefix}/${project.artifactId} @@ -53,7 +52,7 @@ io.repaint.maven tiles-maven-plugin - 2.40 + 2.44 true diff --git a/beedk-acs-platform-artifact-it-tile/tile.xml b/beedk-acs-platform-artifact-it-tile/tile.xml index 7235401..51a5f30 100644 --- a/beedk-acs-platform-artifact-it-tile/tile.xml +++ b/beedk-acs-platform-artifact-it-tile/tile.xml @@ -110,7 +110,7 @@ 42.2.18 - 3.9.0 + 3.10.0 ${project.build.warDirectory}/${alfresco.platform.war.artifactId}-${alfresco.platform.war.version}.war diff --git a/beedk-acs-platform-artifact-rad-tile/tile.xml b/beedk-acs-platform-artifact-rad-tile/tile.xml index 5776e04..faff3c3 100644 --- a/beedk-acs-platform-artifact-rad-tile/tile.xml +++ b/beedk-acs-platform-artifact-rad-tile/tile.xml @@ -115,7 +115,7 @@ 42.2.18 - 3.9.0 + 3.10.0 ${project.build.warDirectory}/${alfresco.platform.war.artifactId}-${alfresco.platform.war.version}.war diff --git a/beedk-acs-platform-it-tile/README.md b/beedk-acs-platform-it-tile/README.md index 7231d3e..601f5b4 100644 --- a/beedk-acs-platform-it-tile/README.md +++ b/beedk-acs-platform-it-tile/README.md @@ -72,7 +72,7 @@ The following properties are only intended to be defined by BeeDK components. | `beedk.deploy.acs-search.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-search-it-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-acs-search-it-tile) tile **AFTER** this tile. | | `beedk.deploy.alts.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-lts-it-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-acs-lts-it-tile) tile **AFTER** this tile. | | `beedk.deploy.ats.enabled` | | false | **Do not** set explicitly; just include the [`beedk-ats-it-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-ats-it-tile) tile **AFTER** this tile. | -| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). | +| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). | ### Other APIs diff --git a/beedk-acs-platform-it-tile/tile.xml b/beedk-acs-platform-it-tile/tile.xml index 3688f3c..5b4f8c9 100644 --- a/beedk-acs-platform-it-tile/tile.xml +++ b/beedk-acs-platform-it-tile/tile.xml @@ -383,9 +383,9 @@ 8081 - 12 - 5.18.4 - 2.3-tomcat9 + 15 + 6.1.8 + 2.3-tomcat11 1.0.0 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 fe2cd32..69c795e 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 @@ -12,11 +12,12 @@ UTF-8 - 8 - 8 + 11 + 11 + 11 - 4.8.0 - 7.4.2 + 4.15.0 + 26.1.0 @@ -46,7 +47,7 @@ io.repaint.maven tiles-maven-plugin - 2.40 + 2.44 true diff --git a/beedk-acs-platform-rad-tile/README.md b/beedk-acs-platform-rad-tile/README.md index 3c383ba..c540391 100644 --- a/beedk-acs-platform-rad-tile/README.md +++ b/beedk-acs-platform-rad-tile/README.md @@ -60,7 +60,7 @@ The following properties are intended to be exposed by inheriting Public API Mav | `acs-platform.timeout` | | 120000 | The time to wait for the startup to complete, in milliseconds. | | `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. | | `acs.license.directory` | | `${alfresco.license.directory}/acs` | The base path to search for an ACS license. | -| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). | +| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). | | `acs-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. | | `acs-activemq.version` | | *not important* | The version of Alfresco ActiveMQ to use in the integration testing infrastructure. | | `acs-api-explorer.war.groupId` | | `org.alfresco` | The API Explorer WAR Maven Group ID. | diff --git a/beedk-acs-platform-rad-tile/tile.xml b/beedk-acs-platform-rad-tile/tile.xml index bd03656..893a51d 100644 --- a/beedk-acs-platform-rad-tile/tile.xml +++ b/beedk-acs-platform-rad-tile/tile.xml @@ -328,12 +328,12 @@ 8000 - 7.4.0 - 1.3.2.1 - 12 - 5.18.4 - 2.3-tomcat9 - 3.9.0 + 26.1.0 + 3.4.1 + 15 + 6.1.8 + 2.3-tomcat11 + 3.10.0 1.0.0 diff --git a/beedk-acs-platform-self-it-tile/tile.xml b/beedk-acs-platform-self-it-tile/tile.xml index 16dd494..d289a13 100644 --- a/beedk-acs-platform-self-it-tile/tile.xml +++ b/beedk-acs-platform-self-it-tile/tile.xml @@ -100,7 +100,7 @@ 42.2.18 ${alfresco.platform.version} - 3.9.0 + 3.10.0 ${project.build.warFile} diff --git a/beedk-acs-platform-self-rad-tile/tile.xml b/beedk-acs-platform-self-rad-tile/tile.xml index fb7c882..791bd88 100644 --- a/beedk-acs-platform-self-rad-tile/tile.xml +++ b/beedk-acs-platform-self-rad-tile/tile.xml @@ -104,7 +104,7 @@ 42.2.18 ${alfresco.platform.version} - 3.9.0 + 3.10.0 ${project.build.warFile} diff --git a/beedk-acs-share-artifact-rad-tile/tile.xml b/beedk-acs-share-artifact-rad-tile/tile.xml index a0530e2..5c69832 100644 --- a/beedk-acs-share-artifact-rad-tile/tile.xml +++ b/beedk-acs-share-artifact-rad-tile/tile.xml @@ -74,7 +74,7 @@ ${project.build.directory}/ext/share - 3.9.0 + 3.10.0 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 5ec92f1..cf9b8d4 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 @@ -12,12 +12,13 @@ UTF-8 - 8 - 8 + 11 + 11 + 11 - 4.8.0 - 7.4.2 - 22.17 + 4.15.0 + 26.1.0 + 26.1.0 @@ -49,7 +50,7 @@ io.repaint.maven tiles-maven-plugin - 2.40 + 2.44 true diff --git a/beedk-acs-share-rad-tile/README.md b/beedk-acs-share-rad-tile/README.md index 6a22f2b..166752d 100644 --- a/beedk-acs-share-rad-tile/README.md +++ b/beedk-acs-share-rad-tile/README.md @@ -56,7 +56,7 @@ The following properties are intended to be exposed by inheriting Public API Mav | `acs-share.debugger.port` | | 8100 | The port to expose on `localhost` for the developer; not for other applications or users. | | `acs-share.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.
*May be overridden by any POM parent or Maven Tile.* | | `acs-share.timeout` | | 30000 | The time to wait for the startup to complete, in milliseconds. | -| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). | +| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). | ### Private API diff --git a/beedk-acs-share-rad-tile/tile.xml b/beedk-acs-share-rad-tile/tile.xml index bf3eca3..07771ae 100644 --- a/beedk-acs-share-rad-tile/tile.xml +++ b/beedk-acs-share-rad-tile/tile.xml @@ -197,7 +197,7 @@ 8100 - 2.3-tomcat9 + 2.3-tomcat11 1.13.0 1.0.0 diff --git a/beedk-acs-share-self-it-tile/README.md b/beedk-acs-share-self-it-tile/README.md index cc43045..64479e4 100644 --- a/beedk-acs-share-self-it-tile/README.md +++ b/beedk-acs-share-self-it-tile/README.md @@ -55,7 +55,7 @@ The following properties are intended to be exposed by inheriting Public API Mav | `acs-platform.url` | | *See Below* | The URL of the backend ACS Platform to be used. | | `acs-share.port` | | 8180 | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. | | `acs-share.timeout` | | 45000 | The time to wait for the startup to complete, in milliseconds. | -| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). | +| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). | * The `alfresco.share.version` is used to default the `alfresco.war.version`. It is expected to be used by other Maven Tiles, so it is here for convenience. You must specify either property for this tile to function. * The `acs-platform.url` will default to the appropriate value when using the `beedk-acs-platform-*-it-tile` tiles. This should be overridden if you are not using those tiles and are instead using some other ACS Platform instance. diff --git a/beedk-acs-share-self-it-tile/tile.xml b/beedk-acs-share-self-it-tile/tile.xml index 948a157..e87f961 100644 --- a/beedk-acs-share-self-it-tile/tile.xml +++ b/beedk-acs-share-self-it-tile/tile.xml @@ -168,8 +168,8 @@ 8180 - 2.3-tomcat9 - 3.9.0 + 2.3-tomcat11 + 3.10.0 1.13.0 diff --git a/beedk-acs-share-self-rad-tile/tile.xml b/beedk-acs-share-self-rad-tile/tile.xml index 2dac0e1..3546941 100644 --- a/beedk-acs-share-self-rad-tile/tile.xml +++ b/beedk-acs-share-self-rad-tile/tile.xml @@ -71,7 +71,7 @@ ${alfresco.share.version} - 3.9.0 + 3.10.0 diff --git a/beedk-acs-share-webapp-docker-tile/tile.xml b/beedk-acs-share-webapp-docker-tile/tile.xml index ec93efb..5d501b3 100644 --- a/beedk-acs-share-webapp-docker-tile/tile.xml +++ b/beedk-acs-share-webapp-docker-tile/tile.xml @@ -82,7 +82,7 @@ - 3.9.0 + 3.10.0 diff --git a/beedk-acs-webapp-artifact-build-tile/tile.xml b/beedk-acs-webapp-artifact-build-tile/tile.xml index e861bd8..c8bd232 100644 --- a/beedk-acs-webapp-artifact-build-tile/tile.xml +++ b/beedk-acs-webapp-artifact-build-tile/tile.xml @@ -74,7 +74,7 @@ ${project.build.directory}/amps - 3.9.0 + 3.10.0 diff --git a/beedk-acs-webapp-artifact-it-tile/tile.xml b/beedk-acs-webapp-artifact-it-tile/tile.xml index fdabafd..b3ee045 100644 --- a/beedk-acs-webapp-artifact-it-tile/tile.xml +++ b/beedk-acs-webapp-artifact-it-tile/tile.xml @@ -78,7 +78,7 @@ pre-integration-test - 3.9.0 + 3.10.0 diff --git a/beedk-acs-webapp-artifact-rad-tile/tile.xml b/beedk-acs-webapp-artifact-rad-tile/tile.xml index 7a5b3dd..ba83215 100644 --- a/beedk-acs-webapp-artifact-rad-tile/tile.xml +++ b/beedk-acs-webapp-artifact-rad-tile/tile.xml @@ -86,7 +86,7 @@ ${project.build.directory}/amps - 3.9.0 + 3.10.0 diff --git a/beedk-acs-webapp-artifact-tile/tile.xml b/beedk-acs-webapp-artifact-tile/tile.xml index c2067f5..7ee8c6a 100644 --- a/beedk-acs-webapp-artifact-tile/tile.xml +++ b/beedk-acs-webapp-artifact-tile/tile.xml @@ -68,7 +68,7 @@ ${project.build.warDirectory}/${alfresco.war.artifactId}-${alfresco.war.version}.war - 3.9.0 + 3.10.0 diff --git a/beedk-acs-webapp-docker-tile/tile.xml b/beedk-acs-webapp-docker-tile/tile.xml index c7ecac8..7a573df 100644 --- a/beedk-acs-webapp-docker-tile/tile.xml +++ b/beedk-acs-webapp-docker-tile/tile.xml @@ -118,7 +118,7 @@ 3.6.1 - 3.9.0 + 3.10.0 diff --git a/beedk-amp-check-tile/tile.xml b/beedk-amp-check-tile/tile.xml index 0d43c46..7573e6d 100644 --- a/beedk-amp-check-tile/tile.xml +++ b/beedk-amp-check-tile/tile.xml @@ -140,7 +140,7 @@ - 3.9.0 + 3.10.0 1.0.7 diff --git a/beedk-aps-ext-it-tile/README.md b/beedk-aps-ext-it-tile/README.md index 3a54f1a..ca48aa1 100644 --- a/beedk-aps-ext-it-tile/README.md +++ b/beedk-aps-ext-it-tile/README.md @@ -57,7 +57,7 @@ The following properties are intended to be exposed by inheriting Public API Mav | `aps.timeout` | | 120000 | The time to wait for the startup to complete, in milliseconds. | | `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. | | `aps.license.directory` | | `${alfresco.license.directory}/aps` | The base path to search for an APS license. | -| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). | +| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). | | `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. | ### Private API diff --git a/beedk-aps-ext-it-tile/tile.xml b/beedk-aps-ext-it-tile/tile.xml index 2c0660f..409b8ca 100644 --- a/beedk-aps-ext-it-tile/tile.xml +++ b/beedk-aps-ext-it-tile/tile.xml @@ -279,9 +279,9 @@ 15 - 25.1.1 - 2.3-tomcat10 - 3.9.0 + 26.1.0 + 2.3-tomcat11 + 3.10.0 1.0.0 diff --git a/beedk-aps-ext-rad-tile/README.md b/beedk-aps-ext-rad-tile/README.md index 93d4c16..c7149ee 100644 --- a/beedk-aps-ext-rad-tile/README.md +++ b/beedk-aps-ext-rad-tile/README.md @@ -61,7 +61,7 @@ The following properties are intended to be exposed by inheriting Public API Mav | `aps.timeout` | | 120000 | The time to wait for the startup to complete, in milliseconds. | | `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. | | `aps.license.directory` | | `${alfresco.license.directory}/aps` | The base path to search for an APS license. | -| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). | +| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). | | `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. | ### Private API diff --git a/beedk-aps-ext-rad-tile/tile.xml b/beedk-aps-ext-rad-tile/tile.xml index 1de63c0..8b45c75 100644 --- a/beedk-aps-ext-rad-tile/tile.xml +++ b/beedk-aps-ext-rad-tile/tile.xml @@ -267,9 +267,9 @@ 15 - 25.1.1 - 2.3-tomcat10 - 3.9.0 + 26.1.0 + 2.3-tomcat11 + 3.10.0 1.0.0 diff --git a/beedk-ate-archetype/src/main/resources/archetype-resources/pom.xml b/beedk-ate-archetype/src/main/resources/archetype-resources/pom.xml index a8c905d..f98eb71 100644 --- a/beedk-ate-archetype/src/main/resources/archetype-resources/pom.xml +++ b/beedk-ate-archetype/src/main/resources/archetype-resources/pom.xml @@ -13,11 +13,12 @@ UTF-8 - 8 - 8 + 11 + 11 + 11 - 2.3.6 - 2.3.5.RELEASE + 5.2.5 + 3.5.7 ${package}.Applicatoin ${dockerRegistryHost} @@ -53,7 +54,7 @@ io.repaint.maven tiles-maven-plugin - 2.40 + 2.44 true diff --git a/beedk-ate-self-rad-tile/tile.xml b/beedk-ate-self-rad-tile/tile.xml index da7fbac..b223262 100644 --- a/beedk-ate-self-rad-tile/tile.xml +++ b/beedk-ate-self-rad-tile/tile.xml @@ -123,7 +123,7 @@ 11.0.11-1.4.1 - 3.9.0 + 3.10.0 diff --git a/beedk-run-tile/tile.xml b/beedk-run-tile/tile.xml index e0110cd..930982d 100644 --- a/beedk-run-tile/tile.xml +++ b/beedk-run-tile/tile.xml @@ -43,7 +43,7 @@ - 0.46.0 + 0.48.0 diff --git a/beedk-springboot-api-archetype/.gitignore b/beedk-springboot-api-archetype/.gitignore deleted file mode 100644 index 5de9fc3..0000000 --- a/beedk-springboot-api-archetype/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# Maven -/target -pom.xml.versionsBackup - -# Eclipse -.settings -.project -.classpath - diff --git a/beedk-springboot-api-archetype/pom.xml b/beedk-springboot-api-archetype/pom.xml deleted file mode 100644 index c40a725..0000000 --- a/beedk-springboot-api-archetype/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - beedk-springboot-api-archetype - maven-archetype - - - com.inteligr8.ootbee - beedk-parent - 1.1.19 - .. - - - Order of the Bee Development Kit: Project Scaffolding for a Spring Boot application using ACS/API remote APIs - https://git.inteligr8.com/inteligr8/ootbee-beedk - - - - GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007 - https://www.gnu.org/licenses/lgpl-3.0.txt - - - - - scm:git:https://git.inteligr8.com/inteligr8/ootbee-beedk.git - scm:git:git@git.inteligr8.com:inteligr8/ootbee-beedk.git - https://git.inteligr8.com/inteligr8/ootbee-beedk - - - Order of the Bee - https://orderofthebee.net - - - - brian.long - Brian Long - brian@inteligr8.com - Inteligr8 - https://www.inteligr8.com - https://twitter.com/brianmlong - - - - - - - org.apache.maven.archetype - archetype-packaging - ${archetype-packaging.version} - - - - diff --git a/beedk-springboot-api-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/beedk-springboot-api-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 3d520ae..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - [A-Za-z0-9]+ - - - quay.io - - - local - - - [1.0.0,2.0.0) - - - - - src/main/java - - **/* - - - - src/test/java - - **/* - - - - src - - main/java/**/* - test/java/**/* - - - - \ No newline at end of file diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/.gitignore b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/.gitignore deleted file mode 100644 index 5de9fc3..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# Maven -/target -pom.xml.versionsBackup - -# Eclipse -.settings -.project -.classpath - 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 deleted file mode 100644 index 05eee3f..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - 4.0.0 - - ${groupId} - ${artifactId} - ${version} - jar - - ${shortname} - - - UTF-8 - 11 - 5.0.0 - - - community - 7.4.2 - - - ${dockerRegistryHost} - ${dockerImagePrefix}/${project.artifactId} - ${project.version} - - - - - - org.alfresco - alfresco-java-rest-api-spring-boot-starter - ${alfresco.restapi.version} - - - - org.alfresco - alfresco-java-event-api-spring-boot-starter - ${alfresco.restapi.version} - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.40 - true - - - - com.inteligr8.ootbee:beedk-acs-platform-artifact-rad-tile:${beedkVersion} - - com.inteligr8.ootbee:beedk-springboot-docker-tile:${beedkVersion} - - - - - - - - - alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public - - - \ No newline at end of file diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile deleted file mode 100644 index b2b4625..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ - -FROM docker.inteligr8.com/inteligr8/ubuntu-jdk:20.04-11 - -# Set default user information -ARG JAR_FILE=target/${env.project_artifactId}-${env.project_version}.jar -ARG APPGROUPNAME=alfresco -ARG APPGROUPID=1000 -ARG APPUSERNAME=atengine -ARG APPUSERID=33001 - -ENV JAVA_OPTS="-Xmx128m" -ENV JAR_PATH=/usr/local/bin/${env.project_artifactId}-${env.project_version}.jar - -COPY ${JAR_FILE} ${JAR_PATH} - -# Install your engine's dependencies here -#RUN apt update && \ -# apt -y install {dependency names in APT repository} - -RUN groupadd -g ${APPGROUPID} ${APPGROUPNAME} && \ - useradd -u ${APPUSERID} -G ${APPGROUPNAME} ${APPUSERNAME} && \ - chown ${APPUSERNAME}:${APPGROUPNAME} ${JAR_PATH} - -USER ${APPUSERNAME} - -ENTRYPOINT java ${JAVA_OPTS} -jar ${JAR_PATH} diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/java/Application.java b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/java/Application.java deleted file mode 100644 index 4573893..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/java/Application.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package ${package}; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.context.event.ApplicationReadyEvent; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ImportResource; -import org.springframework.context.event.EventListener; - -import io.micrometer.core.instrument.MeterRegistry; - -@SpringBootApplication -@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class }) -@ImportResource({"classpath*:application-context.xml"}) -public class Application { - - private final Logger logger = LoggerFactory.getLogger(Application.class); - - @Value("${container.name}") - private String containerName; - - @Bean - public MeterRegistryCustomizer metricsCommonTags() { - return registry -> registry.config().commonTags("containerName", this.containerName); - } - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - - @EventListener(ApplicationReadyEvent.class) - public void startup() { - this.logger.info("Starting application components... Done"); - } -} diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/resources/application-context.xml b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/resources/application-context.xml deleted file mode 100644 index 863c2e5..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/resources/application-context.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/resources/application-default.yaml b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/resources/application-default.yaml deleted file mode 100644 index ed608e8..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/main/resources/application-default.yaml +++ /dev/null @@ -1,5 +0,0 @@ -#set( $dollar = '$' ) - -logging: - level: - ${groupId}: ${dollar}{LOG_LEVEL:info} diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/java/HttpRequestIT.java b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/java/HttpRequestIT.java deleted file mode 100644 index 7bf7fc7..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/java/HttpRequestIT.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package ${groupId}; - -import java.util.HashSet; -import java.util.Set; - -import javax.annotation.PostConstruct; - -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; -import org.junit.Assert; -import org.junit.Test; -import org.junit.Ignore; -import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.web.client.HttpStatusCodeException; - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class HttpRequestIT { - - private final Logger logger = LoggerFactory.getLogger(HttpRequestIT.class); - - @LocalServerPort - private int port; - - @Autowired - private TestRestTemplate restTemplate; - - protected String baseUrl; - - @PostConstruct - public void init() { - this.baseUrl = "http://localhost:" + this.port; - } - - @Test - public void testRootPath() { - String result = this.restTemplate.getForObject(this.baseUrl, String.class); - if (this.logger.isDebugEnabled()) - this.logger.debug("testRootPath(): result: " + result); - - Assert.assertNotNull("A result from the HTTP GET was expected", result); - Document htmldoc = Jsoup.parse(result); - Assert.assertNotNull("An HTML compliant result was expected: " + result.substring(0, 50), htmldoc); - - Elements elements = htmldoc.select("html body h2"); - Assert.assertFalse("The HTML body is expected to have an h2 element: html: " + htmldoc.toString(), elements.isEmpty()); - Assert.assertEquals("The HTML body is expected to have just one h2 element", 1, elements.size()); - Assert.assertEquals("The HTML body header is not what was expected", "${shortname} Test Transformation", elements.html()); - - elements = htmldoc.select("html input"); - Set inputs = new HashSet(); - for (Element element : elements) - inputs.add(element.attr("name")); - Assert.assertTrue("The HTML is expected to have a form input for 'file': " + inputs.toString(), inputs.contains("file")); - Assert.assertTrue("The HTML is expected to have a form input for 'targetExtension': " + inputs.toString(), inputs.contains("targetExtension")); - } - - @Test - public void testLogPath() { - String result = this.restTemplate.getForObject(this.baseUrl + "/log", String.class); - if (this.logger.isDebugEnabled()) - this.logger.debug("testLogPath(): result: " + result); - - Assert.assertNotNull("A result from the HTTP GET was expected", result); - Document htmldoc = Jsoup.parse(result); - Assert.assertNotNull("An HTML compliant result was expected: " + result.substring(0, 50), htmldoc); - - Elements elements = htmldoc.select("html body div h2"); - Assert.assertFalse("The HTML is expected to have an html/body/div/h2 element: html: " + htmldoc.select("html").toString(), elements.isEmpty()); - Assert.assertEquals("The HTML is expected to have just one html/body/div/h2 element", 1, elements.size()); - Assert.assertEquals("The HTML body header is not what was expected", "${shortname} Log Entries", elements.html()); - } - - @Test - public void testNoPath() { - try { - ResponseEntity response = this.restTemplate.getForEntity(this.baseUrl + "/doesnotexist", String.class); - Assert.assertEquals("An unexpected path must return a 404 error", 404, response.getStatusCodeValue()); - } catch (HttpStatusCodeException hsce) { - Assert.assertEquals("An unexpected path must return a 404 error", 404, hsce.getRawStatusCode()); - } - } - - @Test - public void testServiceGet() { - try { - ResponseEntity response = this.restTemplate.getForEntity(this.baseUrl + "/transform", String.class); - Assert.assertEquals("An unexpected path must return a 405 error", 405, response.getStatusCodeValue()); - } catch (HttpStatusCodeException hsce) { - Assert.assertEquals("An unexpected path must return a 405 error", 405, hsce.getRawStatusCode()); - } - } - - @Test - public void testServiceNoFile() { - try { - ResponseEntity response = this._testService(null, "trgt"); - Assert.assertEquals("An unexpected path must return a 400 error", 400, response.getStatusCodeValue()); - } catch (HttpStatusCodeException hsce) { - Assert.assertEquals("An unexpected path must return a 400 error", 400, hsce.getRawStatusCode()); - } - } - - @Test @Ignore - public void testServiceNoTargetExtension() { - try { - ResponseEntity response = this._testService("quick.src", null); - Assert.assertEquals("An unexpected path must return a 400 error", 400, response.getStatusCodeValue()); - } catch (HttpStatusCodeException hsce) { - Assert.assertEquals("An unexpected path must return a 400 error", 400, hsce.getRawStatusCode()); - } - } - - @Test @Ignore - public void testServiceQuick() { - this._testService("quick.src", "trgt"); - } - - protected ResponseEntity _testService(String filename, String targetExtension) { - LinkedMultiValueMap parameters = new LinkedMultiValueMap<>(); - if (filename != null) - parameters.add("file", new ClassPathResource(filename)); - if (targetExtension != null) - parameters.add("targetExtension", targetExtension); - - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.MULTIPART_FORM_DATA); - HttpEntity> entity = new HttpEntity<>(parameters, headers); - return this.restTemplate.postForEntity(this.baseUrl + "/transform", entity, String.class); - } - -} diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/java/TransformerControllerTest.java b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/java/TransformerControllerTest.java deleted file mode 100644 index 995c3cf..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/java/TransformerControllerTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package ${groupId}; - -import org.alfresco.transformer.AbstractTransformerController; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@WebMvcTest(controllers = TransformerController.class) -public class TransformerControllerTest { - - @Autowired - protected AbstractTransformerController controller; - - @Test @Ignore - public void test() { - - } -} diff --git a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/resources/application-default.yaml b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/resources/application-default.yaml deleted file mode 100644 index 316190d..0000000 --- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/src/test/resources/application-default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -queue: -#set( $dollar = '$' ) - engineRequestQueue: ${dollar}{TRANSFORM_ENGINE_REQUEST_QUEUE:${groupId}.${shortname}.acs} - -transform: - core: - config: - location: classpath:this_engine_config.json - ${shortname}: - version: ${project.version} - -logging: - level: - ${groupId}: ${dollar}{LOG_LEVEL:trace} diff --git a/pom.xml b/pom.xml index 39fcde0..59f591a 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ UTF-8 - 2.40 + 2.44 3.1.1 @@ -125,7 +125,6 @@ beedk-acs-share-module-archetype beedk-ate-archetype beedk-acs-allinone-archetype - beedk-springboot-api-archetype beedk-activiti-ext-archetype beedk-aps-ext-archetype