Merge branch 'pomconfig' into develop

olyutorskii · Oct 4, 2023 · 7e048f9 · 7e048f9
2 parents 481b880 + 95598ca
commit 7e048f9
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 82 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -19,48 +19,36 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 11, 17, 20 ]
     name: Java ${{ matrix.java }} building
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v4
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Cache Maven packages
-      uses: actions/cache@v3
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Build with Maven
-      run: mvn --show-version -B package --file pom.xml
+      run: mvn --show-version --batch-mode -Dshow=private package site --file pom.xml
+
 
+  build8:
 
-  buildSite:
+    needs: build
 
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        java: [ 11, 17 ]
-    name: Java ${{ matrix.java }} siting
+    name: Java 8 building
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v4
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        distribution: 'adopt'
-        java-version: ${{ matrix.java }}
-    - name: Cache Maven packages
-      uses: actions/cache@v3
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        distribution: 'temurin'
+        java-version: '8'
+        cache: 'maven'
     - name: Build with Maven
-      run: mvn --show-version -B site --file pom.xml
-
+      run: mvn --show-version --batch-mode package --file pom.xml
 
 ### EOF ###
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -28,35 +28,29 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
 
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 17
+          cache: 'maven'
 
       - name: Setup Pages
-        uses: actions/configure-pages@v2
-
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+        uses: actions/configure-pages@v3
 
       - name: Build document with Maven
-        run: mvn --show-version -B site --file pom.xml
+        run: mvn --show-version --batch-mode site --file pom.xml
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           # Upload Maven-report repository
           path: './target/site/'
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v2
 
 ### EOF ###
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@
 *.swp
 *.orig
 # core
+*.log
 
 
 ### macOS
@@ -30,6 +31,7 @@ Thumbs.db
 
 ### JDK
 
+*.class
 hs_err_pid*
 
 
@@ -69,9 +71,25 @@ hs_err_pid*
 *.ipr
 
 
+### BlueJ files
+
+*.ctxt
+
+
 ### Visual Studio Code
 
 /.vscode/
 
 
+### Package Files
+
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+
 ### EOF ###
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -6,7 +6,7 @@
 
 <!--
     Checkstyle modules
-    for Checkstyle 8.45 or later
+    for Checkstyle 10.10.0 or later
 
     [ https://checkstyle.org/ ]
 
@@ -30,6 +30,7 @@
     <!--module name="SuppressionFilter" /-->
     <!--module name="SuppressionSingleFilter" /-->
     <module name="SuppressWarningsFilter" />
+    <module name="SuppressWithNearbyTextFilter" />
     <module name="SuppressWithPlainTextCommentFilter" />
 
 

diff --git a/config/pmd/pmdrules.xml b/config/pmd/pmdrules.xml
@@ -60,7 +60,7 @@
 
     <rule ref="category/java/errorprone.xml" >
         <exclude name="AvoidLiteralsInIfCondition" />
-        <exclude name="BeanMembersShouldSerialize" />
+        <exclude name="NonSerializableClass" />
     </rule>
 
     <rule ref="category/java/multithreading.xml" />