From de5db3cb989de2f729d5115dcf197e76888b8fe5 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Mon, 16 Jun 2014 17:37:53 +0200
Subject: [PATCH] Migrate build from Maven to Gradle.

---
 .gitignore           |   2 +
 build.gradle         |   5 ++
 enabler/.gitignore   |   8 ++--
 enabler/build.gradle |  32 +++++++++++++
 enabler/pom.xml      | 111 -------------------------------------------
 pom.xml              |  73 ----------------------------
 service/.gitignore   |   8 ++--
 service/build.gradle |  13 +++++
 service/pom.xml      |  80 -------------------------------
 settings.gradle      |   2 +
 10 files changed, 62 insertions(+), 272 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 build.gradle
 create mode 100644 enabler/build.gradle
 delete mode 100644 enabler/pom.xml
 delete mode 100644 pom.xml
 create mode 100644 service/build.gradle
 delete mode 100644 service/pom.xml
 create mode 100644 settings.gradle

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..9f2a0788
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+build/
+.gradle/
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..912f4a8f
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,5 @@
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/enabler/.gitignore b/enabler/.gitignore
index 73df60d8..b136e5e6 100644
--- a/enabler/.gitignore
+++ b/enabler/.gitignore
@@ -1,4 +1,4 @@
-target
-.classpath
-.project
-.settings
+/.classpath
+/.project
+/.settings/
+/bin/
diff --git a/enabler/build.gradle b/enabler/build.gradle
new file mode 100644
index 00000000..1d8a2d73
--- /dev/null
+++ b/enabler/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'java'
+apply plugin: 'eclipse'
+
+dependencies {
+    compile 'com.google.guava:guava:18.0'
+    compile 'org.slf4j:slf4j-api:1.7.12'
+    compile 'com.google.code.findbugs:jsr305:3.0.0'
+    compile 'org.json:json:20090211' // provided by Android
+    compile 'net.sf.kxml:kxml2:2.3.0' // provided by Android
+    testCompile 'junit:junit:4.11'
+    testRuntime 'org.slf4j:slf4j-jdk14:1.7.12'
+}
+
+sourceSets {
+    main {
+        java.srcDirs = ['src']
+        resources.srcDirs = ['src']
+    }
+    test {
+        java.srcDirs = ['test']
+        resources.srcDirs = ['test']
+    }
+}
+
+compileJava {
+    sourceCompatibility '1.5'
+    targetCompatibility '1.5'
+}
+
+test {
+    exclude 'de/schildbach/pte/live/**'
+}
\ No newline at end of file
diff --git a/enabler/pom.xml b/enabler/pom.xml
deleted file mode 100644
index 8369e1b8..00000000
--- a/enabler/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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>de.schildbach.pte</groupId>
-	<artifactId>public-transport-enabler</artifactId>
-	<name>enabler</name>
-	<version>1.0-SNAPSHOT</version>
-
-	<parent>
-		<groupId>de.schildbach.pte</groupId>
-		<artifactId>base</artifactId>
-		<version>1</version>
-	</parent>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>18.0</version>
-		</dependency>
-
-		<!-- org.slf4j.* -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.12</version>
-		</dependency>
-
-		<!-- javax.annotation.* -->
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>jsr305</artifactId>
-			<version>3.0.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20090211</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>net.sf.kxml</groupId>
-			<artifactId>kxml2</artifactId>
-			<version>2.3.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- org.slf4j.* -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<version>1.7.12</version>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test</testSourceDirectory>
-		<resources>
-			<resource>
-				<directory>src</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>test</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-		</testResources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>de/schildbach/pte/live/**</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index cf21f882..00000000
--- a/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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>de.schildbach.pte</groupId>
-	<artifactId>base</artifactId>
-	<name>base</name>
-	<version>1</version>
-	<packaging>pom</packaging>
-
-	<modules>
-		<module>enabler</module>
-		<module>service</module>
-	</modules>
-
-	<developers>
-		<developer>
-			<name>Andreas Schildbach</name>
-			<email>andreas@schildbach.de</email>
-			<url>http://schildbach.de</url>
-		</developer>
-	</developers>
-
-	<scm>
-		<url>http://code.google.com/p/public-transport-enabler/source/checkout</url>
-		<connection>scm:git:https://code.google.com/p/public-transport-enabler/</connection>
-	</scm>
-
-	<issueManagement>
-		<url>http://code.google.com/p/public-transport-enabler/issues/list</url>
-	</issueManagement>
-
-	<mailingLists>
-		<mailingList>
-			<name>public-transport-enabler-discuss Google Group</name>
-			<post>https://groups.google.com/forum/#!forum/public-transport-enabler-discuss</post>
-		</mailingList>
-	</mailingLists>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.0</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.12.4</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<version>2.3.1</version>
-				<configuration>
-					<pushChanges>false</pushChanges>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-</project>
diff --git a/service/.gitignore b/service/.gitignore
index 73df60d8..b136e5e6 100644
--- a/service/.gitignore
+++ b/service/.gitignore
@@ -1,4 +1,4 @@
-target
-.classpath
-.project
-.settings
+/.classpath
+/.project
+/.settings/
+/bin/
diff --git a/service/build.gradle b/service/build.gradle
new file mode 100644
index 00000000..aba54eb9
--- /dev/null
+++ b/service/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'java'
+apply plugin: 'eclipse'
+
+dependencies {
+    compile project(':enabler')
+    compile 'org.springframework:spring-webmvc:3.1.0.RELEASE'
+    compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.4'
+}
+
+compileJava {
+    sourceCompatibility '1.6'
+    targetCompatibility '1.6'
+}
diff --git a/service/pom.xml b/service/pom.xml
deleted file mode 100644
index 9bad9150..00000000
--- a/service/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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>de.schildbach.pte</groupId>
-	<artifactId>public-transport-service</artifactId>
-	<name>service</name>
-	<version>1.0-SNAPSHOT</version>
-	<packaging>war</packaging>
-
-	<parent>
-		<groupId>de.schildbach.pte</groupId>
-		<artifactId>base</artifactId>
-		<version>1</version>
-	</parent>
-
-	<developers>
-		<developer>
-			<name>Andreas Schildbach</name>
-			<email>andreas@schildbach.de</email>
-		</developer>
-	</developers>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>de.schildbach.pte</groupId>
-			<artifactId>public-transport-enabler</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20090211</version>
-		</dependency>
-
-		<dependency>
-			<groupId>net.sf.kxml</groupId>
-			<artifactId>kxml2</artifactId>
-			<version>2.3.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>3.1.0.RELEASE</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.4</version>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..acfcc89d
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+include 'enabler'
+include 'service'