From d1a3f68b804cd8d87be73d42a401aa23a387fe04 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Tue, 29 Dec 2009 17:07:01 -0800
Subject: [PATCH] Cleanup Maven build by pushing component dependencies down

Rather than listing all of our build projects in the parent pom,
list them where they are actually required to compile.

Change-Id: I27954f3e4affdaa258ee024c0899f0cacd3f2ae4
Signed-off-by: Shawn O. Pearce <sop@google.com>
---
 gerrit-common/pom.xml           |   2 +
 gerrit-gwtdebug/pom.xml         |   2 +
 gerrit-gwtui/pom.xml            |   8 ++
 gerrit-httpd/pom.xml            |   1 +
 gerrit-main/pom.xml             |   1 +
 gerrit-patch-commonsnet/pom.xml |   1 +
 gerrit-pgm/pom.xml              |   5 ++
 gerrit-server/pom.xml           |   3 +
 gerrit-sshd/pom.xml             |   7 +-
 gerrit-war/pom.xml              |   5 ++
 pom.xml                         | 126 --------------------------------
 11 files changed, 30 insertions(+), 131 deletions(-)

diff --git a/gerrit-common/pom.xml b/gerrit-common/pom.xml
index 5956829290..d261395c3c 100644
--- a/gerrit-common/pom.xml
+++ b/gerrit-common/pom.xml
@@ -47,11 +47,13 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-reviewdb</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-patch-jgit</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/gerrit-gwtdebug/pom.xml b/gerrit-gwtdebug/pom.xml
index 2b3c3f9b4e..d0ef9d787a 100644
--- a/gerrit-gwtdebug/pom.xml
+++ b/gerrit-gwtdebug/pom.xml
@@ -41,11 +41,13 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-gwtui</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-war</artifactId>
+      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.gerrit</groupId>
diff --git a/gerrit-gwtui/pom.xml b/gerrit-gwtui/pom.xml
index 95545a360b..a2c5f336a6 100644
--- a/gerrit-gwtui/pom.xml
+++ b/gerrit-gwtui/pom.xml
@@ -83,11 +83,13 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-reviewdb</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-reviewdb</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
       <classifier>sources</classifier>
       <type>jar</type>
@@ -96,11 +98,13 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-common</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-common</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
       <classifier>sources</classifier>
       <type>jar</type>
@@ -109,11 +113,13 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-patch-jgit</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-patch-jgit</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
       <classifier>sources</classifier>
       <type>jar</type>
@@ -135,11 +141,13 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-patch-gwtexpui</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-patch-gwtexpui</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
       <classifier>sources</classifier>
       <type>jar</type>
diff --git a/gerrit-httpd/pom.xml b/gerrit-httpd/pom.xml
index e4e007a55c..fa9a9197da 100644
--- a/gerrit-httpd/pom.xml
+++ b/gerrit-httpd/pom.xml
@@ -67,6 +67,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-server</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/gerrit-main/pom.xml b/gerrit-main/pom.xml
index 57eb32ba21..db9e1c0a71 100644
--- a/gerrit-main/pom.xml
+++ b/gerrit-main/pom.xml
@@ -36,6 +36,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-launcher</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/gerrit-patch-commonsnet/pom.xml b/gerrit-patch-commonsnet/pom.xml
index f917086107..5bbae03533 100644
--- a/gerrit-patch-commonsnet/pom.xml
+++ b/gerrit-patch-commonsnet/pom.xml
@@ -51,6 +51,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-util-ssl</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/gerrit-pgm/pom.xml b/gerrit-pgm/pom.xml
index 15b966e573..0d84f79fef 100644
--- a/gerrit-pgm/pom.xml
+++ b/gerrit-pgm/pom.xml
@@ -51,27 +51,32 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-main</artifactId>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-util-cli</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-server</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-sshd</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-httpd</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
diff --git a/gerrit-server/pom.xml b/gerrit-server/pom.xml
index 7cc74a8a9d..08e5c8c9a9 100644
--- a/gerrit-server/pom.xml
+++ b/gerrit-server/pom.xml
@@ -103,16 +103,19 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-common</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-util-ssl</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-patch-commonsnet</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
diff --git a/gerrit-sshd/pom.xml b/gerrit-sshd/pom.xml
index ac550499fb..32bcf57c54 100644
--- a/gerrit-sshd/pom.xml
+++ b/gerrit-sshd/pom.xml
@@ -56,16 +56,13 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-util-cli</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-server</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-    </plugins>
-  </build>
 </project>
diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml
index 21164a4936..34b125b8ff 100644
--- a/gerrit-war/pom.xml
+++ b/gerrit-war/pom.xml
@@ -44,6 +44,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-gwtui</artifactId>
+      <version>${project.version}</version>
       <type>war</type>
       <scope>runtime</scope>
     </dependency>
@@ -51,6 +52,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-main</artifactId>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -81,16 +83,19 @@ limitations under the License.
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-sshd</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-httpd</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-pgm</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index fc211a4196..97af8d5e42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,132 +342,6 @@ limitations under the License.
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-patch-commonsnet</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-patch-gwtexpui</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-patch-gwtexpui</artifactId>
-        <version>${project.version}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-patch-jgit</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-patch-jgit</artifactId>
-        <version>${project.version}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-common</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-common</artifactId>
-        <version>${project.version}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-gwtui</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-gwtui</artifactId>
-        <version>${project.version}</version>
-        <type>war</type>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-httpd</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-launcher</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-main</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-pgm</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-reviewdb</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-reviewdb</artifactId>
-        <version>${project.version}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-server</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-sshd</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-war</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-war</artifactId>
-        <version>${project.version}</version>
-        <type>war</type>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-util-cli</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.gerrit</groupId>
-        <artifactId>gerrit-util-ssl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>gwtorm</groupId>
         <artifactId>gwtorm</artifactId>