Skip to content

Commit

Permalink
update version to 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@carsonwang
carsonwang committed Nov 21, 2016
1 parent 5cb559c commit 1ae5174
Show file tree
Hide file tree
Showing 27 changed files with 52 additions and 51 deletions.
2 changes: 1 addition & 1 deletion autogen/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hibench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<artifactId>autogen</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions common/pom.xml
View file
Expand Up @@ -23,13 +23,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hibench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench</groupId>
<artifactId>hibench-common</artifactId>
<packaging>jar</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>hibench-common</name>

<dependencies>
Expand Down
12 changes: 6 additions & 6 deletions conf/hibench.conf
View file
Expand Up @@ -32,12 +32,12 @@ hibench.configure.dir ${hibench.home}/conf
hibench.hdfs.data.dir ${hibench.hdfs.master}/HiBench

# path of hibench jars
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-SNAPSHOT-jar-with-dependencies.jar
hibench.common.jar ${hibench.home}/common/target/hibench-common-6.0-SNAPSHOT-jar-with-dependencies.jar
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-SNAPSHOT-dist.jar
hibench.streambench.stormbench.jar ${hibench.home}/stormbench/streaming/target/stormbench-streaming-6.0-SNAPSHOT.jar
hibench.streambench.gearpump.jar ${hibench.home}/gearpumpbench/streaming/target/gearpumpbench-streaming-6.0-SNAPSHOT-jar-with-dependencies.jar
hibench.streambench.flinkbench.jar ${hibench.home}/flinkbench/streaming/target/flinkbench-streaming-6.0-SNAPSHOT-jar-with-dependencies.jar
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-jar-with-dependencies.jar
hibench.common.jar ${hibench.home}/common/target/hibench-common-6.0-jar-with-dependencies.jar
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-dist.jar
hibench.streambench.stormbench.jar ${hibench.home}/stormbench/streaming/target/stormbench-streaming-6.0.jar
hibench.streambench.gearpump.jar ${hibench.home}/gearpumpbench/streaming/target/gearpumpbench-streaming-6.0-jar-with-dependencies.jar
hibench.streambench.flinkbench.jar ${hibench.home}/flinkbench/streaming/target/flinkbench-streaming-6.0-jar-with-dependencies.jar

#======================================================
# workload home/input/ouput path
Expand Down
8 changes: 4 additions & 4 deletions docker/base/base-core
View file
Expand Up @@ -79,10 +79,10 @@ ENV PATH $PATH:/usr/local/apache-maven/bin
ENV HIBENCH_HOME /root/HiBench

# download right version of HiBench
RUN wget https://github.com/intel-hadoop/HiBench/archive/master.zip
RUN unzip master.zip -d /root/
RUN mv /root/HiBench-master ${HIBENCH_HOME}
RUN rm -f master.zip
RUN wget https://github.com/intel-hadoop/HiBench/archive/HiBench-6.0.zip
RUN unzip HiBench-6.0.zip -d /root/
RUN mv /root/HiBench-HiBench-6.0 ${HIBENCH_HOME}
RUN rm -f HiBench-6.0.zip
COPY conf/spark.conf ${HIBENCH_HOME}/conf/
COPY conf/hadoop.conf ${HIBENCH_HOME}/conf/
COPY conf/hibench.conf ${HIBENCH_HOME}/conf/
Expand Down
11 changes: 6 additions & 5 deletions docker/base/conf/hibench.conf
View file
Expand Up @@ -26,11 +26,12 @@ hibench.configure.dir ${hibench.home}/conf
hibench.hdfs.data.dir ${hibench.hdfs.master}/HiBench

# path of hibench jars
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-SNAPSHOT-jar-with-dependencies.jar
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-SNAPSHOT-dist.jar
hibench.streambench.stormbench.jar ${hibench.home}/stormbench/streaming/target/stormbench-streaming-6.0-SNAPSHOT.jar
hibench.streambench.gearpump.jar ${hibench.home}/gearpumpbench/streaming/target/gearpumpbench-streaming-6.0-SNAPSHOT-jar-with-dependencies.jar
hibench.streambench.flinkbench.jar ${hibench.home}/flinkbench/streaming/target/flinkbench-streaming-6.0-SNAPSHOT-jar-with-dependencies.jar
hibench.hibench.datatool.dir ${hibench.home}/autogen/target/autogen-6.0-jar-with-dependencies.jar
hibench.common.jar ${hibench.home}/common/target/hibench-common-6.0-jar-with-dependencies.jar
hibench.sparkbench.jar ${hibench.home}/sparkbench/assembly/target/sparkbench-assembly-6.0-dist.jar
hibench.streambench.stormbench.jar ${hibench.home}/stormbench/streaming/target/stormbench-streaming-6.0.jar
hibench.streambench.gearpump.jar ${hibench.home}/gearpumpbench/streaming/target/gearpumpbench-streaming-6.0-jar-with-dependencies.jar
hibench.streambench.flinkbench.jar ${hibench.home}/flinkbench/streaming/target/flinkbench-streaming-6.0-jar-with-dependencies.jar

