Next major release

.gitattributes

@@ -0,0 +1,2 @@
+/mvnw text eol=lf
+*.cmd text eol=crlf

.github/actions/create-branches/action.yml

@@ -11,23 +11,23 @@ runs:
     - name: Create branches
       shell: bash
       run: |
-        git checkout ${{ env.BRANCH_NAME }}
-        
-        if [[ ${{ env.BRANCH_NAME }} == "master" ]]; then
-          git checkout -b "patch/${{ env.PATCH_VERSION }}"
-          ./.github/scripts/update-project-version.sh "patch/${{ env.PATCH_VERSION }}" "${{ env.PATCH_VERSION }}-patch" ${{ inputs.github-token }} ${{ github.repository }}
-        
-          git checkout -b "release/${{ env.VERSION }}" "patch/${{ env.PATCH_VERSION }}"
-        
-          ./.github/scripts/update-project-version.sh "release/${{ env.VERSION }}" "${{ env.VERSION }}-release" ${{ inputs.github-token }} ${{ github.repository }}
-          ./.github/scripts/update-project-version.sh "patch/${{ env.PATCH_VERSION }}" "${{ env.NEXT_PATCH_VERSION }}-snapshot" ${{ inputs.github-token }} ${{ github.repository }}
-          ./.github/scripts/update-project-version.sh ${{ env.BRANCH_NAME }} "${{ env.NEXT_MINOR_VERSION }}-snapshot" ${{ inputs.github-token }} ${{ github.repository }}
+        git checkout "$BRANCH_NAME"
+
+        if [[ "$BRANCH_NAME" == "master" ]]; then
+          git checkout -b "patch/$PATCH_VERSION"
+          ./.github/scripts/update-project-version.sh "patch/$PATCH_VERSION" "$PATCH_VERSION-patch" ${{ inputs.github-token }} ${{ github.repository }}
+
+          git checkout -b "release/$VERSION" "patch/$PATCH_VERSION"
+
+          ./.github/scripts/update-project-version.sh "release/$VERSION" "$VERSION-release" ${{ inputs.github-token }} ${{ github.repository }}
+          ./.github/scripts/update-project-version.sh "patch/$PATCH_VERSION" "$NEXT_PATCH_VERSION-snapshot" ${{ inputs.github-token }} ${{ github.repository }}
+          ./.github/scripts/update-project-version.sh "$BRANCH_NAME" "$NEXT_MINOR_VERSION-snapshot" ${{ inputs.github-token }} ${{ github.repository }}
         else
-          git checkout -b "release/${{ env.VERSION }}"
-        
-          ./.github/scripts/update-project-version.sh "release/${{ env.VERSION }}" "${{ env.VERSION }}-release" ${{ inputs.github-token }} ${{ github.repository }}
-          ./.github/scripts/update-project-version.sh ${{ env.BRANCH_NAME }} "${{ env.NEXT_PATCH_VERSION }}-snapshot" ${{ inputs.github-token }} ${{ github.repository }}
+          git checkout -b "release/$VERSION"
+
+          ./.github/scripts/update-project-version.sh "release/$VERSION" "$VERSION-release" ${{ inputs.github-token }} ${{ github.repository }}
+          ./.github/scripts/update-project-version.sh "$BRANCH_NAME" "$NEXT_PATCH_VERSION-snapshot" ${{ inputs.github-token }} ${{ github.repository }}
         fi
 
-        git tag -f ${{ github.event.release.tag_name }} "release/${{ env.VERSION }}"
+        git tag -f ${{ github.event.release.tag_name }} "release/$VERSION"
         git push --tags -f

.github/actions/execute-maven/action.yml

