Merge pull request #22 from DBCG/develop

Proposed 1.0.0 Release
cqframework · Sep 30, 2020 · 7ae0c89 · 7ae0c89
2 parents 092cbf8 + b4a0981
commit 7ae0c89
Show file tree

Hide file tree

Showing 685 changed files with 82,389 additions and 1,893 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,46 +2,45 @@ language: java
 jdk: openjdk11
 os: linux
 dist: xenial
-
 cache:
   timeout: 180
   directories:
   - "$HOME/.m2/repository"
-
 install:
-   - mvn install -U -DskipTests=true -Dmaven.javadoc.skip=true -B -V
-
+- mvn install -U -DskipTests=true -Dmaven.javadoc.skip=true -B -V
 script:
-  # master or PRs into master, use the release profile
-  - 'if [[ "$TRAVIS_BRANCH" =~ master* ]]; then mvn test -B -P release; fi'
-  - 'if ! [[ "$TRAVIS_BRANCH" =~ master* ]]; then mvn test -B; fi'
-
-
-## export GPG details
+- if [[ "$TRAVIS_BRANCH" =~ master* ]]; then mvn test -B -P release; fi
+- if ! [[ "$TRAVIS_BRANCH" =~ master* ]]; then mvn test -B; fi
 before_deploy:
-  - 'if [[ "$TRAVIS_BRANCH" =~ master* ]]; then echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import; fi'
-  - 'if [[ "$TRAVIS_BRANCH" =~ master* ]]; then echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust; fi'
-
-# NOTE: tests were already run as part of the script phase
+- if [[ "$TRAVIS_BRANCH" =~ master* ]]; then echo $GPG_SECRET_KEYS | base64 --decode
+  | $GPG_EXECUTABLE --import; fi
+- if [[ "$TRAVIS_BRANCH" =~ master* ]]; then echo $GPG_OWNERTRUST | base64 --decode
+  | $GPG_EXECUTABLE --import-ownertrust; fi
 deploy:
-  # deploy develop as a snapshot
-  - provider: script
-    script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -DskipTests=true"
-    cleanup: false
-    skip_cleanup: true # this is the current correct option, soon to be deprecated by the above
-    on:
-      branch: develop
-  # deploy master to production
-  - provider: script
-    script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P release -DskipTests=true"
-    cleanup: false
-    skip_cleanup: true # this is the current correct option, soon to be deprecated by the above
-    on:
-      branch: master
-
-# Remove the binaries generated by this build so that the cache isn't invalidated.
-# Probably a better way to do this.
+- provider: script
+  script: cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -DskipTests=true
+  cleanup: false
+  skip_cleanup: true
+  on:
+    branch: develop
+- provider: script
+  script: cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P release
+    -DskipTests=true
+  cleanup: false
+  skip_cleanup: true
+  on:
+    branch: master
 before_cache:
