From a119286b298c41eae2ec1f5abf749f7c0bf09c5a Mon Sep 17 00:00:00 2001
From: Mike Hearn <hearn@google.com>
Date: Fri, 16 Mar 2012 13:20:50 +0100
Subject: [PATCH] POM changes and refactorings from Gary.

---
 core/pom.xml     |  34 ++++------------
 examples/pom.xml |   9 ++++-
 pom.xml          | 103 ++++++++++++++++++++++++++++++++++++++++++++---
 tools/pom.xml    |  26 +++++++-----
 4 files changed, 128 insertions(+), 44 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 8036018dc..0b395c847 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,14 +18,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>bitcoinj</artifactId>
         <groupId>com.google</groupId>
+        <artifactId>bitcoinj-parent</artifactId>
         <version>0.5-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bitcoinj-core</artifactId>
+    <groupId>com.google</groupId>
+    <artifactId>bitcoinj</artifactId>
+
+    <name>BitCoinJ</name>
+    <description>A Java Bitcoin library</description>
 
     <profiles>
         <profile>
@@ -181,19 +185,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>${easymock.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
         </dependency>
         <!-- BitCoinJ consumers are expected to provide their own SLF4J adapters
              such as logback, slf4j-log4j12, slf4j-jcl and so on
@@ -201,17 +200,11 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>${slf4j.version}</version>
-            <scope>runtime</scope>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-            <scope>runtime</scope>
-            <optional>true</optional>
         </dependency>
 
         <!-- In Android these libraries are incomplete,
@@ -219,25 +212,12 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
-            <version>${bcprov-jdk15.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>${protobuf.version}</version>
         </dependency>
     </dependencies>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!-- Third-party dependencies -->
-        <bcprov-jdk15.version>1.46</bcprov-jdk15.version>
-        <easymock.version>3.0</easymock.version>
-        <junit.version>4.8.2</junit.version>
-        <slf4j.version>1.6.2</slf4j.version>
-        <derby.version>10.8.2.2</derby.version>
-        <protobuf.version>2.4.1</protobuf.version>
-        <generated.sourceDirectory>gen</generated.sourceDirectory>
-    </properties>
 </project>
\ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index 32c6df00e..508c3b18a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -19,18 +19,23 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bitcoinj</artifactId>
         <groupId>com.google</groupId>
+        <artifactId>bitcoinj-parent</artifactId>
         <version>0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.google</groupId>
     <artifactId>bitcoinj-examples</artifactId>
+    <version>0.5-SNAPSHOT</version>
+
+    <name>BitCoinJ Examples</name>
+    <description>A collection of examples using the BitCoinJ library</description>
 
     <dependencies>
         <dependency>
             <groupId>com.google</groupId>
-            <artifactId>bitcoinj-core</artifactId>
+            <artifactId>bitcoinj</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 86dc01716..d84da0812 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>com.google</groupId>
-  <artifactId>bitcoinj</artifactId>
-  <packaging>pom</packaging>
+  <artifactId>bitcoinj-parent</artifactId>
   <version>0.5-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
   <modules>
     <module>core</module>
     <module>examples</module>
-      <module>tools</module>
+    <module>tools</module>
   </modules>
-  <name>BitCoinJ</name>
-  <description>A Java implementation of a Bitcoin client-only node</description>
+
+  <name>BitCoinJ Parent</name>
+  <description>Provides the common configuration for the BitCoinJ modules</description>
   <url>http://code.google.com/p/bitcoinj</url>
 
   <ciManagement>
@@ -132,4 +135,94 @@
       <url>http://nexus.bitcoinj.org/content/repositories/snapshots</url>
     </repository>
   </repositories>
+
+  <!-- Common build plugin configuration -->
+  <build>
+      <pluginManagement>
+        <plugins>
+          <!-- Ensure compilation is done under Java 5 for backwards compatibility -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>2.3.2</version>
+            <configuration>
+              <source>1.5</source>
+              <target>1.5</target>
+              <showDeprecation>true</showDeprecation>
+              <showWarnings>true</showWarnings>
+            </configuration>
+          </plugin>
+        </plugins>
+    </pluginManagement>
+  </build>
+
+  <!-- Common dependencies -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>${easymock.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <!-- BitCoinJ consumers are expected to provide their own SLF4J adapters
+    such as logback, slf4j-log4j12, slf4j-jcl and so on
+    see http://www.slf4j.org/faq.html -->
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>${slf4j.version}</version>
+        <scope>runtime</scope>
+        <optional>true</optional>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <version>${derby.version}</version>
+        <scope>runtime</scope>
+        <optional>true</optional>
+      </dependency>
+
+      <!-- In Android these libraries are incomplete,
+           so use the dedicated artifact (bitcoinj-<version>-android.jar) -->
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-jdk15</artifactId>
+        <version>${bcprov-jdk15.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${protobuf.version}</version>
+      </dependency>
+    </dependencies>
+
+  </dependencyManagement>
+
+  <!-- Common properties -->
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- Third-party dependencies -->
+    <bcprov-jdk15.version>1.46</bcprov-jdk15.version>
+    <easymock.version>3.0</easymock.version>
+    <junit.version>4.8.2</junit.version>
+    <slf4j.version>1.6.2</slf4j.version>
+    <derby.version>10.8.2.2</derby.version>
+    <protobuf.version>2.4.1</protobuf.version>
+    <generated.sourceDirectory>gen</generated.sourceDirectory>
+  </properties>
+
 </project>
diff --git a/tools/pom.xml b/tools/pom.xml
index d02ce47e9..adab09751 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -18,20 +18,25 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>bitcoinj</artifactId>
-        <groupId>com.google</groupId>
-        <version>0.5-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.google</groupId>
+    <artifactId>bitcoinj-parent</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bitcoinj-tools</artifactId>
+  <groupId>com.google</groupId>
+  <artifactId>bitcoinj-tools</artifactId>
+  <version>0.5-SNAPSHOT</version>
+
+  <name>BitCoinJ Tools</name>
+  <description>A collection of useful tools that use the BitCoinJ library to perform wallet operations</description>
 
     <dependencies>
         <dependency>
-            <groupId>com.google</groupId>
-            <artifactId>bitcoinj-core</artifactId>
-            <version>${project.parent.version}</version>
+          <groupId>com.google</groupId>
+          <artifactId>bitcoinj</artifactId>
+          <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
@@ -44,4 +49,5 @@
             <version>1.6.4</version>
         </dependency>
     </dependencies>
+
 </project>
\ No newline at end of file