Merge pull request #4 from DirectProjectJavaRI/develop

Releasing 8.0.0

Author: Greg Meyer

.gitignore

@@ -21,3 +21,7 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+/target/
+/.classpath
+/.factorypath
+/.project

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nhind</groupId>
 	<artifactId>direct-msg-monitor-web</artifactId>
-	<version>6.0</version>
+	<version>8.0.0</version>
 	<packaging>war</packaging>
 	<name>NHIN-Direct Message Monitor Web Application Module</name>
 	<description>NHIN-Direct Message Monitor Web Application Module</description>
@@ -15,14 +15,14 @@
 		<connection>scm:git:https://github.com/DirectProjectJavaRI/direct-msg-monitor-web.git</connection>
 	</scm>
     <prerequisites>
-        <maven>3.0.0</maven>
+        <maven>3.5.0</maven>
     </prerequisites>  	
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.2.RELEASE</version>     
-		<relativePath />
-	</parent>		
+    <parent>
+	   <groupId>org.springframework.boot</groupId>
+	   <artifactId>spring-boot-starter-parent</artifactId>
+	   <version>2.5.2</version>
+	   <relativePath />
+    </parent>		
     <developers>
         <developer>
             <name>Greg Meyer</name>
@@ -42,36 +42,42 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<camel.version>2.22.0</camel.version>
+		<mina.version>1.0.9</mina.version> 	
 	</properties>     	
 	<dependencyManagement>
 		<dependencies>											
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.1.2.RELEASE</version> 
+				<version>2.5.2</version> 
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>			
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-parent</artifactId>
-				 <version>Greenwich.RELEASE</version>
+				 <version>2020.0.3</version>
 				<type>pom</type>
 				<scope>import</scope>		
-			</dependency>											
+			</dependency>
+            <dependency>
+                <groupId>org.apache.mina</groupId>
+                <artifactId>mina-core</artifactId>
+                <version>${mina.version}</version>
+            </dependency> 														
 		</dependencies>
 	</dependencyManagement>		 
 	<dependencies>
 		<dependency>
 			<groupId>org.nhind</groupId>
 			<artifactId>direct-msg-monitor</artifactId>
-			<version>6.0</version>		
+			<version>8.0.0</version>		
 		</dependency>	
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>    
             <scope>provided</scope>                 
-        </dependency> 	      	
+        </dependency> 		              	
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>         
@@ -91,7 +97,11 @@
 	    <dependency>
 	        <groupId>org.springframework.boot</groupId>
 	        <artifactId>spring-boot-configuration-processor</artifactId>
-	    </dependency> 
+	    </dependency>
+		<dependency>
+		    <groupId>org.springframework.cloud</groupId>
+		    <artifactId>spring-cloud-starter-bootstrap</artifactId>
+		</dependency>	     
 	    <dependency>
 	        <groupId>org.springframework.cloud</groupId>
 	        <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
@@ -166,9 +176,8 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
 				<configuration>
-				    <additionalparam>-Xdoclint:none</additionalparam>
+				    <additionalJOption>-Xdoclint:none</additionalJOption>
 					<charset>UTF-8</charset>
 					<docencoding>UTF-8</docencoding>
 					<docfilessubdirs>true</docfilessubdirs>
@@ -201,8 +210,7 @@
                  </execution>
                </executions>
             </plugin>
-            -->	
-		    			
+            -->			
 		</plugins>
 	</build>
 	<distributionManagement>

src/main/resources/application.yml

@@ -7,12 +7,30 @@ info.build.version: "@project.version@"
 spring: 
   cloud: 
     stream: 
+      function:
+        definition: directTxMonitoring    
       bindings: 
-        direct-tx-monitoring-input: 
+        directTxMonitoring-in-0: 
           destination: direct-tx-monitoring
           group: direct-tx-monitoring-stream-group
           consumer:
             concurrency: 10       
             maxAttempts: 10
             backOffInitialInterval: 15000
-            backOffMaxInterval: 120000   
+            backOffMaxInterval: 120000  
+         
+#Default username and password
+  security:
+    basic:
+      enabled: true
+    user:
+      name: admin
+      password: '{bcrypt}$2a$04$WQsYXSBOnycO1/7E9bKUVevWX3.Gxv2V6ZfYx9UKoy3lm9.4TjU7e'
+
+#Default Derby Database Settings.  This is not recommended for production use
+#and not fit for purpose for ephemeral deployments (you are almost guaranteed to lose your data if 
+#using an ephemeral environment)
+  datasource:
+    url: jdbc:derby:msgmonitor;create=true
+    username: nhind
+    password: nhind

src/main/resources/bootstrap.properties

@@ -0,0 +1,33 @@
+spring:
+  application:
+    name: direct-msg-monitor
+  jpa:
+    open_in_view: false
+
+  main:
+    allow-bean-definition-overriding: true
+
+  jmx:
+    default-domain: direct-msg-monitor
+
+#Don't use rabbit as part of the health check
+management:
+  health:
+    rabbit:
+      enabled: false
+
+#unique jmx names to avoid collisions when running
+#multiple spring boot apps in an web container
+endpoints:
+  jmx:
+    default-domain: direct-msg-monitor
+    uniqueNames: true
+
+camel:
+  springboot:
+    xmlRoutes: classpath:routes/routes.xml
+
+direct:
+  msgmonitor:
+    dsnSender:
+      useSMTPGatewaySender: true