[HWKMETRICS-764] fix schema-installer build (#922) (#924)

* [HWKMETRICS-764] fix schema-installer build
hawkular · Mar 27, 2018 · b125e30 · b125e30
1 parent 90fe22c
commit b125e30
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/clients/dropwizard/hawkular-dropwizard-reporter/pom.xml b/clients/dropwizard/hawkular-dropwizard-reporter/pom.xml
@@ -142,7 +142,7 @@
                 <argument>-Dhawkular.metrics.cassandra.keyspace=${cassandra.keyspace}</argument>
                 <argument>-Dhawkular.metrics.cassandra.resetdb=true</argument>
                 <argument>-jar</argument>
-                <argument>../../../core/schema-installer/target/hawkular-metrics-schema-installer.jar</argument>
+                <argument>../../../core/schema-installer/target/hawkular-metrics-schema-installer-${project.version}.jar</argument>
               </arguments>
             </configuration>
             <dependencies>

diff --git a/clients/ptranslator/pom.xml b/clients/ptranslator/pom.xml
@@ -253,7 +253,7 @@
                 <argument>-Dhawkular.metrics.cassandra.keyspace=${cassandra.keyspace}</argument>
                 <argument>-Dhawkular.metrics.cassandra.resetdb=true</argument>
                 <argument>-jar</argument>
-                <argument>../../core/schema-installer/target/hawkular-metrics-schema-installer.jar</argument>
+                <argument>../../core/schema-installer/target/hawkular-metrics-schema-installer-${project.version}.jar</argument>
               </arguments>
             </configuration>
             <dependencies>

diff --git a/core/schema-installer/README.adoc b/core/schema-installer/README.adoc
@@ -14,7 +14,7 @@ In its simplest form the installer can be run as:
 
 [source,bash]
 ----
-[jsanda@localhost schema-installer]$ java -jar target/hawkular-metrics-schema-installer.jar
+[jsanda@localhost schema-installer]$ java -jar target/hawkular-metrics-schema-installer-<version>.jar
 INFO  2018-03-08 15:26:48,783 [main] org.hawkular.metrics.schema.Installer:logVersion:104 - Hawkular Metrics Schema Installer v0.29.0-SNAPSHOT+12ad36d504
 INFO  2018-03-08 15:26:48,786 [main] org.hawkular.metrics.schema.Installer:logInstallerProperties:109 - Configured installer properties:
   cqlPort = 9042
@@ -94,7 +94,7 @@ Here is an example of overriding some of the default settings:
     -Dhawkular.metrics.cassandra.nodes=node1.com,node2.com \
     -Dhawkular.metrics.cassandra.keyspace=hawkulartest \
     -Dhawkular.metrics.version-update.delay=10 \
-    -jar target/hawkular-metrics-schema-installer.jar
+    -jar target/hawkular-metrics-schema-installer-<version>.jar
 ----
 
 == Logging

diff --git a/core/schema-installer/pom.xml b/core/schema-installer/pom.xml
@@ -89,7 +89,6 @@
             </goals>
             <configuration>
               <createDependencyReducedPom>false</createDependencyReducedPom>
-              <finalName>hawkular-metrics-schema-installer</finalName>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.hawkular.metrics.schema.Installer</mainClass>

diff --git a/integration-tests/rest-tests-jaxrs/pom.xml b/integration-tests/rest-tests-jaxrs/pom.xml
@@ -166,7 +166,7 @@
                 <argument>-Dhawkular.metrics.cassandra.keyspace=${cassandra.keyspace}</argument>
                 <argument>-Dhawkular.metrics.cassandra.resetdb=true</argument>
                 <argument>-jar</argument>
-                <argument>../../core/schema-installer/target/hawkular-metrics-schema-installer.jar</argument>
+                <argument>../../core/schema-installer/target/hawkular-metrics-schema-installer-${project.version}.jar</argument>
               </arguments>
             </configuration>
             <dependencies>