Skip to content

Commit 5a4d4f3

Browse files
authored
Merge pull request #185 from ngageoint/release-docs
Issue 184: Documentation updates for 0.1.0 release
2 parents 4edb366 + 325d6da commit 5a4d4f3

7 files changed

Lines changed: 127 additions & 35 deletions

File tree

BUILDING.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Building JanusGraph
33

44
Required:
55

6-
* Java 7 (0.5 and earlier) or Java 8 (0.9 and later)
7-
* Maven
6+
* Java 8
7+
* Maven 3
88

99
To build without executing tests:
1010

@@ -18,18 +18,20 @@ To build with default tests:
1818
mvn clean install
1919
```
2020

21-
To build with default plus TinkerPop tests:
21+
To build with default plus TinkerPop tests\*:
2222

2323
```
2424
mvn clean install -Dtest.skip.tp=false
2525
```
2626

27-
To build with only the TinkerPop tests:
27+
To build with only the TinkerPop tests\*:
2828

2929
```
3030
mvn clean install -Dtest.skip.tp=false -DskipTests=true
3131
```
3232

33+
\* See note below for running tests with TinkerPop 3.2.3
34+
3335
## Building on Eclipse IDE
3436
Note that this has only been tested on Eclipse Neon.2 Release (4.6.2) with m2e (1.7.0.20160603-1933) and m2e-wtp (1.3.1.20160831-1005) plugin.
3537

@@ -48,3 +50,15 @@ To build without executing tests:
4850
To find the Java binary in your environment, run the appropriate command for your operating system:
4951
* Linux/macOS: `which java`
5052
* Windows: `for %i in (java.exe) do @echo. %~$PATH:i`
53+
54+
## Running tests with TinkerPop 3.2.3
55+
56+
Several TinkerPop tests require commit `7aa9782`, which was merged after the release of TinkerPop 3.2.3. Tests requiring this commit include BulkDumperVertexProgramTest and PeerPressureTest. In order to run these tests TinkerPop must be locally patched and built as shown below. Note this is only necessary when running JanusGraph TinkerPop tests (`mvn clean install -Dtest.skip.tp=false`).
57+
58+
```bash
59+
git clone https://github.com/apache/tinkerpop.git
60+
cd tinkerpop
61+
git checkout 3.2.3
62+
git cherry-pick 7aa9782
63+
mvn clean install -DskipTests -Drat.skip=true
64+
```

CHANGELOG.asc

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,36 @@ Release Notes
66
Version 0.1.0 (TBD)
77
~~~~~~~~~~~~~~~~~~~
88

9-
Changelog to be added once released.
9+
[source, m2]
10+
<dependency>
11+
<groupId>org.janusgraph</groupId>
12+
<artifactId>janusgraph-core</artifactId>
13+
<version>0.1.0</version>
14+
</dependency>
15+
16+
*Tested Compatibility:*
17+
18+
* Cassandra 2.1.9
19+
* HBase 0.98.8-hadoop2, 1.0.3, 1.1.8, 1.2.4
20+
* Bigtable 0.9.5.1
21+
* BerkeleyJE 7.3.7
22+
* Elasticsearch 1.5.1
23+
* Lucene 4.10.4
24+
* Solr 5.2.1
25+
* TinkerPop 3.2.3
26+
* Java 1.8
27+
28+
*Features added since version Titan 1.0.0:*
29+
30+
* TinkerPop 3.2.3 compatibility
31+
** Includes update to Spark 1.6.1
32+
* Query optimizations: JanusGraphStep folds in HasId and HasContainers can be folded in even mid-traversal
33+
* Support Google Cloud Bigtable as a backend over the HBase interface
34+
* Compatibility with newer versions of backend and index stores
35+
** HBase 1.2
36+
** BerkeleyJE 7.3.7
37+
* Includes a number of bugfixes and optimizations
38+
39+
For more information on features and bugfixes in 0.1.0, see these GitHub milestones:
40+
41+
* https://github.com/JanusGraph/janusgraph/milestone/1

NOTICE.txt

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,37 @@ This product includes software developed by Aurelius (http://thinkaurelius.com/)
1010
* Marko A. Rodriguez
1111
* Stephen Mallette
1212
* Pavel Yaskevich
13+
* Others as listed in CONTRIBUTORS.txt
1314

1415
It also includes software from other open source projects including, but not limited to (check pom.xml for complete listing):
1516

16-
* TinkerPop [http://tinkerpop.incubator.apache.org/]
17+
* Apache Cassandra [http://cassandra.apache.org/]
1718
* Apache Commons [http://commons.apache.org/]
18-
* Google Guava [http://code.google.com/p/guava-libraries/]
19-
* HPPC [http://labs.carrotsearch.com/hppc.html]
20-
* Junit Benchmark [http://labs.carrotsearch.com/junit-benchmarks.html]
21-
* Kryo [http://code.google.com/p/kryo/]
22-
* SLF4J [http://www.slf4j.org/]
23-
* Metrics [http://metrics.codahale.com/]
24-
* Apache log4j [http://logging.apache.org/log4j/]
25-
* Apache HBase [http://hbase.apache.org/]
19+
* Apache Groovy [http://groovy-lang.org/]
20+
* Apache HBase [https://hbase.apache.org/]
2621
* Apache Hadoop [http://hadoop.apache.org/]
27-
* Apache Cassandra [http://cassandra.apache.org/]
28-
* Apache Lucene [http://lucene.apache.org/]
29-
* Apache MRUnit [http://mrunit.apache.org/]
30-
* Apache Groovy [http://www.groovy-lang.org/]
31-
* OpenRDF [http://www.openrdf.org/]
32-
* Elastic Search [http://www.elasticsearch.org/]
22+
* Apache Log4j [https://logging.apache.org/log4j]
23+
* Apache Lucene [https://lucene.apache.org/]
24+
* Apache MRUnit [https://mrunit.apache.org/]
25+
* Apache Solr [http://lucene.apache.org/solr/]
26+
* Apache TinkerPop [http://tinkerpop.apache.org/]
3327
* Astyanax [https://github.com/Netflix/astyanax]
28+
* EasyMock [http://easymock.org/]
29+
* Elasticsearch [https://www.elastic.co/]
30+
* Google Guava [https://github.com/google/guava]
31+
* H2 [http://h2database.com]
32+
* HPPC [https://labs.carrotsearch.com/hppc.html]
3433
* JUnit [http://www.junit.org/]
35-
* Mockito [http://code.google.com/p/mockito/]
34+
* Jackson [https://github.com/FasterXML/jackson]
35+
* Junit Benchmark [https://labs.carrotsearch.com/junit-benchmarks.html]
36+
* Kryo [https://github.com/EsotericSoftware/kryo]
37+
* Metrics [http://metrics.dropwizard.io]
38+
* Mockito [http://site.mockito.org/]
39+
* OpenRDF [http://rdf4j.org/]
3640
* Oracle BerkeleyDB Java Edition [http://www.oracle.com/technetwork/products/berkeleydb/] (see license below)
41+
* Reflections [https://github.com/ronmamo/reflections]
42+
* SLF4J [https://www.slf4j.org/]
43+
* Spatial4j [https://github.com/locationtech/spatial4j]
3744

3845
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
3946
Copyright (C) 2002, 2016, Oracle and/or its affiliates. All rights reserved.

RELEASING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ Documentation pages:
4242
* changelog.txt
4343
* versions.txt
4444
* upgrade.txt
45-
* acknowledgements.txt
4645

4746
Files in the main repo:
4847

UPGRADE.asc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
[[upgrade]]
22
[appendix]
3-
Upgrade Instructions
4-
--------------------
3+
== Upgrade Instructions
54

65
Please follow these instructions when upgrading from Titan or an older
76
JanusGraph release.
87

9-
Upgrading from Titan
10-
~~~~~~~~~~~~~~~~~~~~
8+
=== Upgrading from Titan
119

1210
JanusGraph is based on the latest commit to the `titan11` branch of
1311
https://github.com/thinkaurelius/titan[Titan repo].
@@ -20,3 +18,11 @@ your code and configuration accordingly:
2018
. class names: `Titan*` are now `JanusGraph*` except in cases where this would
2119
duplicate a word, e.g., `TitanGraph` is simply `JanusGraph` rather than
2220
`JanusGraphGraph`
21+
22+
The BerkeleyDB version has been updated, and it contains changes to the file
23+
format stored on disk. This file format change is forward compatible with
24+
previous versions of BerkeleyDB, so existing graph data stored with Titan
25+
can be read in. However, once the data has been read in with the newer version
26+
of BerkeleyDB, those files can no longer be read by the older version. Users
27+
are encouraged to backup the BerkeleyDB storage directory before attempting to
28+
use it with the JanusGraph release.

docs/changelog.txt

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,41 @@
11
[[changelog]]
22
[appendix]
3-
== Release Notes
3+
Release Notes
4+
-------------
45

5-
=== Version 0.1.0 (TBD)
6+
Version 0.1.0 (TBD)
7+
~~~~~~~~~~~~~~~~~~~
68

7-
Changelog to be added once released.
9+
[source, m2]
10+
<dependency>
11+
<groupId>org.janusgraph</groupId>
12+
<artifactId>janusgraph-core</artifactId>
13+
<version>0.1.0</version>
14+
</dependency>
15+
16+
*Tested Compatibility:*
17+
18+
* Cassandra 2.1.9
19+
* HBase 0.98.8-hadoop2, 1.0.3, 1.1.8, 1.2.4
20+
* Bigtable 0.9.5.1
21+
* BerkeleyJE 7.3.7
22+
* Elasticsearch 1.5.1
23+
* Lucene 4.10.4
24+
* Solr 5.2.1
25+
* TinkerPop 3.2.3
26+
* Java 1.8
27+
28+
*Features added since version Titan 1.0.0:*
29+
30+
* TinkerPop 3.2.3 compatibility
31+
** Includes update to Spark 1.6.1
32+
* Query optimizations: JanusGraphStep folds in HasId and HasContainers can be folded in even mid-traversal
33+
* Support Google Cloud Bigtable as a backend over the HBase interface
34+
* Compatibility with newer versions of backend and index stores
35+
** HBase 1.2
36+
** BerkeleyJE 7.3.7
37+
* Includes a number of bugfixes and optimizations
38+
39+
For more information on features and bugfixes in 0.1.0, see these GitHub milestones:
40+
41+
* https://github.com/JanusGraph/janusgraph/milestone/1

janusgraph-dist/src/release/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h2 id="project_tagline">Distributed Graph Database</h2>
5555
</ul>
5656
</li>
5757

58-
<li>Support for global <a href="http://tinkerpop.incubator.apache.org/docs/$MAVEN{tinkerpop.version}/#graphcomputer">graph data analytics</a>, reporting, and ETL through integration with big data platforms:
58+
<li>Support for global <a href="http://tinkerpop.apache.org/docs/$MAVEN{tinkerpop.version}/reference/#graphcomputer">graph data analytics</a>, reporting, and ETL through integration with big data platforms:
5959
<ul>
6060
<li><a href="http://spark.apache.org/">Apache Spark</a></li>
6161
<li><a href="http://giraph.apache.org/">Apache Giraph</a></li>
@@ -65,17 +65,17 @@ <h2 id="project_tagline">Distributed Graph Database</h2>
6565

6666
<li>Support for geo, numeric range, and full-text search via:
6767
<ul>
68-
<li><a href="http://www.elasticsearch.org/">ElasticSearch</a></li>
68+
<li><a href="https://www.elastic.co/">ElasticSearch</a></li>
6969
<li><a href="http://lucene.apache.org/solr/">Solr</a></li>
7070
<li><a href="http://lucene.apache.org/">Lucene</a></li>
7171
</ul>
7272
</li>
7373

74-
<li>Native integration with the <a href="http://tinkerpop.incubator.apache.org/">TinkerPop</a> graph stack:
74+
<li>Native integration with the <a href="http://tinkerpop.apache.org/">TinkerPop</a> graph stack:
7575
<ul>
76-
<li><a href="http://tinkerpop.incubator.apache.org/docs/$MAVEN{tinkerpop.version}/#traversal">Gremlin graph query language</a></li>
77-
<li><a href="http://tinkerpop.incubator.apache.org/docs/$MAVEN{tinkerpop.version}/#gremlin-server">Gremlin graph server</a></li>
78-
<li><a href="http://tinkerpop.incubator.apache.org/docs/$MAVEN{tinkerpop.version}/#gremlin-applications">Gremlin applications</a></li>
76+
<li><a href="http://tinkerpop.apache.org/docs/$MAVEN{tinkerpop.version}/reference/#traversal">Gremlin graph query language</a></li>
77+
<li><a href="http://tinkerpop.apache.org/docs/$MAVEN{tinkerpop.version}/reference/#gremlin-server">Gremlin graph server</a></li>
78+
<li><a href="http://tinkerpop.apache.org/docs/$MAVEN{tinkerpop.version}/reference/#gremlin-applications">Gremlin applications</a></li>
7979
</ul>
8080
</li>
8181

0 commit comments

Comments
 (0)