@@ -0,0 +1,41 @@
+name: Execute Maven
+description: Executes Maven commands
+inputs:
+  distribution:
+    description: 'The distribution of Java to use'
+    required: false
+    default: 'semeru'
+  java-version:
+    description: 'The version of Java to use'
+    required: false
+    default: '17'
+  architecture:
+    description: 'The architecture of the Java version'
+    required: false
+    default: 'x64'
+  maven-commands:
+    description: 'The Maven commands to run'
+    required: false
+    default: 'verify'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: '${{ inputs.distribution }}'
+        java-version: '${{ inputs.java-version }}'
+        architecture: '${{ inputs.architecture }}'
+
+    - name: Cache Maven packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven
+
+    - name: Execute Maven commands
+      shell: bash
+      run: ./mvnw --no-transfer-progress ${{ inputs.maven-commands }}

.github/actions/extract-branch/action.yml

@@ -7,10 +7,10 @@ runs:
     - name: Extract branch name
       shell: bash
       run: |
-        if [[ ${{ env.VERSION }} =~ ^[0-9]+\.[0-9]+\.0$ ]]; then
+        if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.0$ ]]; then
             BRANCH_NAME=master
         else
-            BRANCH_NAME="patch/${{ env.PATCH_VERSION }}"
+            BRANCH_NAME="patch/$PATCH_VERSION"
         fi
         echo "BRANCH_NAME=$BRANCH_NAME" >> "$GITHUB_ENV"
 

.github/actions/extract-version/action.yml

@@ -1,5 +1,5 @@
-name: Configure Git
-description: Adds the necessary configurations to Git
+name: Extract Version
+description: Extracts version information from the release tag
 
 runs:
   using: 'composite'

.github/actions/publish-package/action.yml

@@ -36,7 +36,7 @@ runs:
       uses: docker/setup-buildx-action@v3
 
     - name: Log into registry ${{ inputs.registry }}
-      uses: docker/login-action@v3.0.0
+      uses: docker/login-action@v3
       with:
         registry: ${{ inputs.registry }}
         username: ${{ github.actor }}
@@ -63,17 +63,18 @@ runs:
 #        tags:
 #        sep-tags: ','
 
-    - name: Build bootJar
-      uses: ./.github/actions/execute-gradle
+    - name: Build package
+      uses: ./.github/actions/execute-maven
       with:
-        gradle-commands: ':bootJar'
+        maven-commands: 'clean package -DskipTests'
 
     - name: Build and push Docker image
       id: build-and-push
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         push: 'true'
+        build-args: VERSION=${{ env.VERSION }}-release
         tags: |
           ${{ inputs.registry }}/${{ inputs.image-name }}:${{ env.VERSION }}
           ${{ inputs.registry }}/${{ inputs.image-name }}:${{ env.LATEST_TAG }}

.github/actions/update-versions/action.yml

@@ -26,16 +26,16 @@ runs:
     - name: Replace version
       if: steps.get-files.outputs.exit_code == 0
       shell: bash
-      run: find ./src -type f -exec sed -i "s/%CURRENT_VERSION%/${{ env.VERSION }}/g" {} +
+      run: find ./src -type f -exec sed -i "s/%CURRENT_VERSION%/$VERSION/g" {} +
 
     - name: Commit and push changes
       if: steps.get-files.outputs.exit_code == 0
       shell: bash
       run: |
-        git checkout ${{ env.BRANCH_NAME }}
+        git checkout "$BRANCH_NAME"
         git add ./src
-        git commit -m "release: Update version to ${{ env.VERSION }}"
-        git push https://x-access-token:${{ inputs.github-token }}@github.com/${{ github.repository }}.git ${{ env.BRANCH_NAME }}
+        git commit -m "release: Update version to $VERSION"
+        git push https://x-access-token:${{ inputs.github-token }}@github.com/${{ github.repository }}.git "$BRANCH_NAME"
 
     - name: Log change files
       shell: bash

.github/scripts/update-project-version.sh

@@ -7,9 +7,8 @@ echo -e "\n\e[32mUpdating project version to $2 in branch $1\e[0m\n"
 
 git checkout "$1"
 