#======================================================
# workload home/input/ouput path
Expand Down
4 changes: 2 additions & 2 deletions flinkbench/pom.xml
View file
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hibench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench</groupId>
<artifactId>flinkbench</artifactId>
<packaging>pom</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>flinkbench</name>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion flinkbench/streaming/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>flinkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.flinkbench</groupId>
Expand Down
4 changes: 2 additions & 2 deletions gearpumpbench/pom.xml
View file
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hibench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench</groupId>
<artifactId>gearpumpbench</artifactId>
<packaging>pom</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>gearpumpbench</name>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion gearpumpbench/streaming/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>gearpumpbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.gearpumpbench</groupId>
Expand Down
2 changes: 1 addition & 1 deletion hadoopbench/mahout/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hadoopbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.hadoopbench</groupId>
Expand Down
4 changes: 2 additions & 2 deletions hadoopbench/nutchindexing/pom.xml
View file
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hadoopbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.hadoopbench</groupId>
<artifactId>nutchindexing</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion hadoopbench/pegasus/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hadoopbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.hadoopbench</groupId>
Expand Down
4 changes: 2 additions & 2 deletions hadoopbench/pom.xml
View file
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hibench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench</groupId>
<artifactId>hadoopbench</artifactId>
<packaging>pom</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>hadoopbench</name>

<profiles>
Expand Down
4 changes: 2 additions & 2 deletions hadoopbench/sql/pom.xml
View file
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hadoopbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.hadoopbench</groupId>
<artifactId>hadoopbench-sql</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<packaging>jar</packaging>
<name>hadoopbench-sql</name>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -5,7 +5,7 @@

<groupId>com.intel.hibench</groupId>
<artifactId>hibench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<packaging>pom</packaging>
<name>hibench</name>
<url>http://maven.apache.org</url>
Expand Down
2 changes: 1 addition & 1 deletion sparkbench/assembly/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.sparkbench</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sparkbench/common/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.sparkbench</groupId>
Expand Down
4 changes: 2 additions & 2 deletions sparkbench/graph/pom.xml
View file
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.sparkbench</groupId>
<artifactId>sparkbench-graph</artifactId>
<packaging>jar</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>sparkbench-graph</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion sparkbench/micro/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.sparkbench</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sparkbench/ml/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.sparkbench</groupId>
Expand Down
4 changes: 2 additions & 2 deletions sparkbench/pom.xml
View file
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hibench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<packaging>pom</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>sparkbench</name>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions sparkbench/sql/pom.xml
View file
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.sparkbench</groupId>
<artifactId>sparkbench-sql</artifactId>
<packaging>jar</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>sparkbench-sql</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion sparkbench/streaming/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.sparkbench</groupId>
Expand Down
4 changes: 2 additions & 2 deletions sparkbench/websearch/pom.xml
View file
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>sparkbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.sparkbench</groupId>
<artifactId>sparkbench-websearch</artifactId>
<packaging>jar</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>sparkbench-websearch</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions stormbench/pom.xml
View file
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>hibench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench</groupId>
<artifactId>stormbench</artifactId>
<packaging>pom</packaging>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
<name>stormbench</name>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion stormbench/streaming/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.intel.hibench</groupId>
<artifactId>stormbench</artifactId>
<version>6.0-SNAPSHOT</version>
<version>6.0</version>
</parent>

<groupId>com.intel.hibench.stormbench</groupId>
Expand Down
4 changes: 2 additions & 2 deletions travis/hibench.conf
View file
Expand Up @@ -29,9 +29,9 @@ hibench.configure.dir ${hibench.home}/conf
hibench.hdfs.data.dir ${hibench.hdfs.master}/HiBench

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

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

#======================================================
# workload home/input/ouput path
Expand Down

0 comments on commit 1ae5174

Please sign in to comment.