Merge branch 'master' into issue-27782-Bundle-resource-needs-some-imp…

…rovements
dotCMS · Aug 31, 2024 · 1fbc66e · 1fbc66e
2 parents 914c301 + f9eb9a3
commit 1fbc66e
Show file tree

Hide file tree

Showing 68 changed files with 2,325 additions and 610 deletions.
diff --git a/.github/actions/core-cicd/notification/notify-slack/action.yaml b/.github/actions/core-cicd/notification/notify-slack/action.yaml
@@ -25,7 +25,7 @@ runs:
                 "type": "section",
                 "text": {
                   "type": "mrkdwn",
-                  "text": "${{ inputs.payload }}"
+                  "text": ${{ toJSON(inputs.payload) }}
                 }
               }
             ]

diff --git a/.github/workflows/cicd_comp_deployment-phase.yml b/.github/workflows/cicd_comp_deployment-phase.yml
@@ -164,7 +164,10 @@ jobs:
         uses: ./.github/actions/core-cicd/notification/notify-slack
         with:
           channel-id: "log-docker"
-          payload: "> :large_purple_circle: *Attention dotters:* Docker image built!\n \n>This automated script is happy to announce that a new *docker* image has been built for *${{ inputs.environment }}* with *tags:* [`${{ steps.docker_build.outputs.tags }}`] :docker:"
+          payload: |
+            > :large_purple_circle: *Attention dotters:* Docker image built!
+            >
+            > This automated script is happy to announce that a new *docker* image has been built for *${{ inputs.environment }}* with *tags:* [`${{ steps.docker_build.outputs.tags }}`] :docker:
           slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
 
       # Send Slack notification for CLI publication (if required)
@@ -173,7 +176,10 @@ jobs:
         uses: ./.github/actions/core-cicd/notification/notify-slack
         with:
           channel-id: "log-dotcli"
-          payload: "> :large_purple_circle: *Attention dotters:* dotCLI published!\n \n>This automated script is happy to announce that a new *_dotCLI_* version *tagged as:* [ `${{ steps.cli_publish.outputs.npm-package-version }}, ${{ steps.cli_publish.outputs.npm-package-version-tag }}` ] is now available on the `NPM` registry :package:!\n \n>`npm i -g @dotcms/dotcli@${{ steps.cli_publish.outputs.npm-package-version-tag }}`"
+          payload: |
+            > :large_purple_circle: *Attention dotters:* dotCLI published!
+            >
+            > This automated script is happy to announce that a new *_dotCLI_* version *tagged as:* [ `${{ steps.cli_publish.outputs.npm-package-version }}, ${{ steps.cli_publish.outputs.npm-package-version-tag }}` ] is now available on the `NPM` registry :package:!\n \n>`npm i -g @dotcms/dotcli@${{ steps.cli_publish.outputs.npm-package-version-tag }}`
           slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }} 
 
       # Send Slack notification for SDK publication (if required)          
@@ -182,6 +188,9 @@ jobs:
         uses: ./.github/actions/core-cicd/notification/notify-slack
         with:
           channel-id: "log-sdk-libs"
-          payload: "> :large_orange_circle: *Attention dotters:* SDK libs (Angular, Client, Experiments and React) published!\n \n>This automated script is happy to announce that a new *_SDK libs_* version *tagged as:* [ `${{ steps.sdks_publish.outputs.npm-package-version }}` ] is now available on the `NPM` registry :package:!"
+          payload: |
+            > :large_orange_circle: *Attention dotters:* SDK libs (Angular, Client, Experiments and React) published!
+            >
+            > This automated script is happy to announce that a new *_SDK libs_* version *tagged as:* [ `${{ steps.sdks_publish.outputs.npm-package-version }}` ] is now available on the `NPM` registry :package:!
           slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}         
 
diff --git a/.github/workflows/cicd_manual_publish-starter.yml b/.github/workflows/cicd_manual_publish-starter.yml
@@ -155,9 +155,13 @@ jobs:
     runs-on: ubuntu-20.04
     environment: trunk
     steps:
+      - uses: actions/checkout@v4
       - name: Slack Notification
         uses: ./.github/actions/core-cicd/notification/notify-slack
         with:
           channel-id: "log-sdk-libs"
-          payload: "> :large_green_circle: *Attention dotters:* a new Starter published!\n \n>This automated script is happy to announce that a new *_${{ env.STARTER_TYPE }}_* :package: `${{ needs.deploy-artifacts.outputs.filename }}` is now available on `ARTIFACTORY` :frog:!\n \n>:link:${{ needs.deploy-artifacts.outputs.url }}\n>*Changelog* \n>```${{ github.event.inputs.changelog }}```"
+          payload: |
+            > :large_green_circle: *Attention dotters:* a new Starter published!
+            >
+            > This automated script is happy to announce that a new *_${{ env.STARTER_TYPE }}_* :package: `${{ needs.deploy-artifacts.outputs.filename }}` is now available on `ARTIFACTORY` :frog:!\n \n>:link:${{ needs.deploy-artifacts.outputs.url }}\n>*Changelog* \n>```${{ github.event.inputs.changelog }}```
           slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}       
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -24,7 +24,7 @@
         <shedlock.version>4.33.0</shedlock.version>
         <glowroot.version>0.14.1</glowroot.version>
         <jackson.version>2.17.2</jackson.version>
-        <jersey.version>2.28</jersey.version>
+        <jersey.version>2.22.1</jersey.version>
         <graalvm.version>22.3.3</graalvm.version>
     </properties>
     <dependencyManagement>
@@ -84,6 +84,11 @@
               *****************************
             -->
 
+            <dependency>
+                <groupId>com.dotcms</groupId>
+                <artifactId>ant-tooling</artifactId>
+                <version>1.3.2</version>
+            </dependency>
             <dependency>
                 <groupId>com.dotcms.lib</groupId>
                 <artifactId>dot.aopalliance-repackaged</artifactId>
@@ -1132,7 +1137,7 @@
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
-                <version>2.1.1</version>
+                <version>2.0.1</version>
             </dependency>
 
             <!-- Rest API Documentation -->
@@ -1147,51 +1152,6 @@
                 <version>${swagger.version}</version>
             </dependency>
 
-            <!-- CDI Support -->
-
-            <dependency>
-                <groupId>org.jboss.weld.servlet</groupId>
-                <artifactId>weld-servlet-shaded</artifactId>
-                <version>3.1.9.Final</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.glassfish.hk2.external</groupId>
-                <artifactId>bean-validator</artifactId>
-                <version>2.5.0-b06</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>hk2-locator</artifactId>
-                <version>2.5.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-junit5</artifactId>
-                <version>2.0.2.Final</version>
-                <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.jboss.weld.se</groupId>
-                        <artifactId>weld-se-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.weld.se</groupId>
-                <artifactId>weld-se-shaded</artifactId>
-                <version>3.1.9.Final</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>jandex</artifactId>
-                <version>3.0.5</version>
-            </dependency>
 
             <!--
                  *****************************