Skip to content

Commit 3f582f9

Browse files
carsonwangcarsonwang
authored
Merge pull request #386 from carsonwang/prepare6.0
Prepare HiBench 6.0 release
2 parents 464ffeb + 1ae5174 commit 3f582f9

File tree

27 files changed

+52
-51
lines changed

27 files changed

+52
-51
lines changed

‎autogen/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hibench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<artifactId>autogen</artifactId>

‎common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<parent>
2424
<groupId>com.intel.hibench</groupId>
2525
<artifactId>hibench</artifactId>
26-
<version>6.0-SNAPSHOT</version>
26+
<version>6.0</version>
2727
</parent>
2828

2929
<groupId>com.intel.hibench</groupId>
3030
<artifactId>hibench-common</artifactId>
3131
<packaging>jar</packaging>
32-
<version>6.0-SNAPSHOT</version>
32+
<version>6.0</version>
3333
<name>hibench-common</name>
3434

3535
<dependencies>

‎conf/hibench.conf

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ hibench.configure.dir ${hibench.home}/conf
3232
hibench.hdfs.data.dir ${hibench.hdfs.master}/HiBench
3333

3434
# path of hibench jars
35-
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-SNAPSHOT-jar-with-dependencies.jar
36-
hibench.common.jar ${hibench.home}/common/target/hibench-common-6.0-SNAPSHOT-jar-with-dependencies.jar
37-
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-SNAPSHOT-dist.jar
38-
hibench.streambench.stormbench.jar ${hibench.home}/stormbench/streaming/target/stormbench-streaming-6.0-SNAPSHOT.jar
39-
hibench.streambench.gearpump.jar ${hibench.home}/gearpumpbench/streaming/target/gearpumpbench-streaming-6.0-SNAPSHOT-jar-with-dependencies.jar
40-
hibench.streambench.flinkbench.jar ${hibench.home}/flinkbench/streaming/target/flinkbench-streaming-6.0-SNAPSHOT-jar-with-dependencies.jar
35+
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-jar-with-dependencies.jar
36+
hibench.common.jar ${hibench.home}/common/target/hibench-common-6.0-jar-with-dependencies.jar
37+
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-dist.jar
38+
hibench.streambench.stormbench.jar ${hibench.home}/stormbench/streaming/target/stormbench-streaming-6.0.jar
39+
hibench.streambench.gearpump.jar ${hibench.home}/gearpumpbench/streaming/target/gearpumpbench-streaming-6.0-jar-with-dependencies.jar
40+
hibench.streambench.flinkbench.jar ${hibench.home}/flinkbench/streaming/target/flinkbench-streaming-6.0-jar-with-dependencies.jar
4141

4242
#======================================================
4343
# workload home/input/ouput path

‎docker/base/base-core

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ ENV PATH $PATH:/usr/local/apache-maven/bin
7979
ENV HIBENCH_HOME /root/HiBench
8080

8181
# download right version of HiBench
82-
RUN wget https://github.com/intel-hadoop/HiBench/archive/master.zip
83-
RUN unzip master.zip -d /root/
84-
RUN mv /root/HiBench-master ${HIBENCH_HOME}
85-
RUN rm -f master.zip
82+
RUN wget https://github.com/intel-hadoop/HiBench/archive/HiBench-6.0.zip
83+
RUN unzip HiBench-6.0.zip -d /root/
84+
RUN mv /root/HiBench-HiBench-6.0 ${HIBENCH_HOME}
85+
RUN rm -f HiBench-6.0.zip
8686
COPY conf/spark.conf ${HIBENCH_HOME}/conf/
8787
COPY conf/hadoop.conf ${HIBENCH_HOME}/conf/
8888
COPY conf/hibench.conf ${HIBENCH_HOME}/conf/

‎docker/base/conf/hibench.conf

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ hibench.configure.dir ${hibench.home}/conf
2626
hibench.hdfs.data.dir ${hibench.hdfs.master}/HiBench
2727

