Merge pull request #297 from DBCG/feature-update-tester-page

Update tester page to latest hapi version
cqframework · Jun 21, 2021 · dc272a0 · dc272a0
2 parents 05cdd8e + 54271d3
commit dc272a0
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 116 deletions.
diff --git a/cqf-ruler-dstu3/pom.xml b/cqf-ruler-dstu3/pom.xml
@@ -11,11 +11,7 @@
     <groupId>org.opencds.cqf</groupId>
     <artifactId>cqf-ruler-dstu3</artifactId>
     <name>cqf-ruler-dstu3</name>
-
-    <properties>
-        <p.type>war</p.type>
-    </properties>
-    <packaging>${p.type}</packaging>
+    <packaging>war</packaging>
 
     <dependencies>
         <dependency>

diff --git a/cqf-ruler-dstu3/src/main/webapp/WEB-INF/templates/tmpl-head.html b/cqf-ruler-dstu3/src/main/webapp/WEB-INF/templates/tmpl-head.html
diff --git a/cqf-ruler-dstu3/src/main/webapp/img/favicon.ico b/cqf-ruler-dstu3/src/main/webapp/img/favicon.ico
diff --git a/cqf-ruler-dstu3/src/main/webapp/img/sample-logo.jpg b/cqf-ruler-dstu3/src/main/webapp/img/sample-logo.jpg
diff --git a/cqf-ruler-dstu3/src/main/webapp/js/moment-with-locales.min.js b/cqf-ruler-dstu3/src/main/webapp/js/moment-with-locales.min.js
diff --git a/cqf-ruler-r4/pom.xml b/cqf-ruler-r4/pom.xml
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -11,11 +11,7 @@
     <groupId>org.opencds.cqf</groupId>
     <artifactId>cqf-ruler-r4</artifactId>
     <name>cqf-ruler-r4</name>
-
-    <properties>
-        <p.type>war</p.type>
-    </properties>
-    <packaging>${p.type}</packaging>
+    <packaging>war</packaging>
 
     <dependencies>
         <dependency>

diff --git a/cqf-ruler-r4/src/main/webapp/WEB-INF/templates/tmpl-head.html b/cqf-ruler-r4/src/main/webapp/WEB-INF/templates/tmpl-head.html
diff --git a/cqf-ruler-r4/src/main/webapp/img/favicon.ico b/cqf-ruler-r4/src/main/webapp/img/favicon.ico
diff --git a/cqf-ruler-r4/src/main/webapp/img/sample-logo.jpg b/cqf-ruler-r4/src/main/webapp/img/sample-logo.jpg
diff --git a/cqf-ruler-r4/src/main/webapp/js/moment-with-locales.min.js b/cqf-ruler-r4/src/main/webapp/js/moment-with-locales.min.js
diff --git a/dstu3/src/main/java/org/opencds/cqf/dstu3/servlet/CdsHooksServlet.java b/dstu3/src/main/java/org/opencds/cqf/dstu3/servlet/CdsHooksServlet.java
@@ -116,6 +116,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         logger.info(request.getRequestURI());
 

diff --git a/pom.xml b/pom.xml
@@ -49,8 +49,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <jetty.version>9.4.41.v20210516</jetty.version>
-        <jackson.version>2.12.1</jackson.version>
+        <jetty.version>9.4.42.v20210604</jetty.version>
+        <jackson.version>2.12.3</jackson.version>
         <hapi.version>5.4.1</hapi.version>
         <fhir.core.version>5.4.5</fhir.core.version>
         <cqf-tooling.version>1.3.0</cqf-tooling.version>
@@ -92,6 +92,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>ca.uhn.hapi.fhir</groupId>
+                <artifactId>hapi-fhir</artifactId>
+                <version>${hapi.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opencds.cqf.cql</groupId>
                 <artifactId>evaluator.engine</artifactId>
@@ -315,7 +322,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>4.0.1</version>
             <!--<scope>provided</scope>-->
         </dependency>
 
@@ -336,19 +343,18 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
-            <version>2.5.0</version>
+            <version>2.8.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
         </dependency>
 
         <dependency>
             <groupId>com.helger</groupId>
             <artifactId>ph-schematron</artifactId>
-            <version>5.6.0</version>
+            <version>5.6.5</version>
             <exclusions>
                 <exclusion>
                     <artifactId>Saxon-HE</artifactId>
@@ -373,70 +379,58 @@
         <dependency>
             <groupId>com.jamesmurty.utils</groupId>
             <artifactId>java-xmlbuilder</artifactId>
-            <version>1.2</version>
+            <version>1.3</version>
         </dependency>
 
         <dependency>
             <!-- jsoup HTML parser library @ https://jsoup.org/ -->
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.12.1</version>
+            <version>1.13.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>bootstrap</artifactId>
-            <version>5.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.webjars.npm</groupId>
-            <artifactId>popper.js</artifactId>
-            <version>1.16.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.webjars</groupId>
-            <artifactId>bootstrap</artifactId>
-            <version>3.3.7-1</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>Eonasdan-bootstrap-datetimepicker</artifactId>
-            <version>4.17.43</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
-            <version>5.8.2</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>
             <artifactId>awesome-bootstrap-checkbox</artifactId>
-            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>jstimezonedetect</artifactId>
-            <version>1.0.6</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>select2</artifactId>
-            <version>4.0.13</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>
             <artifactId>jquery</artifactId>
-            <version>3.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>
             <artifactId>moment</artifactId>
-            <version>2.27.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>popper.js</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-all</artifactId>
-            <version>0.50.26</version>
+            <version>0.62.2</version>
         </dependency>
     </dependencies>
     <build>
@@ -454,7 +448,6 @@
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>
-                        <release>8</release>
                         <failOnError>true</failOnError>
                         <failOnWarning>true</failOnWarning>
                         <compilerArgs>
@@ -671,5 +664,24 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>java-9</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <configuration>
+                                <release>8</release>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/r4/src/main/java/org/opencds/cqf/r4/servlet/CdsHooksServlet.java b/r4/src/main/java/org/opencds/cqf/r4/servlet/CdsHooksServlet.java
@@ -116,6 +116,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         logger.info(request.getRequestURI());

diff --git a/scripts/maintenance.sh b/scripts/maintenance.sh
@@ -4,4 +4,4 @@
 set -euxo pipefail
 bash -n "$0"
 
-mvn versions:update-properties versions:use-releases versions:use-latest-releases
+mvn versions:update-properties versions:use-releases versions:use-latest-releases -Dexcludes=org.slf4j:\*,ch.qos.logback