Merge commit '6a200d078f4448df599b8bbe57d2afa4cb0d788e'

mitre · Jan 4, 2017 · c6daaae · c6daaae
2 parents f1712b3 + 6a200d0
commit c6daaae
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-/target/
+/target/
+/.idea
+/*.iml
diff --git a/Dockerfile b/Dockerfile
@@ -19,4 +19,4 @@ EXPOSE 8080
 
 # execute it
 # CMD ["mvn", "exec:java"]
-CMD ["java", "-jar", "target/cqlTranslationServer-1.0-0-jar-with-dependencies.jar", "-d"]
+CMD ["java", "-jar", "target/cqlTranslationServer-1.1.0-SNAPSHOT-jar-with-dependencies.jar", "-d"]
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <groupId>org.mitre.bonnie</groupId>
   <artifactId>cqlTranslationServer</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0</version>
+  <version>1.1.0-SNAPSHOT</version>
   <name>cqlTranslationServer</name>
 
   <repositories>
@@ -54,22 +54,27 @@
     <dependency>
       <groupId>info.cqframework</groupId>
       <artifactId>cql</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>info.cqframework</groupId>
       <artifactId>cql-to-elm</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>info.cqframework</groupId>
       <artifactId>elm</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>info.cqframework</groupId>
       <artifactId>quick</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+		<groupId>info.cqframework</groupId>
+		<artifactId>qdm</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>