Fix standalone Eclipse project generation Test dependencies were not added to the classpath. Given all test dependencies are exported by Gerrit acceptance-framework, use the latter and remove the now redundant ones. Change-Id: I044d3c48eee7d19fa0504acf8cdda3c7fb9917b0
diff --git a/BUCK b/BUCK index 4ee53bf..4d527fb 100644 --- a/BUCK +++ b/BUCK
@@ -13,22 +13,18 @@ ] ) -# this is required for bucklets/tools/eclipse/project.py to work -# not sure, if this does something useful in standalone context +TEST_DEPS = GERRIT_PLUGIN_API + GERRIT_TESTS + [ + ':quota__plugin' +] + java_library( name = 'classpath', - deps = [':quota__plugin'], + deps = TEST_DEPS, ) java_test( name = 'quota_tests', srcs = glob(['src/test/java/**/*.java']), labels = ['quota'], - deps = GERRIT_PLUGIN_API + [ - ':quota__plugin', - '//lib:junit', - '//lib/easymock:easymock', - '//lib/log:log4j', - '//lib/log:impl_log4j', - ], + deps = TEST_DEPS, )
diff --git a/lib/BUCK b/lib/BUCK deleted file mode 100644 index 6959cde..0000000 --- a/lib/BUCK +++ /dev/null
@@ -1,19 +0,0 @@ -include_defs('//bucklets/maven_jar.bucklet') - -maven_jar( - name = 'junit', - id = 'junit:junit:4.11', - sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0', - attach_source = False, - license = 'DO_NOT_DISTRIBUTE', - deps = [':hamcrest-core'], -) - -maven_jar( - name = 'hamcrest-core', - id = 'org.hamcrest:hamcrest-core:1.3', - sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0', - attach_source = False, - license = 'DO_NOT_DISTRIBUTE', - visibility = ['//lib:junit'], -)
diff --git a/lib/easymock/BUCK b/lib/easymock/BUCK deleted file mode 100644 index 0a4eb4d..0000000 --- a/lib/easymock/BUCK +++ /dev/null
@@ -1,31 +0,0 @@ -include_defs('//bucklets/maven_jar.bucklet') - -maven_jar( - name = 'easymock', - id = 'org.easymock:easymock:3.4', - sha1 = '9fdeea183a399f25c2469497612cad131e920fa3', - license = 'DO_NOT_DISTRIBUTE', - attach_source = False, - deps = [ - ':cglib-2_2', - ':objenesis', - ], -) - -maven_jar( - name = 'cglib-2_2', - id = 'cglib:cglib-nodep:2.2.2', - sha1 = '00d456bb230c70c0b95c76fb28e429d42f275941', - license = 'DO_NOT_DISTRIBUTE', - attach_source = False, -) - -maven_jar( - name = 'objenesis', - id = 'org.objenesis:objenesis:1.2', - sha1 = 'bfcb0539a071a4c5a30690388903ac48c0667f2a', - license = 'DO_NOT_DISTRIBUTE', - visibility = ['//lib/powermock:powermock-reflect'], - attach_source = False, -) -
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK index 4179430..936393a 100644 --- a/lib/gerrit/BUCK +++ b/lib/gerrit/BUCK
@@ -12,3 +12,11 @@ license = 'Apache2.0', ) +maven_jar( + name = 'acceptance-framework', + id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER, + sha1 ='22de68908b0c01fa92f9a9b7124675fd636871b5', + license = 'Apache2.0', + attach_source = False, + repository = REPO, +)
diff --git a/lib/log/BUCK b/lib/log/BUCK deleted file mode 100644 index be5cac5..0000000 --- a/lib/log/BUCK +++ /dev/null
@@ -1,21 +0,0 @@ -include_defs('//bucklets/maven_jar.bucklet') - -VER = '1.7.7' - -maven_jar( - name = 'impl_log4j', - id = 'org.slf4j:slf4j-log4j12:' + VER, - sha1 = '58f588119ffd1702c77ccab6acb54bfb41bed8bd', - license = 'slf4j', - deps = [':log4j'], - attach_source = False, -) - -maven_jar( - name = 'log4j', - id = 'log4j:log4j:1.2.17', - sha1 = '5af35056b4d257e4b64b9e8069c0746e8b08629f', - license = 'Apache2.0', - exclude = ['META-INF/LICENSE', 'META-INF/NOTICE'], - attach_source = False, -)
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md index 7dd1927..e22de10 100644 --- a/src/main/resources/Documentation/build.md +++ b/src/main/resources/Documentation/build.md
@@ -55,6 +55,12 @@ buck test ``` +This project can be imported into the Eclipse IDE: + +``` + ./bucklets/tools/eclipse.py +``` + ### Build in Gerrit tree Clone or link this plugin to the plugins directory of Gerrit's source