Merge Hadoop projects into a single project

Fixes #1438 Signed-off-by: Jan Jansen <jan.jansen@gdata.de>
JanusGraph · Aug 30, 2019 · 792f6761ad12911092f64238c55b2eb76358a6ee · 792f676
1 parent e743628
commit 792f6761ad12911092f64238c55b2eb76358a6ee
diff --git a/.travis.yml b/.travis.yml
@@ -71,7 +71,7 @@ x-template:
 jobs:
   include:
     - <<: *STANDARD_TEST_JOB
-      env: MODULE='hadoop-parent/janusgraph-hadoop-2'
+      env: MODULE='hadoop'
     - <<: *STANDARD_TEST_JOB
       env: MODULE='lucene'
     - <<: *STANDARD_TEST_JOB
@@ -121,7 +121,7 @@ jobs:
     - <<: *STANDARD_TEST_JOB
       env: MODULE='hbase-parent/janusgraph-hbase-10' INSTALL_ARGS='-Dhbase.profile -Phbase2' ARGS='-Dtest=**/graphdb/hbase/* -Dhbase.profile -Phbase2'
     - <<: *STANDARD_TEST_JOB
-      env: MODULE='hadoop-parent/janusgraph-hadoop-2' INSTALL_ARGS='-Dhbase.profile -Phbase2' ARGS='-Dhbase.profile -Phbase2'
+      env: MODULE='hadoop' INSTALL_ARGS='-Dhbase.profile -Phbase2' ARGS='-Dhbase.profile -Phbase2'
     - <<: *STANDARD_TEST_JOB
       env: MODULE='cql' ARGS='-Pcassandra2-byteordered -Dtest=**/diskstorage/cql/*'
     - <<: *STANDARD_TEST_JOB
@@ -134,7 +134,7 @@ jobs:
       env: MODULE='cql' ARGS='-Pcassandra2-murmur -Dtest=**/graphdb/cql/*'
 
     - <<: *FULL_BUILD_JOB
-      env: MODULE='hadoop-parent/janusgraph-hadoop-2' CASSANDRA_VERSION='3.11.0' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
+      env: MODULE='hadoop' CASSANDRA_VERSION='3.11.0' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
     - <<: *FULL_BUILD_JOB
       env: MODULE='cql' ARGS='-Dtest=**/graphdb/cql/* -Dtest.skip.byteorderedpartitioner=true -Dtest.skip.murmur-serial=true -Dtest.skip.murmur-ssl=true'
     - <<: *FULL_BUILD_JOB
@@ -158,7 +158,7 @@ jobs:
     - <<: *FULL_BUILD_JOB
       env: MODULE='cql' ARGS=' -Pcassandra3-murmur-ssl -Dcassandra.docker.version=3.11.4 -Dtest=**/diskstorage/cql/CQLStoreTest.java'
     - <<: *FULL_BUILD_JOB
-      env: MODULE='hadoop-parent/janusgraph-hadoop-2' CASSANDRA_VERSION='3.0.14' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
+      env: MODULE='hadoop' CASSANDRA_VERSION='3.0.14' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
     - <<: *FULL_BUILD_JOB
       env: MODULE='cassandra' CASSANDRA_VERSION='3.0.14' CASSANDRA_ENABLE_BOP='true' ARGS='-Dtest=**/thrift/* -Dtest.skip.unordered=true -Dtest.skip.ssl=true -Dtest.skip.serial=true'
     - <<: *FULL_BUILD_JOB
@@ -231,8 +231,8 @@ jobs:
 
   # https://docs.travis-ci.com/user/customizing-the-build#Rows-that-are-Allowed-to-Fail
   allow_failures:
-    - env: MODULE='hadoop-parent/janusgraph-hadoop-2' CASSANDRA_VERSION='3.11.0' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
-    - env: MODULE='hadoop-parent/janusgraph-hadoop-2' CASSANDRA_VERSION='3.0.14' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
+    - env: MODULE='hadoop' CASSANDRA_VERSION='3.11.0' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
+    - env: MODULE='hadoop' CASSANDRA_VERSION='3.0.14' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
 
   fast_finish: true
   # https://docs.travis-ci.com/user/customizing-the-build#Rows-that-are-Allowed-to-Fail

diff --git a/.travis.yml.cassandra b/.travis.yml.cassandra
@@ -26,7 +26,7 @@ cache:
 
 env:
   matrix:
-    - MODULE='hadoop-parent/janusgraph-hadoop-2' CASSANDRA_VERSION='3.11.0' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
+    - MODULE='hadoop' CASSANDRA_VERSION='3.11.0' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
     - MODULE='cassandra' CASSANDRA_VERSION='3.11.0' CASSANDRA_ENABLE_BOP='true' ARGS='-Dtest=**/thrift/* -Dtest.skip.unordered=true -Dtest.skip.ssl=true -Dtest.skip.serial=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.11.0' ARGS='-Dtest=**/thrift/* -Dtest.skip.ordered=true -Dtest.skip.ssl=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.11.0' CASSANDRA_ENABLE_SSL='true' ARGS='-Dtest=**/thrift/* -Dtest.skip.unordered=true -Dtest.skip.ordered=true -Dtest.skip.serial=true'
@@ -35,16 +35,16 @@ env:
     - MODULE='cassandra' CASSANDRA_VERSION='3.11.0' CASSANDRA_ENABLE_SSL='true' ARGS='-Dtest=**/astyanax/* -Dtest.skip.unordered=true -Dtest.skip.ordered=true -Dtest.skip.serial=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.11.0' ARGS='-Dtest=**/cassandra/*,**/utils/*'
 
-    - MODULE='hadoop-parent/janusgraph-hadoop-2' CASSANDRA_VERSION='3.0.14' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
+    - MODULE='hadoop' CASSANDRA_VERSION='3.0.14' ARGS='-DskipHBase -DskipCassandra -DskipCassandra3=false'
     - MODULE='cassandra' CASSANDRA_VERSION='3.0.14' CASSANDRA_ENABLE_BOP='true' ARGS='-Dtest=**/thrift/* -Dtest.skip.unordered=true -Dtest.skip.ssl=true -Dtest.skip.serial=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.0.14' ARGS='-Dtest=**/thrift/* -Dtest.skip.ordered=true -Dtest.skip.ssl=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.0.14' CASSANDRA_ENABLE_SSL='true' ARGS='-Dtest=**/thrift/* -Dtest.skip.unordered=true -Dtest.skip.ordered=true -Dtest.skip.serial=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.0.14' CASSANDRA_ENABLE_BOP='true' ARGS='-Dtest=**/astyanax/* -Dtest.skip.unordered=true -Dtest.skip.ssl=true -Dtest.skip.serial=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.0.14' ARGS='-Dtest=**/astyanax/* -Dtest.skip.ordered=true -Dtest.skip.ssl=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.0.14' CASSANDRA_ENABLE_SSL='true' ARGS='-Dtest=**/astyanax/* -Dtest.skip.unordered=true -Dtest.skip.ordered=true -Dtest.skip.serial=true'
     - MODULE='cassandra' CASSANDRA_VERSION='3.0.14' ARGS='-Dtest=**/cassandra/*,**/utils/*'
-    
-    - MODULE='hadoop-parent/janusgraph-hadoop-2' CASSANDRA_VERSION='2.2.10' ARGS='-DskipHBase'
+
+    - MODULE='hadoop' CASSANDRA_VERSION='2.2.10' ARGS='-DskipHBase'
     - MODULE='cassandra' CASSANDRA_VERSION='2.2.10' CASSANDRA_ENABLE_BOP='true' ARGS='-Dtest=**/thrift/* -Dtest.skip.unordered=true -Dtest.skip.ssl=true -Dtest.skip.serial=true'
     - MODULE='cassandra' CASSANDRA_VERSION='2.2.10' ARGS='-Dtest=**/thrift/* -Dtest.skip.ordered=true -Dtest.skip.ssl=true'
     - MODULE='cassandra' CASSANDRA_VERSION='2.2.10' CASSANDRA_ENABLE_SSL='true' ARGS='-Dtest=**/thrift/* -Dtest.skip.unordered=true -Dtest.skip.ordered=true -Dtest.skip.serial=true'

diff --git a/BUILDING.md b/BUILDING.md
@@ -34,7 +34,7 @@ To build the distribution archive:
 ```
 mvn clean install -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true
 ```