-sed -i "s/version = \"[0-9.]*-[a-z]*\"/version = \"$2\"/" build.gradle.kts
-sed -i "s/ARG VERSION=[0-9.]*-[a-z]*/ARG VERSION=$2/" Dockerfile
+./mvnw --no-transfer-progress versions:set -DnewVersion="$2" -DgenerateBackupPoms=false
 
-git add build.gradle.kts Dockerfile
+git add pom.xml
 git commit -m "release: Update project version to $2"
-git push https://x-access-token:"$3"@github.com/"$4".git "$1"
+git push https://x-access-token:"$3"@github.com/"$4".git "$1"

.github/workflows/build-and-test.yml

@@ -15,9 +15,9 @@ jobs:
           submodules: recursive
 
       - name: Build
-        uses: ./.github/actions/execute-gradle
+        uses: ./.github/actions/execute-maven
         with:
-          gradle-commands: ':clean :assemble'
+          maven-commands: 'clean package -DskipTests'
 
   test:
     runs-on: ubuntu-latest
@@ -28,17 +28,17 @@ jobs:
           submodules: recursive
 
       - name: Test
-        uses: ./.github/actions/execute-gradle
+        uses: ./.github/actions/execute-maven
         with:
-          gradle-commands: ':clean :test --stacktrace'
+          maven-commands: 'clean test'
 
       - name: JaCoCo Coverage Report
         env:
-          report_path: build/jacoco/report.csv
+          report_path: target/site/jacoco/jacoco.csv
         run: |
           awk -F"," '{ instructions += $4 + $5; covered += $5; branches += $6 + $7; branches_covered +=$7 } END { print "Instructions covered:", covered"/"instructions, "--", 100*covered/instructions"%"; print "Branches covered:", branches_covered"/"branches, "--", 100*branches_covered/branches"%" }' $report_path
 
       - uses: actions/upload-artifact@v4
         with:
           name: test-and-coverage-reports
-          path: build/reports
+          path: target/surefire-reports

.github/workflows/release.yml

@@ -19,9 +19,9 @@ jobs:
           submodules: recursive
 
       - name: Build
-        uses: ./.github/actions/execute-gradle
+        uses: ./.github/actions/execute-maven
         with:
-          gradle-commands: 'build'
+          maven-commands: 'clean package -DskipTests'
 
       - name: Rollback release
         if: ${{ failure() || cancelled() }}
@@ -38,9 +38,9 @@ jobs:
           submodules: recursive
 
       - name: Test
-        uses: ./.github/actions/execute-gradle
+        uses: ./.github/actions/execute-maven
         with:
-          gradle-commands: 'test'
+          maven-commands: 'test'
 
       - name: Rollback release
         if: ${{ failure() || cancelled() }}

.gitignore

@@ -181,4 +181,17 @@ gradle-app.setting
 *.gz
 
 # Demo application data
-demo/
+demo/
+
+HELP.md
+target/
+.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+*.iml
+
+data/**
+
+amplicode.xml
+.env
+/.vscode/settings.json

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

Dockerfile

@@ -1,16 +1,16 @@
-FROM openjdk:17-alpine
+FROM eclipse-temurin:17
 MAINTAINER Roman Shishkin <romashkin.2001@yandex.ru>
 
 #Setting directories args
 ARG APP_DIR=web-app
-ARG VERSION=2.7.0-snapshot
+ARG VERSION
+ARG JAR_FILE=target/web-app-${VERSION}.jar
+ARG APP=app.jar
 
 #Copying application
 WORKDIR /$APP_DIR
-ARG JAR_FILE=build/libs/web-app-$VERSION.jar
-ARG APP=app.jar
 COPY $JAR_FILE $APP
 
 #Running application
 EXPOSE 8888
-ENTRYPOINT java $JAVA_OPTIONS -jar app.jar
+ENTRYPOINT java $JAVA_OPTIONS -jar app.jar