Merge pull request #103 from Bernardo-MG/release

Release
Bernardo-MG · Feb 20, 2021 · 85e59e7 · 85e59e7
2 parents a3eb917 + 41de9e5
commit 85e59e7
Show file tree

Hide file tree

Showing 48 changed files with 354 additions and 340 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -15,17 +15,18 @@ jobs:
       shell: bash
       run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
       id: extract_branch
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Check-out
+      uses: actions/checkout@v2
+    - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Set up Maven settings
-      uses: bernardo-mg/deployment-maven-settings-action@master
+      uses: bernardo-mg/deployment-maven-settings-action@v1.1.2
       with:
         version-type: ${{ steps.extract_branch.outputs.branch }}
       env:
         DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
         DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}
     - name: Deploy
-      run: mvn deploy -B -P deployment --settings settings.xml
+      run: mvn deploy -B -P deployment,deployment-release --settings settings.xml
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
@@ -21,13 +21,14 @@ jobs:
       shell: bash
       run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
       id: extract_branch
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Check-out
+      uses: actions/checkout@v2
+    - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Set up Maven settings
-      uses: bernardo-mg/deployment-maven-settings-action@master
+      uses: bernardo-mg/deployment-maven-settings-action@v1.1.2
       with:
         version-type: ${{ steps.extract_branch.outputs.branch }}
       env:
@@ -37,5 +38,9 @@ jobs:
         DEPLOY_DOCS_DEVELOP_PASSWORD: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }}
         DEPLOY_DOCS_SITE: ${{ secrets.DEPLOY_DOCS_SITE }}
         DEPLOY_DOCS_DEVELOP_SITE: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }}
-    - name: Deploy docs
-      run: mvn site site:deploy -B -P deployment --settings settings.xml
+    - name: Deploy development docs
+      if: steps.extract_branch.outputs.branch == 'develop'
+      run: mvn site site:deploy -B -P deployment,deployment-development --settings settings.xml
+    - name: Deploy release docs
+      if: steps.extract_branch.outputs.branch == 'master'
+      run: mvn site site:deploy -B -P deployment,deployment-release --settings settings.xml
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -8,13 +8,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [ 8, 11, 14 ]
+        jdk: [ 11, 14 ]
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Check-out
+      uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.jdk }}
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.jdk }}
-    - name: Runs tests
+    - name: Run all tests
       run: mvn clean verify
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
    <parent>
       <groupId>com.bernardomg.maven</groupId>
       <artifactId>base-pom</artifactId>
-      <version>1.3.4</version>
+      <version>1.4.0</version>
    </parent>
 
    <!-- ********************************************** -->
@@ -20,7 +20,7 @@
 
    <groupId>com.bernardomg.tabletop</groupId>
    <artifactId>dice</artifactId>
-   <version>2.0.4</version>
+   <version>2.1.0</version>
    <packaging>jar</packaging>
 
    <name>Dice Notation Tools for Java</name>
@@ -53,8 +53,8 @@
    </issueManagement>
 
    <ciManagement>
-      <system>Travis CI</system>
-      <url>https://travis-ci.org/Bernardo-MG/dice-notation-java</url>
+      <system>Github workflow</system>
+      <url>https://github.com/bernardo-mg/dice-notation-java/actions</url>
       <notifiers />
    </ciManagement>
 
@@ -206,29 +206,33 @@
    <!-- ********************************************** -->
 
    <properties>
+      <!-- ============================================== -->
+      <!-- ================ JAVA VERSION ================ -->
+      <!-- ============================================== -->
+      <java.version>11</java.version>
       <!-- ============================================== -->
       <!-- =============== MANIFEST DATA ================ -->
       <!-- ============================================== -->
       <manifest.name>com/bernardomg/tabletop/dice</manifest.name>
       <!-- ============================================== -->
       <!-- =========== DEPENDENCIES VERSIONS ============ -->
       <!-- ============================================== -->
-      <antlr.version>4.7.2</antlr.version>
-      <guava.version>29.0-jre</guava.version>
-      <junit.jupiter.version>5.6.2</junit.jupiter.version>
-      <mockito.version>3.4.0</mockito.version>
-      <log4j.version>2.13.3</log4j.version>
-      <slf4j.version>1.7.28</slf4j.version>
+      <antlr.version>4.9.1</antlr.version>
+      <guava.version>30.1-jre</guava.version>
+      <junit.jupiter.version>5.7.1</junit.jupiter.version>
+      <mockito.version>3.7.7</mockito.version>
+      <log4j.version>2.14.0</log4j.version>
+      <slf4j.version>1.7.30</slf4j.version>
       <!-- ============================================== -->
       <!-- ============== PLUGINS VERSIONS ============== -->
       <!-- ============================================== -->