-This command generates the distribution archive in `janusgraph-dist/janusgraph-dist-hadoop-2/target/janusgraph-$VERSION-hadoop2.zip`.
+This command generates the distribution archive in `janusgraph-dist/target/janusgraph-$VERSION.zip`.
 For more details information, please see [here](janusgraph-dist/README.md#building-zip-archives)
 
 ## Building Docker Image for JanusGraph Server
@@ -44,7 +44,7 @@ distribution archive is needed. If you wish to build an image from source
 refer to `To build the distribution archive` section to build the distribution
 archive first. You can also use an [official release](https://github.com/JanusGraph/janusgraph/releases) to avoid building.
 To do so check out the release tag you wish to build, example: `git checkout v0.2.0`. Then create target
-directory that houses the distribution zip with `mkdir janusgraph-dist/janusgraph-dist-hadoop-2/target`.
+directory that houses the distribution zip with `mkdir janusgraph-dist/target`.
 The [downloaded release](https://github.com/JanusGraph/janusgraph/releases)
 is then placed in the recently created target directory. Note that if the
 tag is not found you can run `git fetch --all --tags --prune` and then rerun the checkout command.
@@ -55,7 +55,7 @@ to run the BerkeleyJE backend and Elasticsearch (requires [Docker Compose](https
 
 ```bash
 mvn docker:build -Pjanusgraph-docker -pl janusgraph-dist
-docker-compose -f janusgraph-dist/janusgraph-dist-hadoop-2/docker-compose.yml up
+docker-compose -f janusgraph-dist/docker-compose.yml up
 ```
 
 If you are building the Docker image behind a proxy please set an environment variable for either http_proxy or https_proxy accordingly.

diff --git a/RELEASING.md b/RELEASING.md
@@ -204,7 +204,7 @@ After the updates are approved and merged, continue on with the release process.
     * `mkdocs.yml`
 2. Update the configuration reference: `mvn install -DskipTests=true -pl janusgraph-doc -am`
 3. For building documentation: see `building.md`
-4. Zip documentation: `$ zip janusgraph-${JANUSGRAPH_VERSION}-hadoop2-doc.zip site`
+4. Zip documentation: `$ zip janusgraph-${JANUSGRAPH_VERSION}-doc.zip site`
 5. You may also need to update the following file in the main repo for any new or updated dependencies: `NOTICE.txt`
 
 Build Release Artifacts
@@ -228,14 +228,14 @@ mvn clean javadoc:jar deploy -Pjanusgraph-release -DskipTests=true
 
 *   Prepare files for GitHub release
 ```Shell
-export JG_VER="janusgraph-0.2.3"
+export JG_VER="janusgraph-0.5.0"
 mkdir -p ~/jg-staging
-cp janusgraph-dist/janusgraph-dist-hadoop-2/target/${JG_VER}-hadoop2.zip* ~/jg-staging/
+cp janusgraph-dist/target/${JG_VER}.zip* ~/jg-staging/
 cd janusgraph-doc/target/docs/
-mv chunk ${JG_VER}-hadoop2-doc
-zip -r ${JG_VER}-hadoop2-doc.zip ${JG_VER}-hadoop2-doc
-gpg --armor --detach-sign ${JG_VER}-hadoop2-doc.zip
-cp ${JG_VER}-hadoop2-doc.zip* ~/jg-staging/
+mv chunk ${JG_VER}-doc
+zip -r ${JG_VER}-doc.zip ${JG_VER}-doc
+gpg --armor --detach-sign ${JG_VER}-doc.zip
+cp ${JG_VER}-doc.zip* ~/jg-staging/
 ```
 
 If it fails due to Inappropriate ioctl for device error, run:
@@ -246,8 +246,8 @@ export GPG_TTY=$(tty)
 *   Verify signature validity (both commands should show good signature)
 ```Shell
 cd ~/jg-staging
-gpg --verify ${JG_VER}-hadoop2.zip.asc ${JG_VER}-hadoop2.zip
-gpg --verify ${JG_VER}-hadoop2-doc.zip.asc ${JG_VER}-hadoop2-doc.zip
+gpg --verify ${JG_VER}.zip.asc ${JG_VER}.zip
+gpg --verify ${JG_VER}-doc.zip.asc ${JG_VER}-doc.zip
 ```
 
 ### Create a Draft Release on GitHub

diff --git a/TESTING.md b/TESTING.md
@@ -258,13 +258,13 @@ Hadoop tests with Cassandra 2:
 ```bash
 CASSANDRA_VERSION=2.2.10 docker-compose -f janusgraph-cassandra/src/test/resources/docker-compose.yml up -d
 # wait for instance to start (see above)
-mvn clean install -pl :janusgraph-hadoop-2 -DskipHBase -Dstorage.hostname=$STORAGE_HOSTNAME
+mvn clean install -pl :janusgraph-hadoop -DskipHBase -Dstorage.hostname=$STORAGE_HOSTNAME
 ```
 
 Hadoop tests with Cassandra 3 (note that default Cassandra 2 tests must be skipped):
 
 ```bash
 CASSANDRA_VERSION=3.11.0 docker-compose -f janusgraph-cassandra/src/test/resources/docker-compose.yml up -d
 # wait for instance to start (see above)
-mvn clean install -pl :janusgraph-hadoop-2 -DskipHBase -DskipCassandra -DskipCassandra3=false -Dstorage.hostname=$STORAGE_HOSTNAME
+mvn clean install -pl :janusgraph-hadoop -DskipHBase -DskipCassandra -DskipCassandra3=false -Dstorage.hostname=$STORAGE_HOSTNAME
 ```
diff --git a/docs/basics/server.md b/docs/basics/server.md
@@ -124,15 +124,15 @@ If you want to start fresh and remove the database and logs you can use
 the clean command with `janusgraph.sh`. The server should be stopped
 before running the clean operation.
 ```bash
-$ cd /Path/to/janusgraph/janusgraph-0.2.0-hadoop2/
+$ cd /Path/to/janusgraph/janusgraph-{project.version}/
 $ ./bin/janusgraph.sh stop
 Killing Gremlin-Server (pid 91505)...
 Killing Elasticsearch (pid 91402)...
 Killing Cassandra (pid 91219)...
 $ ./bin/janusgraph.sh clean
 Are you sure you want to delete all stored data and logs? [y/N] y
-Deleted data in /Path/to/janusgraph/janusgraph-0.2.0-hadoop2/db
-Deleted logs in /Path/to/janusgraph/janusgraph-0.2.0-hadoop2/log
+Deleted data in /Path/to/janusgraph/janusgraph-{project.version}/db
+Deleted logs in /Path/to/janusgraph/janusgraph-{project.version}/log
 ```
 
 ## JanusGraph Server as a WebSocket Endpoint

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -59,6 +59,10 @@ For more information on features and bug fixes in 0.5.0, see the GitHub mileston
 
 #### Upgrade Instructions
 
+##### Distributed package is renamed
+
+The distribution has no longer the suffix `-hadoop2`.
+
 ##### ElasticSearch: Upgrade from 6.6.0 to 7.2.0 and drop support for 5.x version
 The ElasticSearch version has been changed to 7.2.0 which removes support for `max-retry-timeout` option. 
 That is why this option no longer available in JanusGraph.

diff --git a/docs/index.md b/docs/index.md
@@ -132,11 +132,11 @@ zip-file that was downloaded.
     installed.
 
 ```bash
-$ unzip janusgraph-{{ latest_version }}-hadoop2.zip
-Archive:  janusgraph-{{ latest_version }}-hadoop2.zip
-  creating: janusgraph-{{ latest_version }}-hadoop2/
+$ unzip janusgraph-{{ latest_version }}.zip
+Archive:  janusgraph-{{ latest_version }}.zip
+  creating: janusgraph-{{ latest_version }}/
 ...
-$ cd janusgraph-{{ latest_version }}-hadoop2
+$ cd janusgraph-{{ latest_version }}
 $ bin/gremlin.sh
 
          \,,,/

diff --git a/janusgraph-codepipelines-ci/README.md b/janusgraph-codepipelines-ci/README.md
@@ -87,7 +87,7 @@ pipelines:
     timeout: 42
     env:
     - name: MODULE
-      value: janusgraph-hadoop-parent/janusgraph-hadoop-2,janusgraph-lucene,janusgraph-solr
+      value: janusgraph-hadoop,janusgraph-lucene,janusgraph-solr
   - name: cassandra
     timeout: 220
     env:

diff --git a/janusgraph-codepipelines-ci/pipe.yml b/janusgraph-codepipelines-ci/pipe.yml
@@ -30,7 +30,7 @@ pipelines:
     timeout: 42
     env:
     - name: MODULE
-      value: janusgraph-hadoop-parent/janusgraph-hadoop-2,janusgraph-lucene,janusgraph-solr
+      value: janusgraph-hadoop,janusgraph-lucene,janusgraph-solr
   - name: cassandra
     timeout: 220
     env:

diff --git a/...-dist/janusgraph-dist-hadoop-2/Dockerfile → janusgraph-dist/Dockerfile b/...-dist/janusgraph-dist-hadoop-2/Dockerfile → janusgraph-dist/Dockerfile
diff --git a/janusgraph-dist/README.md b/janusgraph-dist/README.md
@@ -15,7 +15,7 @@ SNAPSHOT or a release tag.
 
 This command writes one archive:
 
-* janusgraph-dist/janusgraph-dist-hadoop-2/target/janusgraph-$VERSION-hadoop2.zip
+* janusgraph-dist/target/janusgraph-$VERSION.zip
 
 It's also possible to leave off the `-DskipTests=true`.  However, in
 the absence of `-DskipTests=true`, the -Pjanusgraph-release argument

diff --git a/...nusgraph-dist-hadoop-2/docker-compose.yml → janusgraph-dist/docker-compose.yml b/...nusgraph-dist-hadoop-2/docker-compose.yml → janusgraph-dist/docker-compose.yml
diff --git a/...sgraph-dist-hadoop-2/es/elasticsearch.yml → janusgraph-dist/es/elasticsearch.yml b/...sgraph-dist-hadoop-2/es/elasticsearch.yml → janusgraph-dist/es/elasticsearch.yml