Merge pull request #3 from Bernardo-MG/release

Release
Bernardo-MG · Jun 9, 2018 · 2147d9e · 2147d9e
2 parents 3db5158 + d8d8364
commit 2147d9e
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@
 language: java
 matrix:
   include:
-    # Code artifacts deployed with open JDK7
+    # Code artifacts deployed with OpenJDK7
     - jdk: openjdk7
       env: DEPLOY=true
     # Documentation deployed with JDK8
@@ -14,7 +14,7 @@ matrix:
 
 before_install:
   # Gets scripts
-  - git clone -b v1.1.2 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
+  - git clone -b v1.2.1 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
   # Sets scripts as executable
   - chmod -R +x ~/.scripts/*
   # Prepares CI environment

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
    <parent>
       <groupId>com.bernardomg.maven</groupId>
       <artifactId>base-pom</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.2</version>
    </parent>
 
    <!-- ********************************************** -->
@@ -20,7 +20,7 @@
 
    <groupId>com.bernardomg.velocity</groupId>
    <artifactId>velocity-config-tool</artifactId>
-   <version>1.1.0</version>
+   <version>1.1.1</version>
    <packaging>jar</packaging>
 
    <name>Velocity config tool</name>
@@ -169,11 +169,11 @@
       <commons.digester.version>2.1</commons.digester.version>
       <commons.logging.version>1.2</commons.logging.version>
       <commons.validator.version>1.6</commons.validator.version>
-      <doxia.decoration.version>1.7.4</doxia.decoration.version>
+      <doxia.decoration.version>1.8.1</doxia.decoration.version>
       <guava.version>20.0</guava.version>
-      <mockito.version>1.10.19</mockito.version>
-      <plexus.version>3.0.24</plexus.version>
-      <testng.version>6.10</testng.version>
+      <junit.version>4.12</junit.version>
+      <mockito.version>2.18.3</mockito.version>
+      <plexus.version>3.1.0</plexus.version>
       <velocity.tools.version>2.0</velocity.tools.version>
       <!-- ============================================== -->
       <!-- ================= MAVEN SITE ================= -->
@@ -272,17 +272,17 @@
       <!-- ======= TEST ENVIRONMENT DEPENDENCIES ======== -->
       <!-- ============================================== -->
       <dependency>
-         <!-- Mockito -->
-         <groupId>org.mockito</groupId>
-         <artifactId>mockito-all</artifactId>
-         <version>${mockito.version}</version>
+         <!-- JUnit -->
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>${junit.version}</version>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <!-- TestNG -->
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <version>${testng.version}</version>
+         <!-- Mockito -->
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-core</artifactId>
+         <version>${mockito.version}</version>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -21,5 +21,10 @@
             Relocation.
          </action>
       </release>
+      <release version="1.1.1" date="2018-06-09" description="Updated dependencies">
+         <action dev="bmg" type="update">
+            Updated dependencies.
+         </action>
+      </release>
    </body>
 </document>
diff --git a/src/config/pmd/pmd-rules.xml b/src/config/pmd/pmd-rules.xml
@@ -15,7 +15,7 @@
    <rule ref="rulesets/java/optimizations.xml" />
    <rule ref="rulesets/java/strings.xml" />
    <rule ref="rulesets/java/unusedcode.xml">
-      <exclude name="UnusedModifier" />
+      <exclude name="UnnecessaryModifier" />
    </rule>
 
 </ruleset>
diff --git a/src/test/java/com/bernardomg/velocity/tool/test/unit/skinConfig/TestConfigToolConfigure.java b/src/test/java/com/bernardomg/velocity/tool/test/unit/skinConfig/TestConfigToolConfigure.java
@@ -29,7 +29,7 @@
 
 import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.velocity.tools.ToolContext;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import com.bernardomg.velocity.tool.ConfigTool;
 import com.bernardomg.velocity.tool.ConfigToolConstants;

diff --git a/src/test/java/com/bernardomg/velocity/tool/test/unit/skinConfig/TestConfigToolGet.java b/src/test/java/com/bernardomg/velocity/tool/test/unit/skinConfig/TestConfigToolGet.java
@@ -30,9 +30,9 @@
 import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.velocity.tools.ToolContext;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.junit.Assert;
+import org.junit.Test;
 import org.mockito.Mockito;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import com.bernardomg.velocity.tool.ConfigTool;
 import com.bernardomg.velocity.tool.ConfigToolConstants;

diff --git a/src/test/java/com/bernardomg/velocity/tool/test/unit/skinConfig/TestConfigToolGetFileId.java b/src/test/java/com/bernardomg/velocity/tool/test/unit/skinConfig/TestConfigToolGetFileId.java
@@ -28,8 +28,8 @@
 import java.util.Map;
 
 import org.apache.velocity.tools.ToolContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.bernardomg.velocity.tool.ConfigTool;
 import com.bernardomg.velocity.tool.ConfigToolConstants;

diff --git a/.../java/com/bernardomg/velocity/tool/test/unit/skinConfig/TestConfigToolGetMissingData.java b/.../java/com/bernardomg/velocity/tool/test/unit/skinConfig/TestConfigToolGetMissingData.java
@@ -30,9 +30,9 @@
 import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.velocity.tools.ToolContext;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.junit.Assert;
+import org.junit.Test;
 import org.mockito.Mockito;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import com.bernardomg.velocity.tool.ConfigTool;
 import com.bernardomg.velocity.tool.ConfigToolConstants;