Merge pull request #82 from iantmoore/library-upgrades

lib upgrades
Substeps · Jun 15, 2019 · ee46ec1 · ee46ec1
2 parents 6744e2e + ba08d30
commit ee46ec1
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 26 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -36,7 +36,7 @@
 
         <dependency>
             <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.12</artifactId>
+            <artifactId>scalatest_${scala.major.version}</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -12,7 +12,7 @@
     <name>Substeps Core</name>
 
     <properties>
-            <json4s.version>3.5.3</json4s.version>
+
     </properties>
 
     <dependencies>
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.12</artifactId>
+            <artifactId>scalatest_${scala.major.version}</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -60,12 +60,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.5</version>
+            <version>3.9</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
+            <version>2.6</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -76,14 +76,14 @@
 
         <dependency>
             <groupId>org.json4s</groupId>
-            <artifactId>json4s-native_2.12</artifactId>
+            <artifactId>json4s-native_${scala.major.version}</artifactId>
             <version>${json4s.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-jexl3</artifactId>
-            <version>3.0</version>
+            <version>3.1</version>
         </dependency>
 
         <!-- Test Dependencies -->

diff --git a/pom.xml b/pom.xml
@@ -121,26 +121,30 @@
 
         <stable.substeps.version>1.0.0-SNAPSHOT</stable.substeps.version>
 
-        <slf4j.version>1.7.25</slf4j.version>
+        <slf4j.version>1.7.26</slf4j.version>
 
         <junit.version>4.12</junit.version>
         <hamcrest.version>1.3</hamcrest.version>
         <mockito.version>2.7.19</mockito.version>
         <guava.version>23.5-jre</guava.version>
         <gson.version>2.8.2</gson.version>
+        <typesafe.config.version>1.3.4</typesafe.config.version>
 
         <jacoco.version>0.7.6.201602180812</jacoco.version>
 
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
         <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
-        <scala.version>2.12.4</scala.version>
-        <scala-test.version>3.0.4</scala-test.version>
-        <scala-mock.version>3.6.0</scala-mock.version>
+        <scala.major.version>2.12</scala.major.version>
+        <scala.version>${scala.major.version}.8</scala.version>
+
+        <json4s.version>3.6.6</json4s.version>
+        <scala-test.version>3.0.8</scala-test.version>
+        <scala-mock.version>4.2.0</scala-mock.version>
         <!-- Configuration to enable SCM access via Travis-CI -->
         <project.scm.id>scm.credentials</project.scm.id>
 
-        <scala.plugin.version>3.2.2</scala.plugin.version>
+        <scala.plugin.version>4.0.2</scala.plugin.version>
         <scoverage.plugin.version>1.3.0</scoverage.plugin.version>
 
     </properties>
@@ -207,7 +211,7 @@
             <dependency>
                 <groupId>com.typesafe</groupId>
                 <artifactId>config</artifactId>
-                <version>1.3.1</version>
+                <version>${typesafe.config.version}</version>
             </dependency>
 
             <dependency>
@@ -285,14 +289,14 @@
 
             <dependency>
                 <groupId>org.scalatest</groupId>
-                <artifactId>scalatest_2.12</artifactId>
+                <artifactId>scalatest_${scala.major.version}</artifactId>
                 <version>${scala-test.version}</version>
                 <scope>test</scope>
             </dependency>
 
             <dependency>
                 <groupId>org.scalamock</groupId>
-                <artifactId>scalamock-scalatest-support_2.12</artifactId>
+                <artifactId>scalamock_${scala.major.version}</artifactId>
                 <version>${scala-mock.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -432,7 +436,7 @@
                             <jvmArg>-Xms64m</jvmArg>
                             <jvmArg>-Xmx1024m</jvmArg>
                         </jvmArgs>
-                        <scalaVersion>${scala.version}</scalaVersion>
+<!--                        <scalaVersion>${scala.version}</scalaVersion>-->
                     </configuration>
                 </plugin>
 

diff --git a/runner/Junit/pom.xml b/runner/Junit/pom.xml
@@ -33,7 +33,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.4</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/runner/Maven/pom.xml b/runner/Maven/pom.xml
@@ -14,8 +14,8 @@
     <description>A maven plugin for the substeps BDD framework</description>
 
     <properties>
-        <maven.lib.version>3.5.2</maven.lib.version>
-        <json4s.version>3.5.3</json4s.version>
+        <maven.lib.version>3.6.1</maven.lib.version>
+
 
     </properties>
 
@@ -36,13 +36,13 @@
 
         <dependency>
             <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.12</artifactId>
+            <artifactId>scalatest_${scala.major.version}</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.scalamock</groupId>
-            <artifactId>scalamock-scalatest-support_2.12</artifactId>
+            <artifactId>scalamock_${scala.major.version}</artifactId>
 
             <scope>test</scope>
         </dependency>
@@ -90,13 +90,13 @@
         </dependency>
         <dependency>
             <groupId>org.json4s</groupId>
-            <artifactId>json4s-core_2.12</artifactId>
+            <artifactId>json4s-core_2.13</artifactId>
             <version>${json4s.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.json4s</groupId>
-            <artifactId>json4s-native_2.12</artifactId>
+            <artifactId>json4s-native_2.13</artifactId>
             <version>${json4s.version}</version>
         </dependency>
 
@@ -178,7 +178,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.5</version>
+                <version>3.6.0</version>
                 <configuration />
                 <executions>
                     <execution>
@@ -244,7 +244,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.5</version>
+                <version>3.6.0</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -256,7 +256,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.9</version>
+                <version>3.0.0</version>
                 <reportSets>
                     <reportSet>
                         <reports>