From 0b1d8fc40e9acba5f0b12942966ee3120e69db1f Mon Sep 17 00:00:00 2001
From: Miguel Lavigne <mlavigne@lixar.com>
Date: Mon, 17 Jun 2013 16:33:31 -0400
Subject: [PATCH 1/2] Adding basic maven building support

Added basic support for maven both the library and the example project.
Added maven 'target' directory to .gitignore.
Moved the dependencies and plugins version to properties in the parent.
---
 .gitignore                              |  1 +
 android-mapviewballoons-example/pom.xml | 45 ++++++++++++++++
 android-mapviewballoons/pom.xml         | 39 ++++++++++++++
 pom.xml                                 | 71 +++++++++++++++++++++++++
 4 files changed, 156 insertions(+)
 create mode 100644 android-mapviewballoons-example/pom.xml
 create mode 100644 android-mapviewballoons/pom.xml
 create mode 100644 pom.xml

diff --git a/.gitignore b/.gitignore
index 08a0f3b..43a526e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ android-mapviewballoons/gen/
 android-mapviewballoons-example/local.properties
 android-mapviewballoons-example/bin/
 android-mapviewballoons-example/gen/
+target/
diff --git a/android-mapviewballoons-example/pom.xml b/android-mapviewballoons-example/pom.xml
new file mode 100644
index 0000000..d465aad
--- /dev/null
+++ b/android-mapviewballoons-example/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+	
+    <parent>
+        <groupId>com.github.jgilfelt.mapviewballoons</groupId>
+        <artifactId>parent</artifactId>
+		<version>1.5.2-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+    </parent>
+	
+	<artifactId>example</artifactId>
+	<packaging>apk</packaging>
+	<name>MapViewBalloons - Example</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.android.maps</groupId>
+            <artifactId>maps</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mapviewballoons</artifactId>
+			<version>${project.version}</version>
+			<type>apklib</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+		
+        <plugins>
+            <plugin>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+            </plugin>
+    	</plugins>
+    </build>
+</project>
diff --git a/android-mapviewballoons/pom.xml b/android-mapviewballoons/pom.xml
new file mode 100644
index 0000000..156b3cb
--- /dev/null
+++ b/android-mapviewballoons/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+	
+    <parent>
+        <groupId>com.github.jgilfelt.mapviewballoons</groupId>
+        <artifactId>parent</artifactId>
+		<version>1.5.2-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+    </parent>
+	
+	<artifactId>mapviewballoons</artifactId>
+	<packaging>apklib</packaging>
+	<name>MapViewBalloons - Library</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.android.maps</groupId>
+            <artifactId>maps</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+		
+        <plugins>
+            <plugin>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+            </plugin>
+    	</plugins>
+    </build>
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..ecfcbdb
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>	
+	
+	<groupId>com.github.jgilfelt.mapviewballoons</groupId>
+	<artifactId>parent</artifactId>
+	<version>1.5.2-SNAPSHOT</version>	
+	<packaging>pom</packaging>
+	<name>MapViewBalloons - PARENT</name>
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		
+		<!-- Plugins -->
+		<jdk.version>1.6</jdk.version>
+		<sdk.platform>15</sdk.platform>
+		<android-maven-plugin.version>3.6.0</android-maven-plugin.version>
+		<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
+		<maven-release-plugin.version>2.2.1</maven-release-plugin.version>
+		
+		<!-- Dependencies -->
+		<android.version>4.1.1.4</android.version>
+		<android.maps.version>8_r2</android.maps.version>
+	</properties>
+	
+    <modules>
+        <module>android-mapviewballoons</module>
+        <module>android-mapviewballoons-example</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.android</groupId>
+                <artifactId>android</artifactId>
+                <version>${android.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.android.maps</groupId>
+                <artifactId>maps</artifactId>
+                <version>${android.maps.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+	
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                    <artifactId>android-maven-plugin</artifactId>
+                    <version>${android-maven-plugin.version}</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <sdk>
+                            <platform>${sdk.platform}</platform>
+                        </sdk>
+                    </configuration>
+                </plugin>
+	            <plugin>
+	                <artifactId>maven-compiler-plugin</artifactId>
+	                <version>${maven-compiler-plugin.version}</version>
+	                <configuration>
+	                    <source>${jdk.version}</source>
+	                    <target>${jdk.version}</target>
+	                </configuration>
+	            </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>

From 3ddfb10349eb25fbe94afcb11b2812912efb4eaa Mon Sep 17 00:00:00 2001
From: Miguel Lavigne <mlavigne@lixar.com>
Date: Mon, 17 Jun 2013 17:47:13 -0400
Subject: [PATCH 2/2] Reformat pom files

---
 android-mapviewballoons-example/pom.xml | 26 +++++-----
 android-mapviewballoons/pom.xml         | 22 ++++----
 pom.xml                                 | 68 +++++++++++++------------
 3 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/android-mapviewballoons-example/pom.xml b/android-mapviewballoons-example/pom.xml
index d465aad..ff9cdb1 100644
--- a/android-mapviewballoons-example/pom.xml
+++ b/android-mapviewballoons-example/pom.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-	
+
     <parent>
         <groupId>com.github.jgilfelt.mapviewballoons</groupId>
         <artifactId>parent</artifactId>
-		<version>1.5.2-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+        <version>1.5.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-	
-	<artifactId>example</artifactId>
-	<packaging>apk</packaging>
-	<name>MapViewBalloons - Example</name>
+
+    <artifactId>example</artifactId>
+    <packaging>apk</packaging>
+    <name>MapViewBalloons - Example</name>
 
     <dependencies>
         <dependency>
@@ -27,19 +29,19 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mapviewballoons</artifactId>
-			<version>${project.version}</version>
-			<type>apklib</type>
+            <version>${project.version}</version>
+            <type>apklib</type>
         </dependency>
     </dependencies>
 
     <build>
         <sourceDirectory>src</sourceDirectory>
-		
+
         <plugins>
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
             </plugin>
-    	</plugins>
+        </plugins>
     </build>
 </project>
diff --git a/android-mapviewballoons/pom.xml b/android-mapviewballoons/pom.xml
index 156b3cb..1615476 100644
--- a/android-mapviewballoons/pom.xml
+++ b/android-mapviewballoons/pom.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-	
+
     <parent>
         <groupId>com.github.jgilfelt.mapviewballoons</groupId>
         <artifactId>parent</artifactId>
-		<version>1.5.2-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+        <version>1.5.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-	
-	<artifactId>mapviewballoons</artifactId>
-	<packaging>apklib</packaging>
-	<name>MapViewBalloons - Library</name>
+
+    <artifactId>mapviewballoons</artifactId>
+    <packaging>apklib</packaging>
+    <name>MapViewBalloons - Library</name>
 
     <dependencies>
         <dependency>
@@ -28,12 +30,12 @@
 
     <build>
         <sourceDirectory>src</sourceDirectory>
-		
+
         <plugins>
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
             </plugin>
-    	</plugins>
+        </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index ecfcbdb..25fa768 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>	
-	
-	<groupId>com.github.jgilfelt.mapviewballoons</groupId>
-	<artifactId>parent</artifactId>
-	<version>1.5.2-SNAPSHOT</version>	
-	<packaging>pom</packaging>
-	<name>MapViewBalloons - PARENT</name>
-	
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		
-		<!-- Plugins -->
-		<jdk.version>1.6</jdk.version>
-		<sdk.platform>15</sdk.platform>
-		<android-maven-plugin.version>3.6.0</android-maven-plugin.version>
-		<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
-		<maven-release-plugin.version>2.2.1</maven-release-plugin.version>
-		
-		<!-- Dependencies -->
-		<android.version>4.1.1.4</android.version>
-		<android.maps.version>8_r2</android.maps.version>
-	</properties>
-	
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.github.jgilfelt.mapviewballoons</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.5.2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>MapViewBalloons - PARENT</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <!-- Plugins -->
+        <jdk.version>1.6</jdk.version>
+        <sdk.platform>15</sdk.platform>
+        <android-maven-plugin.version>3.6.0</android-maven-plugin.version>
+        <maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
+        <maven-release-plugin.version>2.2.1</maven-release-plugin.version>
+
+        <!-- Dependencies -->
+        <android.version>4.1.1.4</android.version>
+        <android.maps.version>8_r2</android.maps.version>
+    </properties>
+
     <modules>
         <module>android-mapviewballoons</module>
         <module>android-mapviewballoons-example</module>
@@ -42,7 +44,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-	
+
     <build>
         <pluginManagement>
             <plugins>
@@ -57,14 +59,14 @@
                         </sdk>
                     </configuration>
                 </plugin>
-	            <plugin>
-	                <artifactId>maven-compiler-plugin</artifactId>
-	                <version>${maven-compiler-plugin.version}</version>
-	                <configuration>
-	                    <source>${jdk.version}</source>
-	                    <target>${jdk.version}</target>
-	                </configuration>
-	            </plugin>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                    <configuration>
+                        <source>${jdk.version}</source>
+                        <target>${jdk.version}</target>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>