From 16e6594b9d258a1a6879eac1e270957ac3501428 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 29 May 2018 13:40:42 +0200
Subject: jvpp-benchmark: include project version in the shaded artifact name

Renames shaded jar name from
jvpp-benchmark-exec.jar
to
jvpp-benchmark-1.18.07-SNAPSHOT-executable.jar

Change-Id: I593946dde3a6fc1717644e7315110aa94553d91d
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 it/jvpp-benchmark/asciidoc/Readme.adoc | 14 +++++++-------
 it/jvpp-benchmark/pom.xml              |  5 ++---
 it/jvpp-benchmark/run.sh               | 12 ++++++------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/it/jvpp-benchmark/asciidoc/Readme.adoc b/it/jvpp-benchmark/asciidoc/Readme.adoc
index a8e5d2c48..65aeff2c7 100644
--- a/it/jvpp-benchmark/asciidoc/Readme.adoc
+++ b/it/jvpp-benchmark/asciidoc/Readme.adoc
@@ -12,7 +12,7 @@ mvn clean install
 To display JMH options, use
 [source,shell]
 ---
-java -jar ./target/jvpp-benchmark-exec.jar -h
+java -jar ./target/jvpp-benchmark*executable.jar -h
 ---
 
 == AclUpdateBenchmark
@@ -32,25 +32,25 @@ ACLs from the set are used in round-robin fashion.
 Run with:
 [source,shell]
 ---
-sudo java -jar ./target/jvpp-benchmark-exec.jar AclUpdateBenchmark
+sudo java -jar ./target/jvpp-benchmark*executable.jar AclUpdateBenchmark
 ---
 
 To specify aclSize (default=100), use:
 [source,shell]
 ---
-sudo java -jar ./target/jvpp-benchmark-exec.jar -p aclSize=1000 AclUpdateBenchmark
+sudo java -jar ./target/jvpp-benchmark*executable.jar -p aclSize=1000 AclUpdateBenchmark
 ---
 
 To specify aclSetSize (default=100), use:
 [source,shell]
 ---
-sudo java -jar ./target/jvpp-benchmark-exec.jar -p aclSetSize=1000 AclUpdateBenchmark
+sudo java -jar ./target/jvpp-benchmark*executable.jar -p aclSetSize=1000 AclUpdateBenchmark
 ---
 
 To test interface in bridged (L2) / routed (L3) mode (default=L3), use:
 [source,shell]
 ---
-sudo java -jar ./target/jvpp-benchmark-exec.jar -p mode=L2 AclUpdateBenchmark
+sudo java -jar ./target/jvpp-benchmark*executable.jar -p mode=L2 AclUpdateBenchmark
 ---
 
 
@@ -68,11 +68,11 @@ Tables from the set are used in round-robin fashion.
 Run with:
 [source,shell]
 ---
-sudo java -jar ./target/jvpp-benchmark-exec.jar ClassifyTableCreateBenchmark
+sudo java -jar ./target/jvpp-benchmark*executable.jar ClassifyTableCreateBenchmark
 ---
 
 To specify tableSetSize (default=100), use:
 [source,shell]
 ---
-sudo java -jar ./target/jvpp-benchmark-exec.jar ClassifyTableCreateBenchmark -p aclSetSize=1000
+sudo java -jar ./target/jvpp-benchmark*executable.jar ClassifyTableCreateBenchmark -p aclSetSize=1000
 ---
diff --git a/it/jvpp-benchmark/pom.xml b/it/jvpp-benchmark/pom.xml
index bccf54fee..c871a0df0 100644
--- a/it/jvpp-benchmark/pom.xml
+++ b/it/jvpp-benchmark/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         <jmh.version>1.21</jmh.version>
-        <shaded.name>jvpp-benchmark-exec</shaded.name>
         <jvpp.version>18.07-SNAPSHOT</jvpp.version>
     </properties>
 
@@ -93,14 +92,14 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <!-- fixme: includevesion in artifact name, deploy to nexus -->
-                            <finalName>${shaded.name}</finalName>
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
                             </transformers>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>executable</shadedClassifierName>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/it/jvpp-benchmark/run.sh b/it/jvpp-benchmark/run.sh
index c9a8004bf..0fc2d61c4 100755
--- a/it/jvpp-benchmark/run.sh
+++ b/it/jvpp-benchmark/run.sh
@@ -17,19 +17,19 @@ echo "Stopping VPP"
 sudo service vpp stop
 
 echo "Single JVM fork 20x2s warmup iterations, 100x2s measurment iterations, aclSize=100"
-sudo java -jar ./target/jvpp-benchmark-exec.jar
+sudo java -jar ./target/jvpp-benchmark*executable.jar
 
 echo "Single JVM fork 20x2s warmup iterations, 100x2s measurment iterations, aclSize=1000"
-sudo java -jar ./target/jvpp-benchmark-exec.jar -p aclSize=1000
+sudo java -jar ./target/jvpp-benchmark*executable.jar -p aclSize=1000
 
 echo "100 JVP forks, 1 invocation each (single shot mode), no warmup, aclSize=100"
-sudo java -jar ./target/jvpp-benchmark-exec.jar -bm ss -f 100 -i 1 -wi 0
+sudo java -jar ./target/jvpp-benchmark*executable.jar -bm ss -f 100 -i 1 -wi 0
 
 echo "100 JVP forks, 1 invocation each (single shot mode), no warmup, aclSize=1000"
-sudo java -jar ./target/jvpp-benchmark-exec.jar -bm ss -f 100 -i 1 -wi 0 -p aclSize=1000
+sudo java -jar ./target/jvpp-benchmark*executable.jar -bm ss -f 100 -i 1 -wi 0 -p aclSize=1000
 
 echo "100 JVP forks, 1 iteration each, no warmup, aclSize=100"
-sudo java -jar ./target/jvpp-benchmark-exec.jar -f 100 -i 1 -wi 0
+sudo java -jar ./target/jvpp-benchmark*executable.jar -f 100 -i 1 -wi 0
 
 echo "100 JVP forks, 1 iteration each, no warmup, aclSize=1000"
-sudo java -jar ./target/jvpp-benchmark-exec.jar -f 100 -i 1 -wi 0 -p aclSize=1000
\ No newline at end of file
+sudo java -jar ./target/jvpp-benchmark*executable.jar -f 100 -i 1 -wi 0 -p aclSize=1000
\ No newline at end of file
-- 
cgit 1.2.3-korg