From 9121dd87380f85d53b0306b4951175361061870a Mon Sep 17 00:00:00 2001 From: Oleksandr Porunov Date: Fri, 15 Nov 2024 20:23:09 +0000 Subject: [PATCH] Restore version 1.2.0-SNAPSHOT CTR Signed-off-by: Oleksandr Porunov --- .backportrc.json | 2 +- .github/dependabot.yml | 2 +- cassandra-hadoop-util/pom.xml | 2 +- docs/changelog.md | 51 ++++++++++++++++++- janusgraph-all/pom.xml | 2 +- janusgraph-backend-testutils/pom.xml | 2 +- janusgraph-benchmark/pom.xml | 2 +- janusgraph-berkeleyje/pom.xml | 2 +- janusgraph-bigtable/pom.xml | 2 +- janusgraph-core/pom.xml | 2 +- janusgraph-cql/pom.xml | 2 +- janusgraph-dist/docker/Dockerfile | 2 +- janusgraph-dist/pom.xml | 2 +- janusgraph-doc/pom.xml | 2 +- janusgraph-driver/pom.xml | 2 +- janusgraph-es/pom.xml | 2 +- .../example-berkeleyje/pom.xml | 2 +- janusgraph-examples/example-common/pom.xml | 2 +- janusgraph-examples/example-cql/pom.xml | 2 +- janusgraph-examples/example-hbase/pom.xml | 2 +- .../example-remotegraph/pom.xml | 2 +- .../example-tinkergraph/pom.xml | 2 +- janusgraph-examples/pom.xml | 2 +- janusgraph-grpc/pom.xml | 2 +- janusgraph-hadoop/pom.xml | 2 +- janusgraph-hbase/pom.xml | 2 +- janusgraph-inmemory/pom.xml | 2 +- janusgraph-lucene/pom.xml | 2 +- janusgraph-mixed-index-utils/pom.xml | 2 +- janusgraph-scylla/pom.xml | 2 +- janusgraph-server/pom.xml | 2 +- janusgraph-solr/pom.xml | 2 +- janusgraph-test/pom.xml | 2 +- mkdocs.yml | 2 +- pom.xml | 2 +- scylla-hadoop-util/pom.xml | 2 +- 36 files changed, 85 insertions(+), 36 deletions(-) diff --git a/.backportrc.json b/.backportrc.json index fb0d9a3e26..68e6685ccf 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,7 +1,7 @@ { "repoOwner": "janusgraph", "repoName": "janusgraph", - "targetBranchChoices": ["v1.0"], + "targetBranchChoices": ["v1.1"], "branchLabelMapping": { "^backport/(.+)$": "$1" }, diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 22e2774a6d..3fc485d0ae 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,5 +22,5 @@ updates: time: "11:00" open-pull-requests-limit: 10 labels: - - "backport/v1.0" + - "backport/v1.1" - "dependencies" diff --git a/cassandra-hadoop-util/pom.xml b/cassandra-hadoop-util/pom.xml index 8206408f76..5368dbbb82 100644 --- a/cassandra-hadoop-util/pom.xml +++ b/cassandra-hadoop-util/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT cassandra-hadoop-util diff --git a/docs/changelog.md b/docs/changelog.md index cde0f10a9e..8e8fb08c4b 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -27,8 +27,8 @@ All currently supported versions of JanusGraph are listed below. | JanusGraph | Storage Version | Cassandra | HBase | Bigtable | ScyllaDB | Elasticsearch | Solr | TinkerPop | Spark | Scala | | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | +| 1.2.z | 2 | 3.11.z, 4.0.z | 2.6.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | 6.y | 6.y, 7.y, 8.y | 8.y | 3.7.z | 3.2.z | 2.12.z | | 1.1.z | 2 | 3.11.z, 4.0.z | 2.6.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | 6.y | 6.y, 7.y, 8.y | 8.y | 3.7.z | 3.2.z | 2.12.z | -| 1.0.z | 2 | 3.11.z, 4.0.z | 2.5.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | 5.y | 6.y, 7.y, 8.y | 8.y | 3.7.z | 3.2.z | 2.12.z | !!! info Even so ScyllaDB is marked as `N/A` prior version 1.0.0 it was actually supported using `cql` storage option. @@ -47,9 +47,58 @@ The versions of JanusGraph listed below are outdated and will no longer receive | 0.4.z | 2 | 2.1.z, 2.2.z, 3.0.z, 3.11.z | 1.2.z, 1.3.z, 1.4.z, 2.1.z | N/A | N/A | 5.y, 6.y | 7.y | 3.4.z | 2.2.z | 2.11.z | | 0.5.z | 2 | 2.1.z, 2.2.z, 3.0.z, 3.11.z | 1.2.z, 1.3.z, 1.4.z, 2.1.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | N/A | 6.y, 7.y | 7.y | 3.4.z | 2.2.z | 2.11.z | | 0.6.z | 2 | 3.0.z, 3.11.z | 1.6.z, 2.2.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | N/A | 6.y, 7.y | 7.y, 8.y | 3.5.z | 3.0.z | 2.12.z | +| 1.0.z | 2 | 3.11.z, 4.0.z | 2.5.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | 5.y | 6.y, 7.y, 8.y | 8.y | 3.7.z | 3.2.z | 2.12.z | ## Release Notes +### Version 1.2.0 (Release Date: ???) + +/// tab | Maven +```xml + + org.janusgraph + janusgraph-core + 1.2.0 + +``` +/// + +/// tab | Gradle +```groovy +compile "org.janusgraph:janusgraph-core:1.2.0" +``` +/// + +**Tested Compatibility:** + +* Apache Cassandra 3.11.10, 4.0.6 +* Apache HBase 2.6.0 +* Oracle BerkeleyJE 7.5.11 +* ScyllaDB 6.2.0 +* Elasticsearch 6.0.1, 6.6.0, 7.17.8, 8.15.3 +* Apache Lucene 8.11.1 +* Apache Solr 8.11.1 +* Apache TinkerPop 3.7.3 +* Java 8, 11 + +**Installed versions in the Pre-Packaged Distribution:** + +* Cassandra 4.0.6 +* Elasticsearch 7.14.0 + +#### Changes + +For more information on features and bug fixes in 1.2.0, see the GitHub milestone: + +- + +#### Assets + +* [JavaDoc](https://javadoc.io/doc/org.janusgraph/janusgraph-core/1.2.0) +* [GitHub Release](https://github.com/JanusGraph/janusgraph/releases/tag/v1.2.0) +* [JanusGraph zip](https://github.com/JanusGraph/janusgraph/releases/download/v1.2.0/janusgraph-1.2.0.zip) +* [JanusGraph zip with embedded Cassandra and ElasticSearch](https://github.com/JanusGraph/janusgraph/releases/download/v1.2.0/janusgraph-full-1.2.0.zip) + ### Version 1.1.0 (Release Date: November 7, 2024) /// tab | Maven diff --git a/janusgraph-all/pom.xml b/janusgraph-all/pom.xml index c31da77dc6..024aba6277 100644 --- a/janusgraph-all/pom.xml +++ b/janusgraph-all/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-all diff --git a/janusgraph-backend-testutils/pom.xml b/janusgraph-backend-testutils/pom.xml index fa6306dfb0..d37ce4d0e3 100644 --- a/janusgraph-backend-testutils/pom.xml +++ b/janusgraph-backend-testutils/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-backend-testutils diff --git a/janusgraph-benchmark/pom.xml b/janusgraph-benchmark/pom.xml index d08735f52d..ddb6bb6b12 100644 --- a/janusgraph-benchmark/pom.xml +++ b/janusgraph-benchmark/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-benchmark diff --git a/janusgraph-berkeleyje/pom.xml b/janusgraph-berkeleyje/pom.xml index b0df8e15aa..64c0b981c3 100644 --- a/janusgraph-berkeleyje/pom.xml +++ b/janusgraph-berkeleyje/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-berkeleyje diff --git a/janusgraph-bigtable/pom.xml b/janusgraph-bigtable/pom.xml index de1465c850..196d5071a9 100644 --- a/janusgraph-bigtable/pom.xml +++ b/janusgraph-bigtable/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-bigtable diff --git a/janusgraph-core/pom.xml b/janusgraph-core/pom.xml index 884bfda205..36404ad3af 100644 --- a/janusgraph-core/pom.xml +++ b/janusgraph-core/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-core diff --git a/janusgraph-cql/pom.xml b/janusgraph-cql/pom.xml index c69594d603..f94ca9e05d 100644 --- a/janusgraph-cql/pom.xml +++ b/janusgraph-cql/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT janusgraph-cql diff --git a/janusgraph-dist/docker/Dockerfile b/janusgraph-dist/docker/Dockerfile index aaf7485e60..9430db1f1c 100644 --- a/janusgraph-dist/docker/Dockerfile +++ b/janusgraph-dist/docker/Dockerfile @@ -89,7 +89,7 @@ ARG REVISION=test LABEL org.opencontainers.image.title="JanusGraph Docker Image" LABEL org.opencontainers.image.description="Official JanusGraph Docker image" LABEL org.opencontainers.image.url="https://janusgraph.org/" -LABEL org.opencontainers.image.documentation="https://docs.janusgraph.org/v1.0/" +LABEL org.opencontainers.image.documentation="https://docs.janusgraph.org/v1.1/" LABEL org.opencontainers.image.revision="${REVISION}" LABEL org.opencontainers.image.source="https://github.com/JanusGraph/janusgraph-docker/" LABEL org.opencontainers.image.vendor="JanusGraph" diff --git a/janusgraph-dist/pom.xml b/janusgraph-dist/pom.xml index 773d6f5311..01a02b0645 100644 --- a/janusgraph-dist/pom.xml +++ b/janusgraph-dist/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml pom diff --git a/janusgraph-doc/pom.xml b/janusgraph-doc/pom.xml index c4eca64f66..edcae99d37 100644 --- a/janusgraph-doc/pom.xml +++ b/janusgraph-doc/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml pom diff --git a/janusgraph-driver/pom.xml b/janusgraph-driver/pom.xml index ebad1babf3..ba553858be 100644 --- a/janusgraph-driver/pom.xml +++ b/janusgraph-driver/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-driver diff --git a/janusgraph-es/pom.xml b/janusgraph-es/pom.xml index 8fd5138df2..58b8220f74 100644 --- a/janusgraph-es/pom.xml +++ b/janusgraph-es/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-es diff --git a/janusgraph-examples/example-berkeleyje/pom.xml b/janusgraph-examples/example-berkeleyje/pom.xml index 79fdc8f790..d2e26bf72f 100644 --- a/janusgraph-examples/example-berkeleyje/pom.xml +++ b/janusgraph-examples/example-berkeleyje/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml example-berkeleyje diff --git a/janusgraph-examples/example-common/pom.xml b/janusgraph-examples/example-common/pom.xml index 281cbff8b9..ddc052eb24 100644 --- a/janusgraph-examples/example-common/pom.xml +++ b/janusgraph-examples/example-common/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml example-common diff --git a/janusgraph-examples/example-cql/pom.xml b/janusgraph-examples/example-cql/pom.xml index 43d8e29dce..068ca70380 100644 --- a/janusgraph-examples/example-cql/pom.xml +++ b/janusgraph-examples/example-cql/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml example-cql diff --git a/janusgraph-examples/example-hbase/pom.xml b/janusgraph-examples/example-hbase/pom.xml index 13e6c78da0..c9246d71d4 100644 --- a/janusgraph-examples/example-hbase/pom.xml +++ b/janusgraph-examples/example-hbase/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml example-hbase diff --git a/janusgraph-examples/example-remotegraph/pom.xml b/janusgraph-examples/example-remotegraph/pom.xml index ef3c957b6f..5d6e37db0a 100644 --- a/janusgraph-examples/example-remotegraph/pom.xml +++ b/janusgraph-examples/example-remotegraph/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml example-remotegraph diff --git a/janusgraph-examples/example-tinkergraph/pom.xml b/janusgraph-examples/example-tinkergraph/pom.xml index e2fcf6c1c5..182ba1e579 100644 --- a/janusgraph-examples/example-tinkergraph/pom.xml +++ b/janusgraph-examples/example-tinkergraph/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml example-tinkergraph diff --git a/janusgraph-examples/pom.xml b/janusgraph-examples/pom.xml index 04981a4d0d..e31d7178cb 100644 --- a/janusgraph-examples/pom.xml +++ b/janusgraph-examples/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-examples diff --git a/janusgraph-grpc/pom.xml b/janusgraph-grpc/pom.xml index 3e15ab75d3..701a47dfca 100644 --- a/janusgraph-grpc/pom.xml +++ b/janusgraph-grpc/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT janusgraph-grpc JanusGraph-gRPC: gRPC Components for JanusGraph diff --git a/janusgraph-hadoop/pom.xml b/janusgraph-hadoop/pom.xml index 33f32a8b96..3c78a0d8ae 100644 --- a/janusgraph-hadoop/pom.xml +++ b/janusgraph-hadoop/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-hadoop diff --git a/janusgraph-hbase/pom.xml b/janusgraph-hbase/pom.xml index 912247b5c4..0106640872 100644 --- a/janusgraph-hbase/pom.xml +++ b/janusgraph-hbase/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT janusgraph-hbase JanusGraph-HBase: Distributed Graph Database diff --git a/janusgraph-inmemory/pom.xml b/janusgraph-inmemory/pom.xml index 84745d3729..aca23f8919 100644 --- a/janusgraph-inmemory/pom.xml +++ b/janusgraph-inmemory/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-inmemory diff --git a/janusgraph-lucene/pom.xml b/janusgraph-lucene/pom.xml index 9fd6bc5f24..a0fc6ed0fe 100644 --- a/janusgraph-lucene/pom.xml +++ b/janusgraph-lucene/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-lucene diff --git a/janusgraph-mixed-index-utils/pom.xml b/janusgraph-mixed-index-utils/pom.xml index 3e232cff62..7694db1b2c 100644 --- a/janusgraph-mixed-index-utils/pom.xml +++ b/janusgraph-mixed-index-utils/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-mixed-index-utils diff --git a/janusgraph-scylla/pom.xml b/janusgraph-scylla/pom.xml index b697ca27e3..1151c8ba3e 100644 --- a/janusgraph-scylla/pom.xml +++ b/janusgraph-scylla/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT janusgraph-scylla diff --git a/janusgraph-server/pom.xml b/janusgraph-server/pom.xml index f105c05938..333371f058 100644 --- a/janusgraph-server/pom.xml +++ b/janusgraph-server/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT janusgraph-server JanusGraph-Server: Server Components for JanusGraph diff --git a/janusgraph-solr/pom.xml b/janusgraph-solr/pom.xml index 391e970615..0c61e5a6ae 100644 --- a/janusgraph-solr/pom.xml +++ b/janusgraph-solr/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-solr diff --git a/janusgraph-test/pom.xml b/janusgraph-test/pom.xml index 72e1ca8b6c..7185eba71e 100644 --- a/janusgraph-test/pom.xml +++ b/janusgraph-test/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml janusgraph-test diff --git a/mkdocs.yml b/mkdocs.yml index f8cf32a6a6..be4b493a2b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -96,7 +96,7 @@ extra: - icon: fontawesome/solid/envelope link: https://lists.lfaidata.foundation/g/janusgraph-dev latest_version: 1.1.0 - snapshot_version: 1.1.1-SNAPSHOT + snapshot_version: 1.2.0-SNAPSHOT tinkerpop_version: 3.7.3 hadoop_version: 3.3.6 diff --git a/pom.xml b/pom.xml index b4da8088c5..e0853e3087 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT pom 3.2.5 diff --git a/scylla-hadoop-util/pom.xml b/scylla-hadoop-util/pom.xml index 7c81f538f1..1f4fae5a40 100644 --- a/scylla-hadoop-util/pom.xml +++ b/scylla-hadoop-util/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT scylla-hadoop-util