2828
# path of hibench jars
29-
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-SNAPSHOT-jar-with-dependencies.jar
30-
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-SNAPSHOT-dist.jar
31-
hibench.streambench.stormbench.jar ${hibench.home}/stormbench/streaming/target/stormbench-streaming-6.0-SNAPSHOT.jar
32-
hibench.streambench.gearpump.jar ${hibench.home}/gearpumpbench/streaming/target/gearpumpbench-streaming-6.0-SNAPSHOT-jar-with-dependencies.jar
33-
hibench.streambench.flinkbench.jar ${hibench.home}/flinkbench/streaming/target/flinkbench-streaming-6.0-SNAPSHOT-jar-with-dependencies.jar
29+
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-jar-with-dependencies.jar
30+
hibench.common.jar ${hibench.home}/common/target/hibench-common-6.0-jar-with-dependencies.jar
31+
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-dist.jar
32+
hibench.streambench.stormbench.jar ${hibench.home}/stormbench/streaming/target/stormbench-streaming-6.0.jar
33+
hibench.streambench.gearpump.jar ${hibench.home}/gearpumpbench/streaming/target/gearpumpbench-streaming-6.0-jar-with-dependencies.jar
34+
hibench.streambench.flinkbench.jar ${hibench.home}/flinkbench/streaming/target/flinkbench-streaming-6.0-jar-with-dependencies.jar
3435

3536
#======================================================
3637
# workload home/input/ouput path

‎flinkbench/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hibench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench</groupId>
1313
<artifactId>flinkbench</artifactId>
1414
<packaging>pom</packaging>
15-
<version>6.0-SNAPSHOT</version>
15+
<version>6.0</version>
1616
<name>flinkbench</name>
1717

1818
<profiles>

‎flinkbench/streaming/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.intel.hibench</groupId>
2525
<artifactId>flinkbench</artifactId>
26-
<version>6.0-SNAPSHOT</version>
26+
<version>6.0</version>
2727
</parent>
2828

2929
<groupId>com.intel.hibench.flinkbench</groupId>

‎gearpumpbench/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hibench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench</groupId>
1313
<artifactId>gearpumpbench</artifactId>
1414
<packaging>pom</packaging>
15-
<version>6.0-SNAPSHOT</version>
15+
<version>6.0</version>
1616
<name>gearpumpbench</name>
1717

1818
<profiles>

‎gearpumpbench/streaming/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.intel.hibench</groupId>
2525
<artifactId>gearpumpbench</artifactId>
26-
<version>6.0-SNAPSHOT</version>
26+
<version>6.0</version>
2727
</parent>
2828

2929
<groupId>com.intel.hibench.gearpumpbench</groupId>

‎hadoopbench/mahout/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hadoopbench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench.hadoopbench</groupId>

‎hadoopbench/nutchindexing/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>com.intel.hibench</groupId>
77
<artifactId>hadoopbench</artifactId>
8-
<version>6.0-SNAPSHOT</version>
8+
<version>6.0</version>
99
</parent>
1010

1111
<groupId>com.intel.hibench.hadoopbench</groupId>
1212
<artifactId>nutchindexing</artifactId>
13-
<version>6.0-SNAPSHOT</version>
13+
<version>6.0</version>
1414
<packaging>jar</packaging>
1515

1616
<dependencies>

‎hadoopbench/pegasus/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hadoopbench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench.hadoopbench</groupId>

‎hadoopbench/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hibench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench</groupId>
1313
<artifactId>hadoopbench</artifactId>
1414
<packaging>pom</packaging>
15-
<version>6.0-SNAPSHOT</version>
15+
<version>6.0</version>
1616
<name>hadoopbench</name>
1717

1818
<profiles>

‎hadoopbench/sql/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hadoopbench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench.hadoopbench</groupId>
1313
<artifactId>hadoopbench-sql</artifactId>
14-
<version>6.0-SNAPSHOT</version>
14+
<version>6.0</version>
1515
<packaging>jar</packaging>
1616
<name>hadoopbench-sql</name>
1717

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.intel.hibench</groupId>
77
<artifactId>hibench</artifactId>
8-
<version>6.0-SNAPSHOT</version>
8+
<version>6.0</version>
99
<packaging>pom</packaging>
1010
<name>hibench</name>
1111
<url>http://maven.apache.org</url>

