Merge pull request #449 from MeasureAuthoringTool/sb-benohe-patch-2

MAT-6894 Updated Tomcat-Embed-Core
MeasureAuthoringTool · Mar 8, 2024 · f04c05e · f04c05e
2 parents f9eedfd + d14864a
commit f04c05e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,10 +16,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11.0.10 for x64
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          java-version: '11.0.10'
+          java-version: '11'
+          distribution: 'corretto'
           architecture: x64
       - name: Build with Maven
         run: mvn clean install --file pom.xml
diff --git a/cql-elm-translation/pom.xml b/cql-elm-translation/pom.xml
@@ -14,6 +14,11 @@
     <description>CQL ELM Translation services</description>
 
     <dependencies>
+        <dependency>
+             <groupId>org.apache.tomcat.embed</groupId>
+             <artifactId>tomcat-embed-core</artifactId>
+             <version>9.0.83</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/hapi-fhir-jpaserver/pom.xml b/hapi-fhir-jpaserver/pom.xml
@@ -20,7 +20,11 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>9.0.83</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

diff --git a/mapping-services/pom.xml b/mapping-services/pom.xml
@@ -14,6 +14,11 @@
     <description>Spring Boot mapping-services</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+             <artifactId>tomcat-embed-core</artifactId>
+            <version>9.0.83</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/mat-fhir-services/pom.xml b/mat-fhir-services/pom.xml
@@ -14,6 +14,11 @@
     <description>Spring Boot MAT FHIR conversion services</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+                <version>9.0.83</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>