Extend license checkstyle tests and update licenses (#388)

## What is the goal of this PR?

We introduce a test that ensures that the license text is correct.

## What are the changes implemented in this PR?

* Bring all the `checkstyle_test()` invocations in line with the updated definition in dependencies;
* Replace all references to `typeql-lang-java` with `typeql/java`;
* Use checkstyle to confirm that the license text is correct.

Author: dmitrii-ubskii

BUILD

@@ -64,8 +64,21 @@ checkstyle_test(
         "*",
         ".grabl/*",
     ]),
-    exclude = glob(["docs/*"]),
-    license_type = "apache",
+    exclude = glob([
+        "*.md",
+        ".bazelversion",
+        "LICENSE",
+        "VERSION",
+        "docs/*",
+    ]),
+    license_type = "apache-header",
+)
+
+checkstyle_test(
+    name = "checkstyle-license",
+    size = "small",
+    include = ["LICENSE"],
+    license_type = "apache-fulltext",
 )
 
 assemble_maven(

LICENSE

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -175,17 +174,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-   Copyright 2022 Vaticle
-
-   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.

WORKSPACE

@@ -110,24 +110,21 @@ pip_deps()
 ################################
 
 # Load repositories
-load("//dependencies/vaticle:repositories.bzl", "vaticle_typedb_common", "vaticle_typeql_lang_java", "vaticle_typedb_behaviour", "vaticle_factory_tracing", "vaticle_typedb_protocol")
+load("//dependencies/vaticle:repositories.bzl", "vaticle_typedb_common", "vaticle_typeql", "vaticle_typedb_behaviour", "vaticle_factory_tracing", "vaticle_typedb_protocol")
 vaticle_typedb_common()
-vaticle_typeql_lang_java()
+vaticle_typeql()
 vaticle_typedb_behaviour()
 vaticle_factory_tracing()
 vaticle_typedb_protocol()
 
-load("@vaticle_typeql_lang_java//dependencies/vaticle:repositories.bzl", "vaticle_typeql")
-vaticle_typeql()
-
 # Load artifacts
 load("//dependencies/vaticle:artifacts.bzl", "vaticle_typedb_artifact", "vaticle_typedb_cluster_artifact")
 vaticle_typedb_artifact()
 vaticle_typedb_cluster_artifact()
 
 # Load maven
 load("@vaticle_typedb_common//dependencies/maven:artifacts.bzl", vaticle_typedb_common_artifacts = "artifacts")
-load("@vaticle_typeql_lang_java//dependencies/maven:artifacts.bzl", vaticle_typeql_lang_java_artifacts = "artifacts")
+load("@vaticle_typeql//dependencies/maven:artifacts.bzl", vaticle_typeql_artifacts = "artifacts")
 load("@vaticle_factory_tracing//dependencies/maven:artifacts.bzl", vaticle_factory_tracing_artifacts = "artifacts")
 load("//dependencies/maven:artifacts.bzl", vaticle_typedb_client_java_artifacts = "artifacts", vaticle_typedb_client_java_overrides = "overrides")
 
@@ -139,7 +136,7 @@ load("@vaticle_dependencies//library/maven:rules.bzl", "maven")
 maven(
     vaticle_factory_tracing_artifacts +
     vaticle_typedb_common_artifacts +
-    vaticle_typeql_lang_java_artifacts +
+    vaticle_typeql_artifacts +
     vaticle_dependencies_tool_maven_artifacts +
     vaticle_typedb_client_java_artifacts +
     vaticle_bazel_distribution_maven_artifacts,

api/BUILD

@@ -32,8 +32,8 @@ java_library(
 
         # External dependencies from @vaticle
         "@vaticle_typedb_common//:common",
-        "@vaticle_typeql_lang_java//pattern",
-        "@vaticle_typeql_lang_java//query",
+        "@vaticle_typeql//java/pattern",
+        "@vaticle_typeql//java/query",
         "@vaticle_typedb_protocol//grpc/java:typedb-protocol",
 
         # External dependencies from Maven
@@ -44,6 +44,6 @@ java_library(
 checkstyle_test(
     name = "checkstyle",
     include = glob(["*", "*/*", "*/*/*"]),
-    license_type = "apache",
+    license_type = "apache-header",
     size = "small",
-)
+)

common/BUILD

@@ -55,5 +55,5 @@ checkstyle_test(
         "*",
         "*/*",
     ]),
-    license_type = "apache",
+    license_type = "apache-header",
 )

concept/BUILD

@@ -33,7 +33,7 @@ java_library(
 
         # External dependencies from @vaticle
         "@vaticle_typedb_common//:common",
-        "@vaticle_typeql_lang_java//common",
+        "@vaticle_typeql//java/common",
         "@vaticle_typedb_protocol//grpc/java:typedb-protocol",
 
         # External dependencies from Maven
@@ -44,6 +44,6 @@ java_library(
 checkstyle_test(
     name = "checkstyle",
     include = glob(["*", "*/*"]),
-    license_type = "apache",
+    license_type = "apache-header",
     size = "small",
-)
+)

connection/BUILD

@@ -58,6 +58,6 @@ java_library(
 checkstyle_test(
     name = "checkstyle",
     include = glob(["*", "*/*"]),
-    license_type = "apache",
+    license_type = "apache-header",
     size = "small",
 )

dependencies/maven/BUILD

@@ -25,5 +25,5 @@ checkstyle_test(
     name = "checkstyle",
     include = glob(["*"]),
     exclude = ["artifacts.snapshot"],
-    license_type = "apache",
+    license_type = "apache-header",
 )

dependencies/vaticle/BUILD

@@ -24,5 +24,5 @@ load("@vaticle_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
 checkstyle_test(
     name = "checkstyle",
     include = glob(["*"]),
-    license_type = "apache",
+    license_type = "apache-header",
 )

dependencies/vaticle/repositories.bzl

@@ -21,44 +21,45 @@
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-def vaticle_typeql_lang_java():
+def vaticle_typeql():
     git_repository(
-        name = "vaticle_typeql_lang_java",
-        remote = "https://github.com/vaticle/typeql-lang-java",
-        tag = "2.11.0", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typeql_lang_java
+        name = "vaticle_typeql",
+        remote = "https://github.com/vaticle/typeql",
+        commit = "6ab52082a5617e897bab9866ff18343648e355eb", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typeql
     )
 
 def vaticle_typedb_common():
     git_repository(
         name = "vaticle_typedb_common",
         remote = "https://github.com/vaticle/typedb-common",
-        tag = "2.11.1" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
+        commit = "f0dd708adaea9fe1fdc3699180797a12166d33e8" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
+
     )
 
 def vaticle_dependencies():
     git_repository(
         name = "vaticle_dependencies",
         remote = "https://github.com/vaticle/dependencies",
-        commit = "793c63b578304fd739b910ae49c9c77951165421", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
+        commit = "a8b3b714a5e0562d41f4c05ca8f266d48b7d0fd3", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
     )
 
 def vaticle_typedb_protocol():
     git_repository(
         name = "vaticle_typedb_protocol",
         remote = "https://github.com/vaticle/typedb-protocol",
-        tag = "2.10.0", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol
+        commit = "4e40f890fe150621a174292a104d9d7fb3fc5b89", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol
     )
 
 def vaticle_typedb_behaviour():
     git_repository(
         name = "vaticle_typedb_behaviour",
         remote = "https://github.com/vaticle/typedb-behaviour",
-        commit = "6e462bcbef73c75405264777069a22bca696a644", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
+        commit = "6ff247cf6d90b941da015414cb8f79fc97647a98", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
     )
 
 def vaticle_factory_tracing():
     git_repository(
         name = "vaticle_factory_tracing",
         remote = "https://github.com/vaticle/factory-tracing",
-        tag = "2.9.0"  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_factory_tracing
+        commit = "a4d5e36b1b0c56bd370e5a7583d628de9272f086"  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_factory_tracing
     )