Rev to 3.2.0

cqframework · Sep 27, 2024 · 9009c04 · 9009c04
1 parent 8e390d2
commit 9009c04
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 21 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opencds.cqf.cql.ls</groupId>
         <artifactId>cql-ls</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.0</version>
     </parent>
 
     <dependencies>

diff --git a/debug/server/pom.xml b/debug/server/pom.xml
@@ -11,15 +11,15 @@
     <parent>
         <groupId>org.opencds.cqf.cql.ls</groupId>
         <artifactId>cql-ls</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.cql.ls</groupId>
             <artifactId>cql-ls-core</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.lsp4j</groupId>

diff --git a/debug/service/pom.xml b/debug/service/pom.xml
@@ -10,15 +10,15 @@
     <parent>
         <groupId>org.opencds.cqf.cql.ls</groupId>
         <artifactId>cql-ls</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.cql.debug</groupId>
             <artifactId>cql-debug-server</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/ls/server/pom.xml b/ls/server/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opencds.cqf.cql.ls</groupId>
         <artifactId>cql-ls</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.opencds.cqf.cql.ls</groupId>
             <artifactId>cql-ls-core</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>3.2.0</version>
         </dependency>
 
         <dependency>

diff --git a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/command/CqlCommand.java b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/command/CqlCommand.java
@@ -125,6 +125,7 @@ static class ParameterParameter {
         }
     }
 
+    @SuppressWarnings("removal") // TODO: Missed a spot upstream in the CQL library
     private static class Logger implements ILoggingService {
 
         private final org.slf4j.Logger log = LoggerFactory.getLogger(Logger.class);

diff --git a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/service/DiagnosticsService.java b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/service/DiagnosticsService.java
@@ -23,7 +23,6 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.cqframework.cql.cql2elm.CqlCompiler;
 import org.cqframework.cql.cql2elm.CqlCompilerException;
-import org.cqframework.cql.elm.tracking.TrackBack;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.Position;
@@ -122,12 +121,6 @@ public Map<URI, Set<Diagnostic>> lint(URI uri) {
 
         log.debug("lint completed on {} with {} messages.", uri, exceptions.size());
 
-        // First, assign all unassociated exceptions to this library.
-        for (CqlCompilerException exception : exceptions) {
-            if (exception.getLocator() == null) {
-                exception.setLocator(new TrackBack(compiler.getCompiledLibrary().getIdentifier(), 0, 0, 0, 0));
-            }
-        }
 
         List<VersionedIdentifier> uniqueLibraries = exceptions.stream()
                 .map(x -> x.getLocator().getLibrary())

diff --git a/ls/service/pom.xml b/ls/service/pom.xml
@@ -9,15 +9,15 @@
     <parent>
         <groupId>org.opencds.cqf.cql.ls</groupId>
         <artifactId>cql-ls</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.cql.ls</groupId>
             <artifactId>cql-ls-server</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/plugin/debug/pom.xml b/plugin/debug/pom.xml
@@ -11,21 +11,21 @@
     <parent>
         <groupId>org.opencds.cqf.cql.ls</groupId>
         <artifactId>cql-ls</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.cql.ls</groupId>
             <artifactId>cql-ls-server</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>3.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.cql.debug</groupId>
             <artifactId>cql-debug-server</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.lsp4j</groupId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.opencds.cqf.cql.ls</groupId>
     <artifactId>cql-ls</artifactId>
     <packaging>pom</packaging>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.2.0</version>
 
     <name>CQL Language Server</name>
     <description>A Language Server for CQL implementing the LSP</description>
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.release>11</maven.compiler.release>
-        <cqf-fhir-cr.version>3.2.0</cqf-fhir-cr.version>
+        <cqf-fhir-cr.version>3.12.0</cqf-fhir-cr.version>
         <auto-service.version>1.1.1</auto-service.version>
         <slf4j.version>1.7.36</slf4j.version>
         <spring.boot.version>2.7.18</spring.boot.version>