-      <plugin.antlr.version>4.7.2</plugin.antlr.version>
-      <plugin.antlr.test.version>1.11</plugin.antlr.test.version>
+      <plugin.antlr.version>4.9.1</plugin.antlr.version>
+      <plugin.antlr.test.version>1.17</plugin.antlr.test.version>
       <plugin.buildhelp.version>3.2.0</plugin.buildhelp.version>
       <!-- ============================================== -->
       <!-- ================= MAVEN SITE ================= -->
       <!-- ============================================== -->
-      <site.skin.version>2.0.8</site.skin.version>
+      <site.skin.version>2.0.11</site.skin.version>
       <bintrayURL>https://bintray.com/bernardo-mg/tabletop-toolkits/dice/view</bintrayURL>
       <mavenURL>http://mvnrepository.com/artifact/com.bernardomg.tabletop/dice</mavenURL>
    </properties>
@@ -454,16 +458,6 @@
 
    <reporting>
       <plugins>
-         <plugin>
-            <!-- FindBugs -->
-            <!-- Checks for patterns which are prone to errors -->
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>findbugs-maven-plugin</artifactId>
-            <configuration>
-               <!-- Exclusion patterns -->
-               <excludeFilterFile>${project.basedir}/src/config/findbugs/findbugs-exclude.xml</excludeFilterFile>
-            </configuration>
-         </plugin>
          <plugin>
             <!-- Checkstyle -->
             <!-- Checks that the source files comply with style standards -->
@@ -506,6 +500,14 @@
                </excludes>
             </configuration>
          </plugin>
+         <plugin>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-maven-plugin</artifactId>
+            <configuration>
+               <!-- Exclusion patterns -->
+               <excludeFilterFile>${project.basedir}/src/config/spotbugs/spotbugs-exclude.xml</excludeFilterFile>
+            </configuration>
+         </plugin>
       </plugins>
    </reporting>
 

diff --git a/readme.md b/readme.md
@@ -53,7 +53,7 @@ Documentation is also generated from the latest snapshot, taken from the 'develo
 The documentation site sources come along the source code (as it is a Maven site), so it is always possible to generate them using the following Maven command:
 
 ```
-$ mvn verify site
+mvn verify site
 ```
 
 The verify phase is required, as otherwise some of the reports won't be created.
@@ -73,7 +73,7 @@ The recommended way to install the project is by setting up your preferred depen
 If for some reason manual installation is necessary, just use the following Maven command:
 
 ```
-$ mvn install
+mvn install
 ```
 
 ### Usage example

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -132,5 +132,10 @@
             The parser's error listener is configurable.
          </action>
       </release>
+      <release version="2.1.0" date="2021-02-20" description="Dropped JDK 8">
+         <action dev="bmg" type="update">
+            Removed support for JDK 8.
+         </action>
+      </release>
    </body>
 </document>
diff --git a/src/config/findbugs/findbugs-exclude.xml → src/config/spotbugs/spotbugs-exclude.xml b/src/config/findbugs/findbugs-exclude.xml → src/config/spotbugs/spotbugs-exclude.xml
diff --git a/src/site/markdown/reports.md b/src/site/markdown/reports.md
@@ -13,7 +13,7 @@
 |Report|Description|
 |---|---|
 |[Checkstyle][checkstyle]|Report on coding style conventions.|
-|[FindBugs][findbugs]|Generates a source code report with the FindBugs Library.|
+|[SpotBugs][spotbugs]|Generates a source code report with the SpotBugs Library.|
 |[PMD][pmd]|Verification of coding rules.|
 |[CPD][cpd]|Duplicate code detection.|
 |[JDepend][jdepend]|Quality metrics for the project.|
@@ -40,11 +40,11 @@
 [dependencies]: ./dependencies.html
 [dependency-analysis]: ./dependency-analysis.html
 [failsafe]: ./failsafe-report.html
-[findbugs]: ./findbugs.html
 [jacoco]: ./jacoco/index.html
 [jdepend]: ./jdepend-report.html
 [pmd]: ./pmd.html
 [plugins]: ./plugins.html
 [plugins-manage]: ./plugin-management.html
+[spotbugs]: ./spotbugs.html
 [surefire]: ./surefire-report.html
 [taglist]: ./taglist.html