chore(cli): Implement gha generate cli release

.github/workflows/cli-release-process.yml

@@ -5,26 +5,143 @@ on:
       version:
         description: 'Release version'
         required: true
-      next:
-        description: 'Next version'
+      skipTests:
+        description: 'Skip tests'
+        default: true
+        required: false
+      packageType:
+        description: 'Package type'
+        default: 'uber-jar'
         required: false
 
 defaults:
   run:
     shell: bash
 
+env:
+  JAVA_VERSION: 11
+  JAVA_DISTRO: temurin
+  NEXT_VERSION: '1.0.0-SNAPSHOT'
+
 jobs:
   precheck:
     name: Pre-check
     runs-on: ubuntu-latest
     outputs:
-      RELEASE_VERSION: ${{ steps.vars.outputs.RELEASE_VERSION }}
-      NEXT_VERSION: ${{ steps.vars.outputs.NEXT_VERSION }}
+      RELEASE_VERSION: ${{ steps.version.outputs.RELEASE_VERSION }}
+      NEXT_VERSION: ${{ steps.version.outputs.NEXT_VERSION }}
+      HEAD: ${{ steps.version.outputs.HEAD }}
     steps:
-      - name: Print inputs
-        id: vars
+      - name: Log GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: ${{ env.JAVA_DISTRO }}
+
+      - name: Cache Maven
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Setup git config
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com" 
+
+      - name: Set release version
+        id: version
+        working-directory: ${{ github.workspace }}/tools/dotcms-cli
         run: |
           RELEASE_VERSION=${{ github.event.inputs.version }}
-          NEXT_VERSION=${{ github.event.inputs.next }}
-          echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
-          echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_OUTPUT
+          NEXT_VERSION=${{ env.NEXT_VERSION }}          
+          HEAD=${{ github.ref_name }}
+
+          ./mvnw -B -ntp versions:set versions:commit -DnewVersion=$RELEASE_VERSION
+
+          git commit --allow-empty -a -m "🏁 Releasing version $RELEASE_VERSION"
+          git push origin "$HEAD"
+
+          echo "RELEASE_VERSION=$RELEASE_VERSION" >> "$GITHUB_OUTPUT"
+          echo "NEXT_VERSION=$NEXT_VERSION" >> "$GITHUB_OUTPUT"
+          echo "HEAD=$HEAD" >> "$GITHUB_OUTPUT"
+
+  release:
+    needs: [ precheck ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ needs.precheck.outputs.HEAD }}
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: ${{ env.JAVA_DISTRO }}
+
+      - name: Cache Maven
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Prepare dotCMS license
+        env:
+          DOTCMS_LICENSE_KEY: ${{ secrets.DOTCMS_LICENSE }}
+        run: |
+          DOTCMS_LICENSE_PATH=${GITHUB_WORKSPACE}/tools/dotcms-cli/license
+          mkdir -p ${DOTCMS_LICENSE_PATH}
+          echo "${DOTCMS_LICENSE_KEY}" > ${DOTCMS_LICENSE_PATH}/license.dat
+          echo "DOTCMS_LICENSE_FILE=${DOTCMS_LICENSE_PATH}/license.dat" >> "$GITHUB_ENV"
+
+      - name: Build distribution
+        working-directory: ${{ github.workspace }}
+        run: |
+          ./mvnw clean install -Dtest.failure.ignore=true -DskipTests=${{ github.event.inputs.skipTests }} -am -pl :dotcms-cli
+
+      - name: Package distribution
+        working-directory: ${{ github.workspace }}
+        run: |
+          ./mvnw package -Dquarkus.package.type=${{ github.event.inputs.packageType }} -DskipTests=true -pl :dotcms-cli
+
+      - name: Releaser
+        env:
+          JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JRELEASER_PROJECT_VERSION: ${{ needs.precheck.outputs.VERSION }}
+          JRELEASER_ARTIFACTORY_USERNAME: ${{ secrets.EE_REPO_USERNAME }}
+          JRELEASER_ARTIFACTORY_PASSWORD: ${{ secrets.EE_REPO_PASSWORD }}
+          JRELEASER_SLACK_WEBHOOK: ${{ secrets.RELEASE_SLACK_WEBHOOK }}
+          JRELEASER_SLACK_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+        working-directory: ${{ github.workspace }}
+        run: |
+          tools/dotcms-cli/mvnw -B -Prelease jreleaser:full-release -Djreleaser.git.root.search=true -pl :dotcms-cli-parent -Dmaven.plugin.validation=VERBOSE         
+
+      - name: Setup git config
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com" 
+
+      - name: Set next version
+        working-directory: ${{ github.workspace }}/tools/dotcms-cli
+        run: |
+          RELEASE_VERSION=${{ needs.precheck.outputs.RELEASE_VERSION }}
+          NEXT_VERSION=${{ needs.precheck.outputs.NEXT_VERSION }}
+          HEAD=${{ needs.precheck.outputs.HEAD }}
+
+          ./mvnw -B -ntp versions:set versions:commit -DnewVersion=$NEXT_VERSION
+
+          git commit --allow-empty -a -m "⬆️  Next version $NEXT_VERSION"
+          git push origin "$HEAD"

