[PMEM-COMMON-20] update to 1.2.0-snapshot

oap-project · Jun 16, 2021 · e05934d · e05934d
1 parent 905a4a5
commit e05934d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change log
 Generated on 2021-06-02
 
-## Release 1.1.1
+## Release 1.1.0
 
 ### Native SQL Engine
 

diff --git a/docs/OAP-Developer-Guide.md b/docs/OAP-Developer-Guide.md
@@ -4,12 +4,12 @@ This document contains the instructions & scripts on installing necessary depend
 You can get more detailed information from OAP each module below.
 
 * [SQL Index and Data Source Cache](https://github.com/oap-project/sql-ds-cache/blob/v1.1.1-spark-3.1.1/docs/Developer-Guide.md)
-* [PMem Common](https://github.com/oap-project/pmem-common/tree/v1.1.1-spark-3.1.1)
-* [PMem Spill](https://github.com/oap-project/pmem-spill/tree/v1.1.1-spark-3.1.1)
-* [PMem Shuffle](https://github.com/oap-project/pmem-shuffle/tree/v1.1.1-spark-3.1.1#5-install-dependencies-for-pmem-shuffle)
-* [Remote Shuffle](https://github.com/oap-project/remote-shuffle/tree/v1.1.1-spark-3.1.1)
-* [OAP MLlib](https://github.com/oap-project/oap-mllib/tree/v1.1.1-spark-3.1.1)
-* [Native SQL Engine](https://github.com/oap-project/native-sql-engine/tree/v1.1.1-spark-3.1.1)
+* [PMem Common](https://github.com/oap-project/pmem-common/tree/v1.2.0-spark-3.1.1)
+* [PMem Spill](https://github.com/oap-project/pmem-spill/tree/v1.2.0-spark-3.1.1)
+* [PMem Shuffle](https://github.com/oap-project/pmem-shuffle/tree/v1.2.0-spark-3.1.1#5-install-dependencies-for-pmem-shuffle)
+* [Remote Shuffle](https://github.com/oap-project/remote-shuffle/tree/v1.2.0-spark-3.1.1)
+* [OAP MLlib](https://github.com/oap-project/oap-mllib/tree/v1.2.0-spark-3.1.1)
+* [Native SQL Engine](https://github.com/oap-project/native-sql-engine/tree/v1.2.0-spark-3.1.1)
 
 ## Building OAP
 

diff --git a/docs/OAP-Installation-Guide.md b/docs/OAP-Installation-Guide.md
@@ -29,14 +29,14 @@ Create a Conda environment and install OAP Conda package.
 ```bash
 $ conda create -n oapenv -y python=3.7
 $ conda activate oapenv
-$ conda install -c conda-forge -c intel -y oap=1.1.1
+$ conda install -c conda-forge -c intel -y oap=1.2.0
 ```
 
 Once finished steps above, you have completed OAP dependencies installation and OAP building, and will find built OAP jars under `$HOME/miniconda2/envs/oapenv/oap_jars`
 
 Dependencies below are required by OAP and all of them are included in OAP Conda package, they will be automatically installed in your cluster when you Conda install OAP. Ensure you have activated environment which you created in the previous steps.
 
-- [Arrow](https://github.com/oap-project/arrow/tree/arrow-4.0.0-oap-1.1.1)
+- [Arrow](https://github.com/oap-project/arrow/tree/arrow-4.0.0-oap-1.2.0)
 - [Plasma](http://arrow.apache.org/blog/2017/08/08/plasma-in-memory-object-store/)
 - [Memkind](https://github.com/memkind/memkind/tree/v1.10.1)
 - [Vmemcache](https://github.com/pmem/vmemcache.git)

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -19,5 +19,5 @@ theme: readthedocs
 plugins:
   - search
   - mkdocs-versioning:
-      version: 1.1.1
+      version: 1.2.0
       exclude_from_nav: ["image", "js", "css", "fonts", "img"]
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 
     <groupId>com.intel.oap</groupId>
     <artifactId>pmem-common</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0-snapshot</version>
     <name>OAP Project PMem Common</name>
     <packaging>jar</packaging>
 
@@ -28,7 +28,7 @@
         <junit.version>4.12</junit.version>
         <pmemkv.version>1.0.0</pmemkv.version>
         <slf4j.version>1.7.16</slf4j.version>
-        <spark.version>3.0.0</spark.version>
+        <spark.version>3.1.1</spark.version>
     </properties>
 
     <dependencies>