‎sparkbench/assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>sparkbench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench.sparkbench</groupId>

‎sparkbench/common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.intel.hibench</groupId>
99
<artifactId>sparkbench</artifactId>
10-
<version>6.0-SNAPSHOT</version>
10+
<version>6.0</version>
1111
</parent>
1212

1313
<groupId>com.intel.hibench.sparkbench</groupId>

‎sparkbench/graph/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>sparkbench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench.sparkbench</groupId>
1313
<artifactId>sparkbench-graph</artifactId>
1414
<packaging>jar</packaging>
15-
<version>6.0-SNAPSHOT</version>
15+
<version>6.0</version>
1616
<name>sparkbench-graph</name>
1717

1818
<dependencies>

‎sparkbench/micro/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.intel.hibench</groupId>
99
<artifactId>sparkbench</artifactId>
10-
<version>6.0-SNAPSHOT</version>
10+
<version>6.0</version>
1111
</parent>
1212

1313
<groupId>com.intel.hibench.sparkbench</groupId>

‎sparkbench/ml/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>sparkbench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench.sparkbench</groupId>

‎sparkbench/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hibench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench</groupId>
1313
<artifactId>sparkbench</artifactId>
1414
<packaging>pom</packaging>
15-
<version>6.0-SNAPSHOT</version>
15+
<version>6.0</version>
1616
<name>sparkbench</name>
1717

1818
<modules>

‎sparkbench/sql/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<parent>
88
<groupId>com.intel.hibench</groupId>
99
<artifactId>sparkbench</artifactId>
10-
<version>6.0-SNAPSHOT</version>
10+
<version>6.0</version>
1111
</parent>
1212

1313
<groupId>com.intel.hibench.sparkbench</groupId>
1414
<artifactId>sparkbench-sql</artifactId>
1515
<packaging>jar</packaging>
16-
<version>6.0-SNAPSHOT</version>
16+
<version>6.0</version>
1717
<name>sparkbench-sql</name>
1818

1919
<dependencies>

‎sparkbench/streaming/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>sparkbench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench.sparkbench</groupId>

‎sparkbench/websearch/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>sparkbench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench.sparkbench</groupId>
1313
<artifactId>sparkbench-websearch</artifactId>
1414
<packaging>jar</packaging>
15-
<version>6.0-SNAPSHOT</version>
15+
<version>6.0</version>
1616
<name>sparkbench-websearch</name>
1717

1818
<dependencies>

‎stormbench/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.intel.hibench</groupId>
88
<artifactId>hibench</artifactId>
9-
<version>6.0-SNAPSHOT</version>
9+
<version>6.0</version>
1010
</parent>
1111

1212
<groupId>com.intel.hibench</groupId>
1313
<artifactId>stormbench</artifactId>
1414
<packaging>pom</packaging>
15-
<version>6.0-SNAPSHOT</version>
15+
<version>6.0</version>
1616
<name>stormbench</name>
1717

1818
<profiles>

‎stormbench/streaming/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.intel.hibench</groupId>
2525
<artifactId>stormbench</artifactId>
26-
<version>6.0-SNAPSHOT</version>
26+
<version>6.0</version>
2727
</parent>
2828

2929
<groupId>com.intel.hibench.stormbench</groupId>

‎travis/hibench.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ hibench.configure.dir ${hibench.home}/conf
2929
hibench.hdfs.data.dir ${hibench.hdfs.master}/HiBench
3030

3131
# path of hibench datatools
32-
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-SNAPSHOT-jar-with-dependencies.jar
32+
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-jar-with-dependencies.jar
3333

34-
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-SNAPSHOT-dist.jar
34+
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-dist.jar
3535

3636
#======================================================
3737
# workload home/input/ouput path

0 commit comments

Comments
 (0)