Merge branch 'stable-2.14'
* stable-2.14:
Update bazlets to the latest on stable-2.14 to use 2.14.7 release API
Added support for package-level queries (and a README)
Change-Id: I08a48817e9d8800100da5e9b7a1357ae236d03ce
diff --git a/.buckconfig b/.buckconfig
deleted file mode 100644
index c02861b..0000000
--- a/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
- go-import = //:go-import
- plugin = //:go-import
- src = //:go-import-sources
-
-[java]
- src_roots = java, resources
-
-[project]
- ignore = .git
-
-[cache]
- mode = dir
- dir = buck-out/cache
-
diff --git a/BUCK b/BUCK
deleted file mode 100644
index b43a5f7..0000000
--- a/BUCK
+++ /dev/null
@@ -1,67 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-include_defs('//bucklets/java_sources.bucklet')
-include_defs('//bucklets/maven_jar.bucklet')
-
-SOURCES = glob(['src/main/java/**/*.java'])
-RESOURCES = glob(['src/main/resources/**/*'])
-
-TEST_DEPS = GERRIT_PLUGIN_API + GERRIT_TESTS + [
- ':go-import__plugin',
- ':mockito',
-]
-
-gerrit_plugin(
- name = 'go-import',
- srcs = SOURCES,
- resources = RESOURCES,
- manifest_entries = [
- 'Gerrit-PluginName: go-import',
- 'Gerrit-ApiType: plugin',
- 'Gerrit-HttpModule: com.ericsson.gerrit.plugins.goimport.HttpModule',
- 'Implementation-Title: go-import plugin',
- 'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/go-import',
- 'Implementation-Vendor: Ericsson',
- ],
-)
-
-java_library(
- name = 'classpath',
- deps = TEST_DEPS,
-)
-
-java_test(
- name = 'go-import_tests',
- labels = ['go-import'],
- srcs = glob(['src/test/java/**/*.java']),
- deps = TEST_DEPS,
-)
-
-java_sources(
- name = 'go-import-sources',
- srcs = SOURCES + RESOURCES,
-)
-
-maven_jar(
- name = 'mockito',
- id = 'org.mockito:mockito-core:2.7.19',
- sha1 = '9e0dbe97eca58ef4c26e3b9e1a12ee42e76a63a5',
- license = 'DO_NOT_DISTRIBUTE',
- deps = [
- ':byte-buddy',
- ':objenesis',
- ],
-)
-maven_jar(
- name = 'byte-buddy',
- id = 'net.bytebuddy:byte-buddy:1.6.11',
- sha1 = '8a8f9409e27f1d62c909c7eef2aa7b3a580b4901',
- license = 'DO_NOT_DISTRIBUTE',
- attach_source = False,
-)
-maven_jar(
- name = 'objenesis',
- id = 'org.objenesis:objenesis:2.5',
- sha1 = '612ecb799912ccf77cba9b3ed8c813da086076e9',
- license = 'DO_NOT_DISTRIBUTE',
- attach_source = False,
-)
diff --git a/WORKSPACE b/WORKSPACE
index 8877774..30a6058 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "3dbcd76602dd93fddb9deae4cacd1699164a19e9",
+ commit = "42bffc66c0e92753133e4cea2debe65abc359c4d",
# local_path = "/home/<user>/projects/bazlets",
)
#Snapshot Plugin API
-#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
)
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
+#)
+
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
load("//:external_plugin_deps.bzl", "external_plugin_deps")
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
deleted file mode 100644
index 453e016..0000000
--- a/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.14-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
- name = 'plugin-api',
- id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- attach_source = False,
- repository = REPO,
- license = 'Apache2.0',
-)
-
-maven_jar(
- name = 'acceptance-framework',
- id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
- license = 'Apache2.0',
- attach_source = False,
- repository = REPO,
-)
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md
index 4a3aec8..88e9bc0 100644
--- a/src/main/resources/Documentation/build.md
+++ b/src/main/resources/Documentation/build.md
@@ -36,69 +36,6 @@
./tools/eclipse/project.sh
```
-
-### Buck
-
-
-Clone bucklets library:
-
-```
- git clone https://gerrit.googlesource.com/bucklets
-```
-and link it to @PLUGIN@ directory:
-
-```
- cd @PLUGIN@ && ln -s ../bucklets .
-```
-
-Add link to the .buckversion file:
-
-```
- cd @PLUGIN@ && ln -s bucklets/buckversion .buckversion
-```
-
-Add link to the .watchmanconfig file:
-
-```
- cd @PLUGIN@ && ln -s bucklets/watchmanconfig .watchmanconfig
-```
-
-To build the plugin, issue the following command:
-
-```
- buck build plugin
-```
-
-The output is created in:
-
-```
- buck-out/gen/@PLUGIN@.jar
-```
-
-This project can be imported into the Eclipse IDE:
-
-```
- ./bucklets/tools/eclipse.py
-```
-
-To execute the tests run:
-
-```
- buck test
-```
-
-To build plugin sources run:
-
-```
- buck build src
-```
-
-The output is created in:
-
-```
- buck-out/gen/@PLUGIN@-sources.jar
-```
-
Build in Gerrit tree
--------------------
@@ -131,35 +68,8 @@
bazel test plugins/@PLUGIN@:go_import_tests
```
-### Buck
-
-Clone or link this plugin to the plugins directory of Gerrit's source
-tree, and issue the command:
-
-```
- buck build plugins/@PLUGIN@
-```
-
-The output is created in:
-
-```
- buck-out/gen/plugins/@PLUGIN@/@PLUGIN@.jar
-```
-
-This project can be imported into the Eclipse IDE:
-
-```
- ./tools/eclipse/project.py
-```
-
-To execute the tests run:
-
-```
- buck test --include @PLUGIN@
-```
-
How to build the Gerrit Plugin API is described in the [Gerrit
-documentation](../../../Documentation/dev-buck.html#_extension_and_plugin_api_jar_files).
+documentation](../../../Documentation/dev-bazel.html#_extension_and_plugin_api_jar_files).
[Back to @PLUGIN@ documentation index][index]
