You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2016/08/08 14:58:08 UTC
[1/2] incubator-s2graph git commit: [S2GRAPH-88]: include LICENSE,
NOTICE and DISCLAIMER in the binary release. [Forced Update!]
Repository: incubator-s2graph
Updated Branches:
refs/heads/branch-0.1.0 9174d899d -> 653588847 (forced update)
[S2GRAPH-88]: include LICENSE, NOTICE and DISCLAIMER in the binary release.
JIRA:
[S2GRAPH-88] https://issues.apache.org/jira/browse/S2GRAPH-88
Pull Request:
Closes #61
Authors:
Jong Wook Kim: jongwook@nyu.edu
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/0d1b4661
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/0d1b4661
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/0d1b4661
Branch: refs/heads/branch-0.1.0
Commit: 0d1b466162bc19315a4509ed054c89a0c93f3c2f
Parents: cf06feb
Author: DO YUNG YOON <st...@apache.org>
Authored: Mon Jun 20 09:37:56 2016 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Mon Jun 20 09:37:56 2016 +0900
----------------------------------------------------------------------
CHANGES | 3 +
DISCLAIMER | 11 +++
LICENSE | 203 ++++++++++++++++++++++++++++++++++++++++++++
LICENSE.txt | 203 --------------------------------------------
NOTICE | 5 ++
project/Packager.scala | 32 +++++--
6 files changed, 246 insertions(+), 211 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/0d1b4661/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 436cca4..091d5bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -143,6 +143,9 @@ Release 0.12.1 - unreleased
S2GRAPH-81: Separate Serializable's toKeyValues into 3, toRowKey, toQualifier, toValue. (Committed by DOYUNG YOON).
+ S2GRAPH-88: Add DISCLAIMER, LICENSE, NOTICE on packaging process.
+ (Contributed by Jong Wook Kim<jo...@nyu.edu>, committed by DOYUNG YOON)
+
TEST
S2GRAPH-21: Change PostProcessBenchmarkSpec not to store and fetch test data from storage. (Committed by DOYUNG YOON).
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/0d1b4661/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..5eba4ff
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,11 @@
+Apache S2Graph is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further
+review indicates that the infrastructure, communications, and decision
+making process have stabilized in a manner consistent with other
+successful ASF projects.
+
+While incubation status is not necessarily a reflection of the
+completeness or stability of the code, it does indicate that the
+project has yet to be fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/0d1b4661/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..9316742
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/0d1b4661/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 9316742..0000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/0d1b4661/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..4e67b28
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache S2Graph (incubating)
+Copyright 2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/0d1b4661/project/Packager.scala
----------------------------------------------------------------------
diff --git a/project/Packager.scala b/project/Packager.scala
index cff65fd..5a9a121 100644
--- a/project/Packager.scala
+++ b/project/Packager.scala
@@ -36,19 +36,27 @@ object Packager {
}
}
- val packagerTask = (baseDirectory, packagedJars, dependencyClasspath in Runtime, target, streams).map {
- (root, packaged, dependencies, target, streams) =>
- val base = target / "deploy"
+ val packagerTask = (baseDirectory, packagedJars, dependencyClasspath in Runtime, target, streams, version).map {
+ (root, packaged, dependencies, target, streams, version) =>
+ val name = s"s2graph-$version-incubating-bin"
+ val base = target / name
IO.delete(base)
IO.createDirectory(base)
val subdirectories = Seq("bin", "conf", "lib")
+ val files = Seq("LICENSE", "NOTICE", "DISCLAIMER")
for (dir <- subdirectories) {
IO.createDirectory(base / dir)
}
+ for (file <- files) {
+ val source = (root / file).toPath
+ val target = (base / file).toPath
+ Files.copy(source, target)
+ }
+
// copy jars to /lib
val libs = dependencies.filter(_.data.ext == "jar").map(_.data) ++ packaged
libs.foreach { jar =>
@@ -58,11 +66,11 @@ object Packager {
try {
// try to create hard links for speed and to save disk space
Files.createLink(target, source)
- streams.log.debug(s"created link: $source -> $target")
+ streams.log.debug(s"Created link: $source -> $target")
} catch {
case e: Any =>
Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING)
- streams.log.debug(s"copied: $source -> $target")
+ streams.log.debug(s"Copied: $source -> $target")
}
}
@@ -74,20 +82,28 @@ object Packager {
override def preVisitDirectory(dir: Path, attrs: BasicFileAttributes): FileVisitResult = {
val dest = target.resolve(source.relativize(dir))
Files.createDirectories(dest)
- streams.log.debug(s"created directory: $dest")
+ streams.log.debug(s"Created directory: $dest")
FileVisitResult.CONTINUE
}
override def visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult = {
val dest = target.resolve(source.relativize(file))
Files.copy(file, dest)
- streams.log.debug(s"copied: $file -> $dest")
+ streams.log.debug(s"Copied: $file -> $dest")
FileVisitResult.CONTINUE
}
})
}
- streams.log.info(s"package for distribution located at $base")
+ streams.log.info(s"Package for distribution located at $base")
+
+ {
+ import scala.sys.process._
+ streams.log.info(s"creating a tarball...")
+ s"tar zcf $base.tar.gz $base".!!
+ streams.log.info(s"Tarball is located at $base.tar.gz")
+ }
+
base
}
[2/2] incubator-s2graph git commit: 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.
Posted by st...@apache.org.
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 <st...@apache.org>
Authored: Mon Aug 8 23:58:55 2016 +0900
Committer: DO YUNG YOON <st...@apache.org>
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<jo...@nyu.edu>, 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(