Merge remote-tracking branch 'origin/1.x'

ao-apps · Aug 18, 2023 · e4dee26 · e4dee26
2 parents 879e946 + 4755665
commit e4dee26
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,6 +18,10 @@ jobs:
         with:
           java-version: 17
           distribution: 'oracle'
+      - name: Setup Maven
+        uses: stCarolas/setup-maven@v.4.5
+        with:
+          maven-version: '3.9.4'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:

diff --git a/all b/all
diff --git a/bom b/bom
diff --git a/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view