SITE-4191

onc-healthit · Aug 15, 2024 · 96facda · 96facda
1 parent c36394b
commit 96facda
Show file tree

Hide file tree

Showing 47 changed files with 2,166 additions and 5,301 deletions.
diff --git a/common-config/pom.xml b/common-config/pom.xml
@@ -39,7 +39,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
+		<version>1.5.22.RELEASE</version>
 		<relativePath></relativePath>
 	</parent>
 
@@ -118,11 +118,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-
 	</dependencies>
 
 

diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -68,15 +68,39 @@
             <version>8.0.30</version>
         </dependency>
 
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version> 2.17.2</version>
+		</dependency>
+
+<dependency>
+    <groupId>org.slf4j</groupId>
+    <artifactId>slf4j-simple</artifactId>
+    <version>2.1.0-alpha1</version>
+</dependency>		
+
 		<dependency>
 			<groupId>gov.nist.healthcare.ttt</groupId>
 			<artifactId>mailprotocols</artifactId>
 			<version>3.0.0</version>
+		      <exclusions>
+		        <exclusion>  <!-- declare the exclusion here -->
+		            <groupId>org.apache.logging.log4j</groupId>
+		            <artifactId>log4j-core</artifactId>
+		        </exclusion>
+		      </exclusions>				
 		</dependency>
 		<dependency>
 			<groupId>gov.nist.healthcare.ttt</groupId>
 			<artifactId>direct</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
+		      <exclusions>
+		        <exclusion>  <!-- declare the exclusion here -->
+		            <groupId>org.apache.logging.log4j</groupId>
+		            <artifactId>log4j-core</artifactId>
+		        </exclusion>
+		      </exclusions>				
 		</dependency>
 		<dependency>
 			<groupId>gov.nist.healthcare.ttt</groupId>
@@ -148,7 +172,29 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.12.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.5</version>
+		</dependency>
 
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version> 2.17.1</version>
+		      <exclusions>
+		        <exclusion>  <!-- declare the exclusion here -->
+		            <groupId>org.apache.logging.log4j</groupId>
+		            <artifactId>log4j-api</artifactId>
+		        </exclusion>
+		      </exclusions>		
+		</dependency>
+
+		<dependency>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-api</artifactId>
+		    <version>2.17.1</version>
+		</dependency>		
 
 	</dependencies>
 
@@ -157,6 +203,52 @@
 
 		<plugins>
 
+		<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<executions>
+					<!-- mail protocol-->
+					<execution>
+						<id>saxon-ee</id>
+						<phase>clean</phase>
+						<configuration>
+							<file>${basedir}/ett/mail protocols/target/mailprotocols-3.0.0.jar</file>
+							<groupId>gov.nist.healthcare.ttt</groupId>
+							<artifactId>mailprotocols</artifactId>
+							<version>3.0.0</version>
+							<packaging>jar</packaging>
+							<generatePom>true</generatePom>
+						</configuration>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>		
+
+		<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<executions>
+					<!-- mail protocol-->
+					<execution>
+						<id>saxon-ee</id>
+						<phase>clean</phase>
+						<configuration>
+							<file>${basedir}/ett/direct/target/direct-0.0.1-SNAPSHOT.jar</file>
+							<groupId>gov.nist.healthcare.ttt</groupId>
+							<artifactId>direct</artifactId>
+							<version>0.0.1-SNAPSHOT</version>
+							<packaging>jar</packaging>
+							<generatePom>true</generatePom>
+						</configuration>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>							
+
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -177,8 +269,6 @@
 				</configuration>
 			</plugin>
 
-
-
 		</plugins>
 
 	</build>

diff --git a/webapp/src/main/java/gov/nist/healthcare/ttt/webapp/Application.java b/webapp/src/main/java/gov/nist/healthcare/ttt/webapp/Application.java
@@ -11,8 +11,8 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
@@ -81,6 +81,7 @@ public FilterRegistrationBean portFilter(@Value("${server.port}") int serverPort
 
 	public static void main(String[] args) {
 		System.setProperty("java.net.preferIPv4Stack", "true");
+		System.setProperty("LOG_EXCEPTION_CONVERSION_WORD", "%throwable");
 		SpringApplication.run(Application.class, args);
 	}