Merge pull request #2 from PennState/develop

Merge from source
PennState · Aug 28, 2018 · 7cecf3a · 7cecf3a
2 parents 6c9de48 + a000bde
commit 7cecf3a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/jms-reactive-client/pom.xml b/jms-reactive-client/pom.xml
@@ -8,15 +8,13 @@
   express or implied. See the License for the specific language governing permissions 
   and limitations under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>edu.psu.swe.libraries</groupId>
     <artifactId>jms-tools</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>jms-reactive-client</artifactId>
@@ -39,8 +37,8 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jackson2-provider</artifactId>
-      <version>3.0.19.Final</version>
     </dependency>
+
     <!-- Test scoped -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/jms-reactive-client/src/main/java/edu/psu/activemq/MessageProcessor.java b/jms-reactive-client/src/main/java/edu/psu/activemq/MessageProcessor.java
@@ -99,7 +99,7 @@ public void terminate() {
     process = false;
   }
 
-  void initialize() {
+  protected void initialize() {
     log.info("Initializing message processor...");
 
     Thread t = new Thread(new Runnable() {

diff --git a/jms-reactive-client/src/main/java/edu/psu/activemq/TypeProcessor.java b/jms-reactive-client/src/main/java/edu/psu/activemq/TypeProcessor.java
@@ -18,12 +18,13 @@
  */
 
 import edu.psu.activemq.exception.TypeProcessorException;
+import edu.psu.activemq.exception.UnableToProcessMessageException;
 
 public interface TypeProcessor<T> {
 
   T parseMessage(String json) throws TypeProcessorException;
 
-  void processMessage(T t) throws TypeProcessorException;
+  void processMessage(T t) throws UnableToProcessMessageException;
 
 }
 
diff --git a/...tive-client/src/main/java/edu/psu/activemq/exception/UnableToProcessMessageException.java b/...tive-client/src/main/java/edu/psu/activemq/exception/UnableToProcessMessageException.java
@@ -21,7 +21,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-public class UnableToProcessMessageException extends Exception {
+public class UnableToProcessMessageException extends RuntimeException {
 
   public enum HandleAction {
     ERROR,

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@ under the License.
 
   <groupId>edu.psu.swe.libraries</groupId>
   <artifactId>jms-tools</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>${project.parent}/libraries/jms-utils</url>
 
@@ -85,7 +85,7 @@ under the License.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.sourceEncoding>UTF-8</project.reporting.sourceEncoding>
 
-    <activemq.version>5.15.3</activemq.version>
+    <activemq.version>5.15.4</activemq.version>
     <assertj.version>3.9.1</assertj.version>
     <junit-qualifier />
     <junit-minor.version>2.0</junit-minor.version>
@@ -94,6 +94,7 @@ under the License.
     <logback.version>1.2.3</logback.version>
     <lombok.version>1.16.18</lombok.version>
     <mockito.version>2.18.0</mockito.version>
+    <resteasy-jackson2.version>3.6.1.Final</resteasy-jackson2.version>
     <slf4j.version>1.7.25</slf4j.version>
   </properties>
 
@@ -124,6 +125,11 @@ under the License.
         <artifactId>activemq-client</artifactId>
         <version>${activemq.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jackson2-provider</artifactId>
+        <version>${resteasy-jackson2.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
@@ -251,10 +257,10 @@ under the License.
       <plugin>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-maven</artifactId>
-        <version>1.4.5</version>
+        <version>3.3.1</version>
         <configuration>
-          <failBuildOnCVSS>9</failBuildOnCVSS>
-          <failOnError>false</failOnError>
+          <failOnError>true</failOnError>
+          <failBuildOnCVSS>8</failBuildOnCVSS>
         </configuration>
         <executions>
           <execution>
@@ -311,6 +317,7 @@ under the License.
             <copyrightMessage>Copyright (c) 2018 by The Pennsylvania State University</copyrightMessage>
             <excludes>
               <exclude>**/*.md</exclude>
+              <exclude>**/.factorypath</exclude>
             </excludes>
           </configuration>
         </plugin>