Merge branch 'stable-2.14'
* stable-2.14:
Update javamelody-core to 1.67.0
Remove Buck build
Change-Id: I010fbf40d8781d8c3bd54710be73cbd6b3b60c5a
diff --git a/.buckconfig b/.buckconfig
deleted file mode 100644
index 6e317bb..0000000
--- a/.buckconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[alias]
- all = //:all
- javamelody = //:javamelody
- javamelody-datasource-interceptor = //:javamelody-datasource-interceptor
- javamelody-deps = //:javamelody-deps
- javamelody-nodep = //:javamelody-nodep
- plugin = //:javamelody
-
-[java]
- src_roots = java, resources
-
-[project]
- ignore = .git
-
-[cache]
- mode = dir
- dir = buck-out/cache
diff --git a/.gitignore b/.gitignore
index 9382d43..0182e79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,6 @@
-/buck-out
-/bucklets
/target
-/.buckd
-/.buckversion
/.classpath
/.idea
/.project
/.settings/org.maven.ide.eclipse.prefs
/.settings/org.eclipse.m2e.core.prefs
-/.watchmanconfig
diff --git a/BUCK b/BUCK
deleted file mode 100644
index 799c3d0..0000000
--- a/BUCK
+++ /dev/null
@@ -1,82 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-include_defs('//bucklets/maven_jar.bucklet')
-
-INTERCEPTOR = ['src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java']
-SRCS = glob(['src/main/java/**/*.java'], excludes = INTERCEPTOR)
-RSRC = glob(['src/main/resources/**/*'])
-DEPS = [
- ':javamelody-lib',
- ':jrobin-lib',
-]
-
-manifest_entries = [
- 'Gerrit-PluginName: javamelody',
- 'Gerrit-Module: com.googlesource.gerrit.plugins.javamelody.Module',
- 'Gerrit-HttpModule: com.googlesource.gerrit.plugins.javamelody.HttpModule',
- 'Implementation-Title: Javamelody plugin',
- 'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/javamelody',
-]
-
-gerrit_plugin(
- name = 'javamelody',
- srcs = SRCS,
- resources = RSRC,
- manifest_entries = manifest_entries,
- deps = DEPS,
-)
-
-gerrit_plugin(
- name = 'javamelody-nodep',
- srcs = SRCS,
- resources = RSRC,
- manifest_entries = manifest_entries,
- provided_deps = DEPS,
-)
-
-java_library(
- name = 'classpath',
- deps = [
- ':javamelody-nodep__plugin',
- ':javamelody__plugin',
- ],
-)
-
-java_binary(
- name = 'javamelody-deps',
- deps = DEPS,
-)
-
-java_binary(
- name = 'javamelody-datasource-interceptor',
- deps = [':javamelody-datasource-interceptor-lib'],
-)
-
-java_library(
- name = 'javamelody-datasource-interceptor-lib',
- srcs = INTERCEPTOR,
- provided_deps = DEPS + GERRIT_PLUGIN_API,
-)
-
-zip_file(
- name = 'all',
- srcs = [
- ':javamelody',
- ':javamelody-datasource-interceptor',
- ':javamelody-deps',
- ':javamelody-nodep',
- ],
-)
-
-maven_jar(
- name = 'javamelody-lib',
- id = 'net.bull.javamelody:javamelody-core:1.62.0',
- sha1 = 'f1ee3fe3a023d07cd071dbd424a1b1d7bafbc59a',
- license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
- name = 'jrobin-lib',
- id = 'org.jrobin:jrobin:1.5.9',
- sha1 = 'bd9a84484c67de930fa841f23cd6a93108b05cd0',
- license = 'DO_NOT_DISTRIBUTE',
-)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index d7a59a1..6b3a7bc 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,8 +3,8 @@
def external_plugin_deps():
maven_jar(
name = 'javamelody_lib',
- artifact = 'net.bull.javamelody:javamelody-core:1.62.0',
- sha1 = 'f1ee3fe3a023d07cd071dbd424a1b1d7bafbc59a',
+ artifact = 'net.bull.javamelody:javamelody-core:1.67.0',
+ sha1 = '7553233d944dd3096deb3af3d54f8a4d3c237b20',
)
maven_jar(
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
deleted file mode 100644
index 47e5330..0000000
--- a/lib/gerrit/BUCK
+++ /dev/null
@@ -1,13 +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,
- 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 b09446a..7e829b8 100644
--- a/src/main/resources/Documentation/build.md
+++ b/src/main/resources/Documentation/build.md
@@ -47,5 +47,5 @@
./tools/eclipse/project.py
```
-More information about Buck can be found in the [Gerrit
+More information about Bazel can be found in the [Gerrit
documentation](../../../Documentation/dev-bazel.html).