Merge pull request #15 from Bernardo-MG/release

Release
Bernardo-MG · Feb 12, 2023 · bed4ca1 · bed4ca1
2 parents 94f218f + ae48023
commit bed4ca1
Show file tree

Hide file tree

Showing 13 changed files with 194 additions and 164 deletions.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -7,13 +7,13 @@ on:
 jobs:
   github:
     name: Github
-    uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_github.yml@v1
+    uses: Bernardo-MG/github-workflow-maven/.github/workflows/deploy_github.yml@v1
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}
 
   ossrh:
     name: OSSRH
-    uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_signed.yml@v1
+    uses: Bernardo-MG/github-workflow-maven/.github/workflows/deploy_signed.yml@v1
     secrets:
       username: ${{ secrets.OSSRH_USERNAME }}
       password: ${{ secrets.OSSRH_TOKEN }}

diff --git a/.github/workflows/doc_deployment.yml b/.github/workflows/doc_deployment.yml
@@ -0,0 +1,30 @@
+name: Doc deployment
+
+on:
+  push:
+    branches:
+    - master
+    - develop
+
+jobs:
+  deploy_develop_docs:
+    name: Deploy docs for develop
+    uses: Bernardo-MG/github-workflow-maven/.github/workflows/deploy_site.yml@v1
+    with:
+      branch: develop
+      host: docs.bernardomg.com
+    secrets:
+      url: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }}
+      username: ${{ secrets.DEPLOY_DOCS_DEVELOP_USER }}
+      password: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }}
+
+  deploy_master_docs:
+    name: Deploy docs for master
+    uses: Bernardo-MG/github-workflow-maven/.github/workflows/deploy_site.yml@v1
+    with:
+      branch: master
+      host: docs.bernardomg.com
+    secrets:
+      url: ${{ secrets.DEPLOY_DOCS_SITE }}
+      username: ${{ secrets.DEPLOY_DOCS_USER }}
+      password: ${{ secrets.DEPLOY_DOCS_PASSWORD }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,32 +1,16 @@
-name: Tests and docs
+name: Tests
 
 on: [push, pull_request]
 
 jobs:
-  tests:
-    name: Tests
-    uses: Bernardo-MG/github-workflow/.github/workflows/maven_testing.yml@v1
-
-  deploy_develop_docs:
-    name: Deploy development docs
-    needs: tests
-    uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_site.yml@v1
+  tests_11:
+    name: Tests with JDK 11
+    uses: Bernardo-MG/github-workflow-maven/.github/workflows/testing.yml@v1
     with:
-      branch: develop
-      host: docs.bernardomg.com
-    secrets:
-      url: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }}
-      username: ${{ secrets.DEPLOY_DOCS_DEVELOP_USER }}
-      password: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }}
+      jdk: 11
 
-  deploy_docs:
-    name: Deploy docs
-    needs: tests
-    uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_site.yml@v1
+  tests_17:
+    name: Tests with JDK 17
+    uses: Bernardo-MG/github-workflow-maven/.github/workflows/testing.yml@v1
     with:
-      branch: master
-      host: docs.bernardomg.com
-    secrets:
-      url: ${{ secrets.DEPLOY_DOCS_SITE }}
-      username: ${{ secrets.DEPLOY_DOCS_USER }}
-      password: ${{ secrets.DEPLOY_DOCS_PASSWORD }}
+      jdk: 17
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
    <groupId>com.bernardomg.velocity</groupId>
    <artifactId>velocity-config-tool</artifactId>
-   <version>1.3.0</version>
+   <version>1.3.1</version>
    <packaging>jar</packaging>
 
    <name>Velocity config tool</name>
@@ -176,10 +176,6 @@
    <!-- ********************************************** -->
 
    <properties>
-      <!-- ============================================== -->
-      <!-- ================ JAVA VERSION ================ -->
-      <!-- ============================================== -->
-      <java.version>1.8</java.version>
       <!-- ============================================== -->
       <!-- =============== MANIFEST DATA ================ -->
       <!-- ============================================== -->
@@ -191,14 +187,19 @@
       <commons.lang3.version>3.11</commons.lang3.version>
       <commons.logging.version>1.2</commons.logging.version>
       <doxia.decoration.version>1.11.1</doxia.decoration.version>
-      <junit.jupiter.version>5.9.1</junit.jupiter.version>
-      <mockito.version>4.9.0</mockito.version>
+      <junit.jupiter.version>5.9.2</junit.jupiter.version>
+      <mockito.version>5.1.1</mockito.version>
       <plexus.version>3.3.0</plexus.version>
       <velocity.tools.version>3.1</velocity.tools.version>
       <!-- ============================================== -->
+      <!-- ============ PLUGIN CONFIGURATION ============ -->
+      <!-- ============================================== -->
+      <!-- Checkstyle customized rules file -->
+      <checkstyle.config.location>${project.basedir}/src/config/checkstyle/checkstyle-rules.xml</checkstyle.config.location>
+      <!-- ============================================== -->
       <!-- ================= MAVEN SITE ================= -->
       <!-- ============================================== -->
-      <site.skin.version>2.2.9</site.skin.version>
+      <site.skin.version>2.3.1</site.skin.version>
       <mavenURL>http://mvnrepository.com/artifact/com.bernardomg.velocity/velocity-config-tool</mavenURL>
    </properties>
 
@@ -343,27 +344,17 @@
 
    <reporting>
       <plugins>
-         <plugin>
-            <!-- Checkstyle -->
-            <!-- Checks that the source files comply with style standards -->
-            <!-- It is using a customized rules file -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <configuration>
-               <!-- The customized rules file -->
-               <configLocation>${project.basedir}/src/config/checkstyle/checkstyle-rules.xml</configLocation>
-            </configuration>
-         </plugin>
          <plugin>
             <!-- Javadoc -->
-            <!-- Generates the Javadocs -->
+            <!-- Generates the javadocs -->
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
                <links>
-                  <link>https://codehaus-plexus.github.io/plexus-utils/apidocs/</link>
-                  <link>https://velocity.apache.org/tools/devel/apidocs/</link>
+                  <link>http://www.antlr.org/api/Java/</link>
                </links>
+               <!-- Excludes generated code -->
+               <excludePackageNames>*.generated.*</excludePackageNames>
             </configuration>
          </plugin>
          <plugin>
@@ -376,6 +367,10 @@
                   <!-- The customized rules file -->
                   <ruleset>${project.basedir}/src/config/pmd/pmd-rules.xml</ruleset>
                </rulesets>
+               <excludes>
+                  <!-- Excludes generated code -->
+                  <exclude>**/generated/**/*</exclude>
+               </excludes>
             </configuration>
          </plugin>
       </plugins>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -73,5 +73,10 @@
             Updated dependencies.
          </action>
       </release>
+      <release version="1.3.1" date="2023-02-12" description="Updated JDK compatibility level">
+         <action dev="bmg" type="update">
+            Updated JDK compatibility level.
+         </action>
+      </release>
    </body>
 </document>
diff --git a/src/config/checkstyle/checkstyle-rules.xml b/src/config/checkstyle/checkstyle-rules.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+          "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!-- Checkstyle for running a checks suite based on Sun's Java style conventions -->