manually prepare release candidates. + add KEYS. + add BUILD.md and include in README.md. + remove LGPL dependencies from build.sbt. + remove unmanaged dependencies from s2core/lib.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/65358884 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/65358884 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/65358884 Branch: refs/heads/branch-0.1.0 Commit: 653588847fc2cc355a62ecf8a8feb0345586ecd4 Parents: 0d1b466 Author: DO YUNG YOON <[email protected]> Authored: Mon Aug 8 23:58:55 2016 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Mon Aug 8 23:58:55 2016 +0900 ---------------------------------------------------------------------- .rat-excludes | 1 + BUILD.md | 19 +++++++++++ CHANGES | 2 ++ KEYS | 45 ++++++++++++++++++++++++++ README.md | 5 +++ build.sbt | 4 +-- dev_support/docker-compose.yml | 2 +- s2core/build.sbt | 1 - s2core/lib/asynchbase-1.7.2-SNAPSHOT.jar | Bin 5594923 -> 0 bytes s2counter_core/build.sbt | 1 - s2counter_loader/build.sbt | 2 -- 11 files changed, 75 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/.rat-excludes ---------------------------------------------------------------------- diff --git a/.rat-excludes b/.rat-excludes index 370a741..249a3c6 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -6,6 +6,7 @@ rat.out sbt sbt.boot.lock README.md +BUILD.md s2core/README.md .gitignore .git http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/BUILD.md ---------------------------------------------------------------------- diff --git a/BUILD.md b/BUILD.md new file mode 100644 index 0000000..2e21dce --- /dev/null +++ b/BUILD.md @@ -0,0 +1,19 @@ +## Build From Source + +1. An [SBT](http://www.scala-sbt.org/) installation +> `brew install sbt` if you are on a Mac. (Otherwise, checkout the [SBT document](http://www.scala-sbt.org/0.13/docs/Manual-Installation.html). + +2. Download third_party dependencies. + 3. download [mysql-jdbc-connector](http://dev.mysql.com/downloads/connector/j/) and locate it into `s2core/lib` and `s2counter_core` + 4. download [patched-asynchbase](https://github.com/SteamShon/asynchbase/blob/mvn-repo/org/hbase/asynchbase/1.7.2-S2GRAPH/asynchbase-1.7.2-S2GRAPH-jar-with-dependencies.jar) and locate it into `s2core/lib` + +2. build and package from source code. +> `sbt package` to create a package at the directory `target/deploy` + +once build is done, `target/s2graph-0.1.0-incubating-bin` will be created. + +then `bin/start-s2graph.sh` will launch the following. + +1. S2Graph server. +2. Standalone HBase server as the data storage. +3. H2 as metastore. http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 091d5bf..5a2eb40 100644 --- a/CHANGES +++ b/CHANGES @@ -145,6 +145,8 @@ Release 0.12.1 - unreleased S2GRAPH-88: Add DISCLAIMER, LICENSE, NOTICE on packaging process. (Contributed by Jong Wook Kim<[email protected]>, committed by DOYUNG YOON) + + S2GRAPH-89: Change version number on project. (Committed by DOYUNG YOON). TEST http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/KEYS ---------------------------------------------------------------------- diff --git a/KEYS b/KEYS new file mode 100644 index 0000000..548aef6 --- /dev/null +++ b/KEYS @@ -0,0 +1,45 @@ +This file contains the PGP keys of various developers. + +Users: pgp < KEYS +or + gpg --import KEYS + + +Developers: + pgp -kxa <your name> and append it to this file. +or + (pgpk -ll <your name> && pgpk -xa <your name>) >> this file. +or + (gpg --list-sigs <your name> + && gpg --armor --export <your name>) >> this file. + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQENBFZetVQBCAC7Q4hEzLYmH9+hymFdj8uSAfYAIxZlawFuwf3TMM72gSGqwEQG +kcOhquA4L5VAk0mfedCUt9mexnEn1wsToeuuW2mJOm3807GEpJ/ZczZqzI8kMJLy +MinrwLI1ODwFSpviKktakFWW1p/6CCgn6M5u7LUU4CzPWB5ytKUwFfM9d4qmsGV5 +i3XF4G8jb7I/5jzqIXxIDWsJqRCpTm5cg7ESrnb7zddvWwsDbjbl4K+b9JoD9O71 +nkyxQGDXjGnwVrhN0VTstKGK8eHdoYvS3hZD37nz5hwyBjHcRDY3IgsnW5xmK3L3 +WBFzhLqvgrSB6IvfouNparvQQEnxzaoJulUXABEBAAG0H0RPIFlVTkcgWU9PTiA8 +c2hvbTgzQGdtYWlsLmNvbT6JATgEEwECACIFAlZetVQCGwMGCwkIBwMCBhUIAgkK +CwQWAgMBAh4BAheAAAoJEJUYLMAjBmYkTuUH/04FwKrFxZPOZVloMvp0t6otoFUW +q+gv9Fy1xaO551mXV4ZQvmmu54PFOThNNRFz6G8afJCv2YaVQRPeUvgjg2gs2GWf +qKv53zy4s26YKkwWLbSebdfAAT3zGs4fWoFhl8PYW5vnL3N+btRoNJIyZeWax8hb +Dz/eDe1mrPxO2sV910JAIjn7VfEPe3gojzT4ig+sfj8mZL4AYLRtPCvZuvYnuxf7 +JEsk0zqdX5d6AjNfwZGdE9A8l25V0C6BT+S7VSSHAXQhPJLdb2kVJN22/xGvkzYF +IfxkXR+EohojD1wTm4Xc4453uJ8pWjbgRbxdBPb0DFN9bbVyXVBlE5iOZhC5AQ0E +Vl61VAEIAMLsduIOOiU+EwbawGvGfap6L4Jm6wZDr7p2qDdBXixHrPZM+3aqb9DV +b48Y/KjKXxnu77aETS1ENfxHuShk6DCxoPRTuggQK/KKvP05TeyYIPxdCICmvjQs +zesZfVlRPMUfHaZLijMEw/YXnEhwZiweIe0DSnAUdT+g6APKJlXKd31zQcukStSR +h7lko9rK0JVTEAvUi86isdc8w55/m4Xvts78CsL5M4pRV96pXsNFM4udmC9vO0Kk +mJTCS5jknJFf8MRMAgVlOyYF372uDtmBaRgETmnPQ7llBjHtquAI+f9reK3lE8yg +RP2WE/CozqP6tjlaHXTJnfaE+ZqWaw0AEQEAAYkBHwQYAQIACQUCVl61VAIbDAAK +CRCVGCzAIwZmJOTdB/4xQrKdL5UOkpcOAwsL6Rcd07DDFULE4V2cFLOzzdN+G9/y +7AKMNtbQLcKboe/m+4LEc9lWB5WTnHQNKMJ+bet9xqOgsv5Ok5O/iNw9CBMCUkpk +rq9Yfa5fhN6gQ5p/RInGEADKrIoTfTlMN4F+QGjuiwh5lFweVYQlBS37tbxITJLd +YBrgMj5kjTzFCxdnJxHD8ZuhOhHs610rOzaZ1KYU1ZY7ykYZVV/dznhTPNZXy7dW +cxOIjGS9xsp7Ey+ePdDxLfVNgBq3D41bsWeGl2snbd8LAj7jsHWHh3QM6g4VLLhY +I/ARan0VFAo6bcEKvcSCGovKvzVqESvnIxe7agav +=iAmg +-----END PGP PUBLIC KEY BLOCK----- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 409b120..cbee40f 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,11 @@ **S2Graph** is a **graph database** designed to handle transactional graph processing at scale. Its REST API allows you to store, manage and query relational information using **edge** and **vertex** representations in a **fully asynchronous** and **non-blocking** manner. This document covers some basic concepts and terms of S2Graph as well as help you get a feel for the S2Graph API. + +**Build From Source** +== +Follow the steps in the [documentation](BUILD.md) to build and install S2Graph from source. + **Quick Start (with Vagrant)** == http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index d3c6692..c973ffe 100755 --- a/build.sbt +++ b/build.sbt @@ -20,9 +20,9 @@ name := "s2graph" lazy val commonSettings = Seq( - organization := "com.kakao.s2graph", + organization := "org.apache.s2graph", scalaVersion := "2.11.7", - version := "0.12.1-SNAPSHOT", + version := "0.1.0", scalacOptions := Seq("-language:postfixOps", "-unchecked", "-deprecation", "-feature", "-Xlint"), javaOptions ++= collection.JavaConversions.propertiesAsScalaMap(System.getProperties).map { case (key, value) => "-D" + key + "=" + value }.toSeq, testOptions in Test += Tests.Argument("-oDF"), http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/dev_support/docker-compose.yml ---------------------------------------------------------------------- diff --git a/dev_support/docker-compose.yml b/dev_support/docker-compose.yml index ba9d489..156c3fa 100644 --- a/dev_support/docker-compose.yml +++ b/dev_support/docker-compose.yml @@ -1,5 +1,5 @@ graph: - image: s2rest_play:0.12.1-SNAPSHOT + image: s2rest_play:0.1.0 container_name: graph net: container:graph_hbase http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/s2core/build.sbt ---------------------------------------------------------------------- diff --git a/s2core/build.sbt b/s2core/build.sbt index 46c2795..02e5a0e 100644 --- a/s2core/build.sbt +++ b/s2core/build.sbt @@ -36,7 +36,6 @@ libraryDependencies ++= Seq( "commons-pool" % "commons-pool" % "1.6", "org.scalatest" %% "scalatest" % "2.2.4" % "test", "org.scalikejdbc" %% "scalikejdbc" % "2.1.+", - "mysql" % "mysql-connector-java" % "5.1.28", "com.h2database" % "h2" % "1.4.192", "com.github.danielwegener" % "logback-kafka-appender" % "0.0.4" ) http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/s2core/lib/asynchbase-1.7.2-SNAPSHOT.jar ---------------------------------------------------------------------- diff --git a/s2core/lib/asynchbase-1.7.2-SNAPSHOT.jar b/s2core/lib/asynchbase-1.7.2-SNAPSHOT.jar deleted file mode 100644 index ade9f82..0000000 Binary files a/s2core/lib/asynchbase-1.7.2-SNAPSHOT.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/s2counter_core/build.sbt ---------------------------------------------------------------------- diff --git a/s2counter_core/build.sbt b/s2counter_core/build.sbt index d4c0bdf..594eea8 100644 --- a/s2counter_core/build.sbt +++ b/s2counter_core/build.sbt @@ -38,7 +38,6 @@ libraryDependencies ++= Seq( "org.apache.hadoop" % "hadoop-hdfs" % Common.hadoopVersion, "redis.clients" % "jedis" % "2.6.0", "org.apache.kafka" % "kafka-clients" % "0.8.2.0", - "mysql" % "mysql-connector-java" % "5.1.28", "org.scalikejdbc" %% "scalikejdbc" % "2.1.+", "org.specs2" %% "specs2-core" % "3.6" % "test", "org.scalatest" %% "scalatest" % "2.2.1" % "test" http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/65358884/s2counter_loader/build.sbt ---------------------------------------------------------------------- diff --git a/s2counter_loader/build.sbt b/s2counter_loader/build.sbt index 27f08f5..d7a6123 100644 --- a/s2counter_loader/build.sbt +++ b/s2counter_loader/build.sbt @@ -21,8 +21,6 @@ import sbtassembly.Plugin.AssemblyKeys._ name := "s2counter-loader" -version := "0.12.1-SNAPSHOT" - scalacOptions in Test ++= Seq("-Yrangepos") libraryDependencies ++= Seq(