-      - rm -rf $HOME/.m2/repository/org/opencds/cqf/cql/cli
-      - rm -rf $HOME/.m2/repository/org/opencds/cqf/cql/rest
-      - rm -rf $HOME/.m2/repository/org/opencds/cqf/cql/service
+- rm -rf $HOME/.m2/repository/org/opencds/cqf/cql/cli
+- rm -rf $HOME/.m2/repository/org/opencds/cqf/cql/rest
+- rm -rf $HOME/.m2/repository/org/opencds/cqf/cql/service
+notifications:
+  slack:
+    - rooms:
+      - secure: NS0wLbgDgtmShBFpSYzi67ef/6lhFBiCw9nkJCHT+a47FXQb1l+dUk4EAd9SjpWHBO1YcL5yZ95+QaweVhKyEjAxlxJVNpAh3Yg9zskjrzfGqK5Uwz+HhcctyuzJ+GVhn4Ri+1NSqKp4uL2UvmqtrTCdwZ8r7z6s8Q7Q+Mh+JdTNpujCT3iziOL2zK20fay5kS/DX3CiA8wUKYxqWxLMlhv+L9/ZyFztuVWYJO1+J1tC27twlzVAwL/tP38m/X7WB7ITp9koWX+8+2R7mgTnCGNJrSMZH4+iNCnmcRr5m5LGbvaaK59JnhylkAN5X3+ojMN450AA1nHL+hEYfxhARoy4wQ6u9g/3qkbRSXFvCjWvSUJnVAkCNAGPR68Q415mkdnS9UJ1PdRa0HPGjuxGv3CIWmJzAuXo2TNj9NakVKyOh/TZh8OrYQifhF4sLx9DTntHaxJtfB/SWZ9Vvj92YPRC6l3YCtLrFdxisEIa4N+EYxZXiTE1bCUpoCld7h7U5q1vmBKafv8z0HhCFrR5QSXPDby3fuU7oIKX3drn3HVnyBrbkQFapYXOKHD/O71DHitgFYSMp3zpRar2niMiQm6AJVry1oAxlo/x99UiZrFRrU+PuSLT9vzasfTf88HuYihcfDBF0HMOUmXRVR/ORdqS8AHn0r/9FprqDDTRK9Q=
+      on_success: always
+      on_failure: never
+    - rooms:
+      - secure: P6dxCL+vydKFJmpS0K3GeXHjL5Gyy75qCfLa1kEa/bzerDOOsjL/g0XcsKE0YNsmJlPGTHXxRbYJWEf2eZAFYZll38Se26j4IwqP4oeO5VKUhVYNfQYkgC2pu4y5F10sjcJxq4krSvnYGiEZNxgIKxu9ZOz1/kVQCRRA8ixJo1AutFTMvYvoRGPA5K6QPkqhyqsK2dOQnxhxKdq+oAgxOOPeB43zWlGTFtIqhySnF0xGT3Im25+J4GlV0++TcIwDxV7k05krSPKeoo9mvsMLv5KXU5MkFRvSSCST0ag9rBDUJuP2Gy1CCt/xmu4B3mLAF1Np7LVhGJGiH6BCbkI+CKogXjYJg4DIkzxXquthstzq3Z9JHVcZ94Y1TrpWmgPhVNtUfSISPLMD/8lBI/Gr3gXTdFGMJr5vVo/ch04dvyklVnzx49RbvSJ8FLX0QmqfCIyP7NLS9B/ooXas9L/Ufo6Z9qd6f2QRJGY4rJYQ+nQ1wjJP7bHYEbf/hbfU2YHs8ChJM/zu/JdNSw/a7KhtLVj29z/IsAVEsYlEvagrI3TfPGXyz6YGeoGWuUjGjTZOVXy+D1VrH6dNqnXcTWXeySHrc7vDEO+GCT69xHhoxAUDtP/qFdfjRgaXGVAjZpvCgUkT5tfc8cIfEV35vfHcgsC41ggVgHxXhV/50pDj4sY=
+      on_success: never
+      on_failure: always
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,7 +4,6 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-
         {
             "type": "java",
             "name": "Debug (Attach)",
@@ -22,10 +21,10 @@
             "type": "java",
             "name": "Debug (EXM 124)",
             "request": "launch",
-            "mainClass": "com.alphora.cql.cli.Main",
-            "projectName": "cli",
+            "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+            "projectName": "evaluator.cli",
             "args": [
-                "--lp",
+                "--lu",
                 "../connectathon/fhir3/cql",
                 "--ln",
                 "EXM124_FHIR3",
@@ -41,10 +40,10 @@
             "type": "java",
             "name": "Debug (EXM 130)",
             "request": "launch",
-            "mainClass": "com.alphora.cql.cli.Main",
-            "projectName": "cli",
+            "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+            "projectName": "evaluator.cli",
             "args": [
-                "--lp",
+                "--lu",
                 "../connectathon/fhir3/cql",
                 "--ln",
                 "EXM130_FHIR3",
@@ -60,17 +59,17 @@
             "type": "java",
             "name": "Debug (EXM 130 R4)",
             "request": "launch",
-            "mainClass": "com.alphora.cql.cli.Main",
-            "projectName": "cli",
+            "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+            "projectName": "evaluator.cli",
             "args": [
-                "--lp",
-                "../connectathon/fhir4/cql",
+                "--lu",
+                "../connectathon/fhir4/input/pagecontent/cql",
                 "--ln",
                 "EXM130_FHIR4",
                 "-m",
-                "FHIR=../connectathon/fhir4/tests/EXM130_FHIR4-7.2.000",
+                "FHIR=../connectathon/fhir4/input/tests/EXM130_FHIR4-7.2.000",
                 "-t",
-                "../connectathon/fhir4/resources/valuesets",
+                "../connectathon/fhir4/input/vocabulary/valueset",
                 "-c",
                 "Patient=numer-EXM130-FHIR4"
             ]
@@ -79,17 +78,17 @@
             "type": "java",
             "name": "Debug (EXM 105 R4)",
             "request": "launch",
-            "mainClass": "com.alphora.cql.cli.Main",
-            "projectName": "cli",
+            "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+            "projectName": "evaluator.cli",
             "args": [
-                "--lp",
-                "../connectathon/fhir4/cql",
+                "--lu",
+                "../connectathon/fhir4/input/pagecontent/cql",
                 "--ln",
                 "EXM105_FHIR4",
                 "-m",
-                "FHIR=../connectathon/fhir4/tests/EXM105_FHIR4-8.1.000",
+                "FHIR=../connectathon/fhir4/input/tests/EXM105_FHIR4-8.1.000",
                 "-t",
-                "../connectathon/fhir4/resources/valuesets",
+                "../connectathon/fhir4/input/vocabulary/valueset",
                 "-c",
                 "Patient=denom-EXM105-FHIR4"
             ]
@@ -98,10 +97,10 @@
             "type": "java",
             "name": "Debug (EXM 104)",
             "request": "launch",
-            "mainClass": "com.alphora.cql.cli.Main",
-            "projectName": "cli",
+            "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+            "projectName": "evaluator.cli",
             "args": [
-                "--lp",
+                "--lu",
                 "../connectathon/fhir3/cql",
                 "--ln",
                 "EXM104_FHIR3",
@@ -117,21 +116,40 @@
             "type": "java",
             "name": "Debug (EXM 104 R4)",
             "request": "launch",
-            "mainClass": "com.alphora.cql.cli.Main",
-            "projectName": "cli",
+            "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+            "projectName": "evaluator.cli",
             "args": [
-                "--lp",
-                "../connectathon/fhir4/cql",
+                "--lu",
+                "../connectathon/fhir4/input/pagecontent/cql",
                 "--ln",
                 "EXM104_FHIR4",
                 "-m",
-                "FHIR=../connectathon/fhir4/tests/EXM104_FHIR4-8.1.000",
+                "FHIR=../connectathon/fhir4/input/tests/EXM104_FHIR4-8.1.000",
                 "-t",
-                "../connectathon/fhir4/resources/valuesets",
+                "../connectathon/fhir4/input/vocabulary/valueset",
                 "-c",
                 "Patient=numer-EXM104-FHIR4"
             ]
         },
+        {
+            "type": "java",
+            "name": "Debug (EXM 104 R401)",
+            "request": "launch",
+            "mainClass": "org.opencds.cqf.cql.cli.Main",
+            "projectName": "cli",
+            "args": [
+                "--lp",
+                "../connectathon/fhir401/input/pagecontent/cql",
+                "--ln",
+                "EXM104",
+                "-m",
+                "FHIR=../connectathon/fhir401/input/tests/EXM104-9.1.000",
+                "-t",
+                "../connectathon/fhir401/input/vocabulary/valueset",
+                "-c",
+                "Patient=numer-EXM104"
+            ]
+        },
         {
             "type": "java",
             "name": "Debug (Launch)-Main<rest>",