Merge branch 'master' into suppressions-cleanup

confluentinc · Mar 13, 2018 · c8592d3 · c8592d3
2 parents 15c9f50 + 76fb106
commit c8592d3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/ksql-engine/pom.xml b/ksql-engine/pom.xml
@@ -213,6 +213,11 @@
                 </includes>
             </resource>
 
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>false</filtering>

diff --git a/ksql-engine/src/main/java/io/confluent/ksql/util/Version.java b/ksql-engine/src/main/java/io/confluent/ksql/util/Version.java
@@ -31,7 +31,7 @@ public class Version {
     try {
       Properties props = new Properties();
       try (InputStream resourceAsStream = Version.class.getResourceAsStream(
-          "/ksql-version.properties")) {
+          "/version.properties")) {
         props.load(resourceAsStream);
       }
       version = props.getProperty("version", version).trim();

diff --git a/ksql-engine/src/main/resources/ksql-version.properties b/ksql-engine/src/main/resources/ksql-version.properties
diff --git a/ksql-engine/src/main/resources/version.properties b/ksql-engine/src/main/resources/version.properties
@@ -0,0 +1 @@
+version=${project.version}
diff --git a/ksql-parser/src/test/resources/ksql-version.properties b/ksql-parser/src/test/resources/ksql-version.properties