core-web/apps/dotcms-ui/src/app/view/pipes/dot-pipes.module.ts

@@ -1,11 +1,9 @@
 import { NgModule } from '@angular/core';
 
-
-
 import { DotSafeHtmlPipe } from './dot-safe-html/dot-safe-html.pipe';
 
 @NgModule({
-    declarations: [ DotSafeHtmlPipe],
-    exports: [ DotSafeHtmlPipe]
+    declarations: [DotSafeHtmlPipe],
+    exports: [DotSafeHtmlPipe]
 })
 export class DotPipesModule {}

core-web/apps/dotcms-ui/src/app/view/pipes/index.ts

@@ -1,3 +1,2 @@
 export * from './dot-diff/dot-diff.pipe';
 export * from './dot-filter/dot-filter.pipe';
-

parent/pom.xml

@@ -653,6 +653,11 @@
                     <artifactId>jandex-maven-plugin</artifactId>
                     <version>1.2.3</version>
                 </plugin>
+                <plugin>
+                    <groupId>${quarkus.platform.group-id}</groupId>
+                    <artifactId>quarkus-maven-plugin</artifactId>
+                    <version>${quarkus.platform.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

tools/dotcms-cli/api-data-model/pom.xml

@@ -13,22 +13,18 @@
     <packaging>jar</packaging>
 
     <properties>
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
-        <failsafe.useModulePath>false</failsafe.useModulePath>
-        <maven.compiler.release>11</maven.compiler.release>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>2.9.1.Final</quarkus.platform.version>
         <testcontainers.version>1.17.6</testcontainers.version>
-        <failsafe-plugin.version>3.0.0-M5</failsafe-plugin.version>
         <test.failure.ignore>false</test.failure.ignore>
         <maven.plugin.jar.version>3.3.0</maven.plugin.jar.version>
+        <immutables.version>2.8.2</immutables.version>
+        <google.findbugs.version>3.0.2</google.findbugs.version>
+        <jackson.module.model.version>1.2.2</jackson.module.model.version>
+        <jackson.datatype.guava.version>2.13.3</jackson.datatype.guava.version>
         <docker.output.image.name>dotcms/dotcms-test</docker.output.image.name>
         <docker.version.tag>${project.version}</docker.version.tag>
         <testcontainers.docker.image>${docker.output.image.name}/${docker.version.tag}</testcontainers.docker.image>
     </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -40,6 +36,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -53,7 +50,7 @@
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
-            <version>2.8.2</version>
+            <version>${immutables.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -67,7 +64,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
+            <version>${google.findbugs.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -78,12 +75,18 @@
         <dependency>
             <groupId>com.github.jonpeterson</groupId>
             <artifactId>jackson-module-model-versioning</artifactId>
-            <version>1.2.2</version>
+            <version>${jackson.module.model.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-guava</artifactId>
-            <version>2.13.3</version>
+            <version>${jackson.datatype.guava.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -154,7 +157,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
                 <configuration>
                     <compilerArgs>
                         <arg>-parameters</arg>
@@ -165,7 +167,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${failsafe-plugin.version}</version>
                 <configuration>
                     <testFailureIgnore>${test.failure.ignore}</testFailureIgnore>
                 </configuration>

tools/dotcms-cli/cli/pom.xml

@@ -13,23 +13,15 @@
     <packaging>jar</packaging>
 
     <properties>
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
-        <failsafe.useModulePath>false</failsafe.useModulePath>
-        <maven.compiler.release>11</maven.compiler.release>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>2.9.1.Final</quarkus.platform.version>
-        <exec.maven.plugin.version>3.0.0</exec.maven.plugin.version>
         <picocli.codegen.version>4.6.3</picocli.codegen.version>
         <testcontainers.version>1.17.6</testcontainers.version>
-        <failsafe-plugin.version>3.0.0-M5</failsafe-plugin.version>
         <test.failure.ignore>false</test.failure.ignore>
         <docker.output.image.name>dotcms/dotcms-test</docker.output.image.name>
         <docker.version.tag>${project.version}</docker.version.tag>
         <testcontainers.docker.image>${docker.output.image.name}/${docker.version.tag}</testcontainers.docker.image>
+        <java.keytar.version>1.0.0</java.keytar.version>
     </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -41,6 +33,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>com.dotcms</groupId>
@@ -99,7 +92,7 @@
         <dependency>
             <groupId>com.starxg</groupId>
             <artifactId>java-keytar</artifactId>
-            <version>1.0.0</version>
+            <version>${java.keytar.version}</version>
         </dependency>
 
         <dependency>
@@ -133,7 +126,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
                 <configuration>
                     <compilerArgs>
                         <arg>-parameters</arg>
@@ -144,7 +136,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${failsafe-plugin.version}</version>
                 <configuration>
                     <testFailureIgnore>${test.failure.ignore}</testFailureIgnore>
                     <includes>
@@ -170,7 +161,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec.maven.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>generateManPages</id>
@@ -220,7 +210,6 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${surefire-plugin.version}</version>
                         <executions>
                             <execution>
                                 <goals>

tools/dotcms-cli/jreleaser.yml

@@ -20,8 +20,8 @@ project:
 
 release:
   github:
-    tagName: 'dotcli{{projectVersion}}'
-    releaseName: 'DOTCLI - {{projectVersion}}'
+    tagName: 'dotcms-cli{{projectVersion}}'
+    releaseName: 'dotcms-cli - {{projectVersion}}'
     overwrite: false
     changelog:
       formatted: ALWAYS
@@ -42,12 +42,21 @@ distributions:
     active: ALWAYS
     stereotype: CLI
     artifacts:
-      - path: tools/dotcms-cli/cli/target/cli-{{projectVersion}}-runner.jar
-        transform: tools/dotcms-cli/cli/target/dotcli-{{projectVersion}}.jar
-
-packagers:
-  brew:
-    active: ALWAYS
-    continueOnError: false
-    multiPlatform: true
+      - path: tools/dotcms-cli/cli/target/dotcms-cli-{{projectVersion}}-runner.jar
+        transform: tools/dotcms-cli/cli/target/dotcms-cli-{{projectVersion}}.jar
 
+upload:
+  artifactory:
+    dotcms-cli:
+      active: ALWAYS
+      authorization: BASIC
+      host: 'https://repo.dotcms.com/artifactory'
+      repositories:
+        - path: 'libs-snapshot-local/com/dotcms/{{projectName}}/{{projectVersion}}/{{artifactFile}}'
+          active: SNAPSHOT
+          fileTypes:
+            - JAR
+        - path: 'libs-release-local/com/dotcms/{{projectName}}/{{projectVersion}}/{{artifactFile}}'
+          active: RELEASE
+          fileTypes:
+            - JAR