Skip to content

Commit

Permalink
Merge pull request #192 from onc-healthit/feature/SITE-4191
Browse files Browse the repository at this point in the history 
SITE-4191
  • Loading branch information
@austinmoody
austinmoody authored Aug 19, 2024
2 parents c36394b + d0ce937 commit 1b25147
Show file tree
Hide file tree
Showing 41 changed files with 98 additions and 3,299 deletions.
7 changes: 1 addition & 6 deletions common-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -118,11 +118,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>

</dependencies>


Expand Down
97 changes: 94 additions & 3 deletions webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

<properties>
<jersey.version>2.22.1</jersey.version>
<projbasedir>../</projbasedir>
</properties>


Expand Down Expand Up @@ -68,15 +69,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>
Expand Down Expand Up @@ -148,7 +173,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.2</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.2</version>
</dependency>

</dependencies>

Expand All @@ -157,6 +204,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>${projbasedir}/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>${projbasedir}/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>
Expand All @@ -177,9 +270,7 @@
</configuration>
</plugin>



</plugins>

</build>
</project>
</project>
5 changes: 3 additions & 2 deletions webapp/src/main/java/gov/nist/healthcare/ttt/webapp/Application.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
19 changes: 0 additions & 19 deletions webapp/src/test/groovy/gov/nist/healthcare/ttt/webapp/TestSamlValidate.groovy
View file

This file was deleted.

144 changes: 0 additions & 144 deletions webapp/src/test/groovy/gov/nist/healthcare/ttt/webapp/TestUtils.groovy
View file

This file was deleted.

Loading

0 comments on commit 1b25147

Please sign in to comment.