From 3a0463529a788a70d622c90556b3d2ff8bac55bf Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Mon, 28 Jul 2014 14:51:11 -0700
Subject: [PATCH] Move libraries.config to init subpackage

This resource is only used by init/Libraries.java, and after moving
this the resource globs can fall along package boundaries as well.

Change-Id: Id62aeb5bbcaa97509ccab47ecdf377d0a02da59a
---
 gerrit-pgm/BUCK                                       | 11 +++--------
 .../java/com/google/gerrit/pgm/init/Libraries.java    |  2 +-
 .../com/google/gerrit/pgm/{ => init}/libraries.config |  0
 lib/bouncycastle/BUCK                                 |  2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)
 rename gerrit-pgm/src/main/resources/com/google/gerrit/pgm/{ => init}/libraries.config (100%)

diff --git a/gerrit-pgm/BUCK b/gerrit-pgm/BUCK
index 4d4b7948c0..8c14cc831c 100644
--- a/gerrit-pgm/BUCK
+++ b/gerrit-pgm/BUCK
@@ -1,4 +1,5 @@
 SRCS = 'src/main/java/com/google/gerrit/pgm/'
+RSRCS = 'src/main/resources/com/google/gerrit/pgm/'
 
 INIT_API_SRCS = glob([SRCS + 'init/api/*.java'])
 
@@ -25,15 +26,11 @@ java_sources(
 )
 
 INIT_SRCS = glob([SRCS + 'init/*.java'])
-INIT_RSRCS = [
-  'src/main/resources/com/google/gerrit/pgm/libraries.config',
-  'src/main/resources/com/google/gerrit/pgm/init/gerrit.sh',
-]
 
 java_library(
   name = 'init',
   srcs = INIT_SRCS,
-  resources = INIT_RSRCS,
+  resources = glob([RSRCS + 'init/*']),
   deps = [
     ':init-api',
     ':util',
@@ -93,9 +90,7 @@ java_library(
     ['src/main/java/**/*.java'],
     excludes = INIT_API_SRCS + INIT_SRCS + UTIL_SRCS
   ),
-  resources = glob(
-    ['src/main/resources/**/*'],
-    excludes = INIT_RSRCS),
+  resources = glob([RSRCS + '*']),
   deps = [
     ':init',
     ':init-api',
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java
index 7209990d04..ea8f0f11a2 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java
@@ -33,7 +33,7 @@ import java.lang.reflect.Modifier;
 @Singleton
 class Libraries {
   private static final String RESOURCE_FILE =
-      "com/google/gerrit/pgm/libraries.config";
+      "com/google/gerrit/pgm/init/libraries.config";
 
   private final Provider<LibraryDownloader> downloadProvider;
 
diff --git a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/libraries.config b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
similarity index 100%
rename from gerrit-pgm/src/main/resources/com/google/gerrit/pgm/libraries.config
rename to gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
diff --git a/lib/bouncycastle/BUCK b/lib/bouncycastle/BUCK
index 99f960e81c..038de5dcfb 100644
--- a/lib/bouncycastle/BUCK
+++ b/lib/bouncycastle/BUCK
@@ -1,7 +1,7 @@
 include_defs('//lib/maven.defs')
 
 # This version must match the version that also appears in
-# gerrit-pgm/src/main/resources/com/google/gerrit/pgm/libraries.config
+# gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
 VERSION = '1.49'
 
 maven_jar(