Merge "Adds gradle-api prebuilts"
diff --git a/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.jar b/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.jar
deleted file mode 100644
index 7ba2a90..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.jar.sha1 b/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.jar.sha1
deleted file mode 100644
index bbffefc..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7c63cd7aeb55d63e3e208b77882831c7ac588ed8
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.pom b/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.pom
deleted file mode 100644
index 319db0f..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.pom
+++ /dev/null
@@ -1,38 +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>org.robolectric</groupId>
-  <artifactId>android-all</artifactId>
-  <version>5.0.0_r2-robolectric-1</version>
-  <packaging>jar</packaging>
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
-  <name>Google Android android-all Library</name>
-  <description>
-    A library jar that provides APIs for Applications written for the Google Android Platform.
-  </description>
-  <url>http://source.android.com/</url>
-  <inceptionYear>2008</inceptionYear>
-  <licenses>
-    <license>
-      <name>Apache 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>
-        While the EULA for the Android SDK restricts distribution of those binaries, the source code is licensed under Apache 2.0 which allows compiling binaries from source and then distributing those versions.
-      </comments>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://android.git.kernel.org/</url>
-    <connection>git://android.git.kernel.org/platform/manifest.git</connection>
-  </scm>
-  <developers>
-    <developer>
-      <name>The Android Open Source Projects</name>
-    </developer>
-  </developers>
-</project>
diff --git a/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.pom.sha1 b/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.pom.sha1
deleted file mode 100644
index 4c5b73a..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.0.0_r2-robolectric-1/android-all-5.0.0_r2-robolectric-1.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-412ffc6804f72d28a7e2e96148eaca55fac3d60a
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/_remote.repositories b/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/_remote.repositories
deleted file mode 100644
index 874a81b..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 15:10:41 PST 2015
-android-all-5.1.1_r9-robolectric-0.jar>central=
-android-all-5.1.1_r9-robolectric-0.pom>central=
diff --git a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.jar b/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.jar
deleted file mode 100644
index 2134203..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.jar.sha1 b/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.jar.sha1
deleted file mode 100644
index 1aa8214..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b94177b903f4b22efa9ed8c995d437546e81084
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.pom b/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.pom
deleted file mode 100644
index 0b02217..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.pom
+++ /dev/null
@@ -1,38 +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>org.robolectric</groupId>
-  <artifactId>android-all</artifactId>
-  <version>5.1.1_r9-robolectric-0</version>
-  <packaging>jar</packaging>
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
-  <name>Google Android android-all Library</name>
-  <description>
-    A library jar that provides APIs for Applications written for the Google Android Platform.
-  </description>
-  <url>http://source.android.com/</url>
-  <inceptionYear>2008</inceptionYear>
-  <licenses>
-    <license>
-      <name>Apache 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>
-        While the EULA for the Android SDK restricts distribution of those binaries, the source code is licensed under Apache 2.0 which allows compiling binaries from source and then distributing those versions.
-      </comments>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://android.git.kernel.org/</url>
-    <connection>git://android.git.kernel.org/platform/manifest.git</connection>
-  </scm>
-  <developers>
-    <developer>
-      <name>The Android Open Source Projects</name>
-    </developer>
-  </developers>
-</project>
diff --git a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.pom.sha1 b/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.pom.sha1
deleted file mode 100644
index 04d35c6..0000000
--- a/common/m2/repository/org/robolectric/android-all/5.1.1_r9-robolectric-0/android-all-5.1.1_r9-robolectric-0.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f98f02fb93dd0986d1bdca72e01ff809d83f74d5
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/_remote.repositories b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index 5340786..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 15:10:39 PST 2015
-robolectric-annotations-3.1-20151125.203249-120.pom>temp=
-robolectric-annotations-3.1-20151125.203249-120.jar>temp=
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
deleted file mode 100644
index 6460747..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-annotations</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203249</timestamp>
-      <buildNumber>120</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203249</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
deleted file mode 100644
index 9859b17..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8815be4e0d41734c6c268261ca67814a043b53d2
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype.xml b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype.xml
deleted file mode 100644
index 6460747..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-annotations</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203249</timestamp>
-      <buildNumber>120</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203249</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
deleted file mode 100644
index 7b7317e..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8815be4e0d41734c6c268261ca67814a043b53d2
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-temp.xml b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-temp.xml
deleted file mode 100644
index 6460747..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-temp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-annotations</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203249</timestamp>
-      <buildNumber>120</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203249</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203249-120</value>
-        <updated>20151125203249</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
deleted file mode 100644
index 9859b17..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8815be4e0d41734c6c268261ca67814a043b53d2
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/resolver-status.properties b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index 81a6851..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:35:56 PST 2015
-maven-metadata-sonatype-nexus-snapshots.xml.lastUpdated=1448493038050
-maven-metadata-temp.xml.lastUpdated=1448501756643
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.jar b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.jar
deleted file mode 100644
index e9f33ee..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.jar.sha1 b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.jar.sha1
deleted file mode 100644
index bb1977c..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d64fe0bed954cf2b20eeeccdec608998adcb784d
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.pom b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.pom
deleted file mode 100644
index 96c732a..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.pom
+++ /dev/null
@@ -1,43 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric-annotations</artifactId>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.pom.sha1 b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.pom.sha1
deleted file mode 100644
index 54ebded..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-20151125.203249-120.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-75338a29ea5e004e9e834bb18bc1fec5dc890746
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-SNAPSHOT.jar b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-SNAPSHOT.jar
deleted file mode 100644
index e9f33ee..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-SNAPSHOT.pom b/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-SNAPSHOT.pom
deleted file mode 100644
index 96c732a..0000000
--- a/common/m2/repository/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,43 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric-annotations</artifactId>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/_remote.repositories b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index 0affdee..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 15:10:36 PST 2015
-robolectric-parent-3.1-20151125.203239-120.pom>temp=
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
deleted file mode 100644
index ccfbe65..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-parent</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203239</timestamp>
-      <buildNumber>120</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203239</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203239-120</value>
-        <updated>20151125203239</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
deleted file mode 100644
index 68664e2..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7317e0250d8d0a51088674d7b497b7f02d87f7d
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype.xml b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype.xml
deleted file mode 100644
index ccfbe65..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-parent</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203239</timestamp>
-      <buildNumber>120</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203239</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203239-120</value>
-        <updated>20151125203239</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
deleted file mode 100644
index 2ea4da0..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7317e0250d8d0a51088674d7b497b7f02d87f7d
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-temp.xml b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-temp.xml
deleted file mode 100644
index ccfbe65..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-temp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-parent</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203239</timestamp>
-      <buildNumber>120</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203239</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203239-120</value>
-        <updated>20151125203239</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
deleted file mode 100644
index 68664e2..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7317e0250d8d0a51088674d7b497b7f02d87f7d
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/resolver-status.properties b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index 0a147f9..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:35:54 PST 2015
-maven-metadata-temp.xml.lastUpdated=1448501754738
-maven-metadata-sonatype-nexus-snapshots.xml.lastUpdated=1448493037216
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-20151125.203239-120.pom b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-20151125.203239-120.pom
deleted file mode 100644
index d76b920..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-20151125.203239-120.pom
+++ /dev/null
@@ -1,388 +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>
-
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
-
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-parent</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <description>An alternative Android testing framework.</description>
-  <url>http://robolectric.org/</url>
-
-  <modules>
-    <module>robolectric</module>
-    <module>robolectric-annotations</module>
-    <module>robolectric-processor</module>
-    <module>robolectric-resources</module>
-    <module>robolectric-shadows</module>
-    <module>robolectric-utils</module>
-  </modules>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-    <libsqlite.version>0.282-3</libsqlite.version>
-    <robolectric.api.level>22</robolectric.api.level>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- Robolectric Dependencies -->
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-annotations</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-fakehttp</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-utils</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-resources</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>shadows-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <!-- Test Dependencies -->
-      <dependency>
-        <groupId>org.assertj</groupId>
-        <artifactId>assertj-core</artifactId>
-        <version>2.0.0</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>1.9.5</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>android-all</artifactId>
-        <version>5.1.1_r9-robolectric-0</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <!-- Project Dependencies -->
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
-        <version>1.3</version>
-      </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.8.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>19.0-rc2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.intellij</groupId>
-        <artifactId>annotations</artifactId>
-        <version>12.0</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>4.0.3</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.bsc.maven</groupId>
-          <artifactId>maven-processor-plugin</artifactId>
-          <version>2.2.4</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
-          <configuration>
-            <source>${maven.compiler.source}</source>
-            <target>${maven.compiler.target}</target>
-            <compilerArgument>-proc:none</compilerArgument>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.13</version>
-          <configuration>
-            <includes>
-              <include>**/*Test.java</include>
-            </includes>
-            <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=512m</argLine>
-            <runOrder>random</runOrder>
-            <systemProperties>
-              <java.awt.headless>true</java.awt.headless>
-            </systemProperties>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3.1</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4.1</version>
-          <configuration>
-            <filesets>
-              <fileset>
-                <directory>tmp</directory>
-                <includes>
-                  <include>*</include>
-                </includes>
-              </fileset>
-            </filesets>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.1</version>
-          <configuration>
-            <excludePackageNames>org.robolectric.res:org.robolectric.manifest:org.robolectric.internal:org.robolectric.annotation.internal:android:com.google</excludePackageNames>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.1</version>
-          <configuration>
-            <autoVersionSubmodules>true</autoVersionSubmodules>
-            <tagNameFormat>robolectric-@{project.version}</tagNameFormat>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>snapshot</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <scm>
-    <url>git@github.com:robolectric/robolectric.git</url>
-    <connection>scm:git:git://github.com/robolectric/robolectric.git</connection>
-    <developerConnection>scm:git:https://github.com/robolectric/robolectric.git</developerConnection>
-  </scm>
-
-  <ciManagement>
-    <system>Travis CI</system>
-    <url>http://travis-ci.org/robolectric/robolectric</url>
-  </ciManagement>
-
-  <developers>
-    <developer>
-      <id>xian</id>
-      <name>Christian Williams</name>
-      <email>xian@squareup.com</email>
-      <organization>Square, Inc.</organization>
-      <organizationUrl>http://corner.squareup.com/</organizationUrl>
-      <roles>
-        <role>Principal Developer</role>
-      </roles>
-      <timezone>PST/PDT</timezone>
-    </developer>
-
-    <developer>
-      <id>tyler</id>
-      <name>Tyler Schultz</name>
-      <email>tyler@pivotallabs.com</email>
-      <organization>Pivotal Labs</organization>
-      <organizationUrl>http://pivotallabs.com/</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>PST/PDT</timezone>
-    </developer>
-
-    <developer>
-      <id>phil</id>
-      <name>Phil Goodwin</name>
-      <email>phil@pivotallabs.com</email>
-      <organization>Pivotal Labs</organization>
-      <organizationUrl>http://pivotallabs.com/</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>PST/PDT</timezone>
-    </developer>
-  </developers>
-
-  <mailingLists>
-    <mailingList>
-      <name>User List</name>
-      <post>robolectric@googlegroups.com</post>
-      <archive>http://groups.google.com/group/robolectric</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>MIT license</name>
-      <comments>
-        The MIT License
-
-        Copyright (c) 2010 Xtreme Labs and Pivotal Labs
-
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-
-        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
-
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-        THE SOFTWARE.
-      </comments>
-    </license>
-  </licenses>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-20151125.203239-120.pom.sha1 b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-20151125.203239-120.pom.sha1
deleted file mode 100644
index 16f66af..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-20151125.203239-120.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-377f47223753f303a4323c171fda52900ef4bc31
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-SNAPSHOT.pom b/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-SNAPSHOT.pom
deleted file mode 100644
index d76b920..0000000
--- a/common/m2/repository/org/robolectric/robolectric-parent/3.1-SNAPSHOT/robolectric-parent-3.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,388 +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>
-
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
-
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-parent</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <description>An alternative Android testing framework.</description>
-  <url>http://robolectric.org/</url>
-
-  <modules>
-    <module>robolectric</module>
-    <module>robolectric-annotations</module>
-    <module>robolectric-processor</module>
-    <module>robolectric-resources</module>
-    <module>robolectric-shadows</module>
-    <module>robolectric-utils</module>
-  </modules>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-    <libsqlite.version>0.282-3</libsqlite.version>
-    <robolectric.api.level>22</robolectric.api.level>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- Robolectric Dependencies -->
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-annotations</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-fakehttp</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-utils</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-resources</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>shadows-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <!-- Test Dependencies -->
-      <dependency>
-        <groupId>org.assertj</groupId>
-        <artifactId>assertj-core</artifactId>
-        <version>2.0.0</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>1.9.5</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.robolectric</groupId>
-        <artifactId>android-all</artifactId>
-        <version>5.1.1_r9-robolectric-0</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <!-- Project Dependencies -->
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
-        <version>1.3</version>
-      </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.8.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>19.0-rc2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.intellij</groupId>
-        <artifactId>annotations</artifactId>
-        <version>12.0</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>4.0.3</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.bsc.maven</groupId>
-          <artifactId>maven-processor-plugin</artifactId>
-          <version>2.2.4</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
-          <configuration>
-            <source>${maven.compiler.source}</source>
-            <target>${maven.compiler.target}</target>
-            <compilerArgument>-proc:none</compilerArgument>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.13</version>
-          <configuration>
-            <includes>
-              <include>**/*Test.java</include>
-            </includes>
-            <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=512m</argLine>
-            <runOrder>random</runOrder>
-            <systemProperties>
-              <java.awt.headless>true</java.awt.headless>
-            </systemProperties>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3.1</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4.1</version>
-          <configuration>
-            <filesets>
-              <fileset>
-                <directory>tmp</directory>
-                <includes>
-                  <include>*</include>
-                </includes>
-              </fileset>
-            </filesets>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.1</version>
-          <configuration>
-            <excludePackageNames>org.robolectric.res:org.robolectric.manifest:org.robolectric.internal:org.robolectric.annotation.internal:android:com.google</excludePackageNames>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.1</version>
-          <configuration>
-            <autoVersionSubmodules>true</autoVersionSubmodules>
-            <tagNameFormat>robolectric-@{project.version}</tagNameFormat>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>snapshot</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <scm>
-    <url>git@github.com:robolectric/robolectric.git</url>
-    <connection>scm:git:git://github.com/robolectric/robolectric.git</connection>
-    <developerConnection>scm:git:https://github.com/robolectric/robolectric.git</developerConnection>
-  </scm>
-
-  <ciManagement>
-    <system>Travis CI</system>
-    <url>http://travis-ci.org/robolectric/robolectric</url>
-  </ciManagement>
-
-  <developers>
-    <developer>
-      <id>xian</id>
-      <name>Christian Williams</name>
-      <email>xian@squareup.com</email>
-      <organization>Square, Inc.</organization>
-      <organizationUrl>http://corner.squareup.com/</organizationUrl>
-      <roles>
-        <role>Principal Developer</role>
-      </roles>
-      <timezone>PST/PDT</timezone>
-    </developer>
-
-    <developer>
-      <id>tyler</id>
-      <name>Tyler Schultz</name>
-      <email>tyler@pivotallabs.com</email>
-      <organization>Pivotal Labs</organization>
-      <organizationUrl>http://pivotallabs.com/</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>PST/PDT</timezone>
-    </developer>
-
-    <developer>
-      <id>phil</id>
-      <name>Phil Goodwin</name>
-      <email>phil@pivotallabs.com</email>
-      <organization>Pivotal Labs</organization>
-      <organizationUrl>http://pivotallabs.com/</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>PST/PDT</timezone>
-    </developer>
-  </developers>
-
-  <mailingLists>
-    <mailingList>
-      <name>User List</name>
-      <post>robolectric@googlegroups.com</post>
-      <archive>http://groups.google.com/group/robolectric</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>MIT license</name>
-      <comments>
-        The MIT License
-
-        Copyright (c) 2010 Xtreme Labs and Pivotal Labs
-
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-
-        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
-
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-        THE SOFTWARE.
-      </comments>
-    </license>
-  </licenses>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
deleted file mode 100644
index 32e3b9b..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-resources</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203309</timestamp>
-      <buildNumber>105</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203309</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
deleted file mode 100644
index c615eeb..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4159fca8731617989c65bdb58488e102b2b8b6e
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype.xml b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype.xml
deleted file mode 100644
index 32e3b9b..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-resources</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203309</timestamp>
-      <buildNumber>105</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203309</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
deleted file mode 100644
index 0dbfd06..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4159fca8731617989c65bdb58488e102b2b8b6e
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-temp.xml b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-temp.xml
deleted file mode 100644
index 32e3b9b..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-temp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-resources</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203309</timestamp>
-      <buildNumber>105</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203309</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203309-105</value>
-        <updated>20151125203309</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
deleted file mode 100644
index c615eeb..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4159fca8731617989c65bdb58488e102b2b8b6e
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/resolver-status.properties b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index d338bfc..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:35:56 PST 2015
-maven-metadata-sonatype-nexus-snapshots.xml.lastUpdated=1448501756872
-maven-metadata-temp.xml.lastUpdated=1448501756872
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.jar b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.jar
deleted file mode 100644
index e6e1eba..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.jar.sha1 b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.jar.sha1
deleted file mode 100644
index 8415c6b..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8010025dabc5ac7acb652b740ba27494182eb0be
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.pom b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.pom
deleted file mode 100644
index 3d29b03..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.pom
+++ /dev/null
@@ -1,74 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric-resources</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Robolectric Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-utils</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-annotations</artifactId>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>com.ximpleware</groupId>
-      <artifactId>vtd-xml</artifactId>
-      <version>2.11</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-     </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.pom.sha1 b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.pom.sha1
deleted file mode 100644
index 9ca4fa1..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-20151125.203309-105.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7270efca8082689bdfc98ec9c220b07a49d7f508
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-SNAPSHOT.jar b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-SNAPSHOT.jar
deleted file mode 100644
index e6e1eba..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-SNAPSHOT.pom b/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-SNAPSHOT.pom
deleted file mode 100644
index 3d29b03..0000000
--- a/common/m2/repository/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,74 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric-resources</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Robolectric Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-utils</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-annotations</artifactId>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>com.ximpleware</groupId>
-      <artifactId>vtd-xml</artifactId>
-      <version>2.11</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-     </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
deleted file mode 100644
index 11bf374..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-shadows</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203311</timestamp>
-      <buildNumber>105</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203311</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203311-105</value>
-        <updated>20151125203311</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
deleted file mode 100644
index 704ca90..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a4564066c032f2982c3fdfd2c5274f08d772260
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype.xml b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype.xml
deleted file mode 100644
index 11bf374..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-shadows</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203311</timestamp>
-      <buildNumber>105</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203311</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203311-105</value>
-        <updated>20151125203311</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
deleted file mode 100644
index 430a3a0..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a4564066c032f2982c3fdfd2c5274f08d772260
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-temp.xml b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-temp.xml
deleted file mode 100644
index 11bf374..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-temp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-shadows</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203311</timestamp>
-      <buildNumber>105</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203311</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203311-105</value>
-        <updated>20151125203311</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
deleted file mode 100644
index 704ca90..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a4564066c032f2982c3fdfd2c5274f08d772260
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/resolver-status.properties b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index ffb7fbd..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:35:54 PST 2015
-maven-metadata-sonatype-nexus-snapshots.xml.lastUpdated=1448501754934
-maven-metadata-temp.xml.lastUpdated=1448501754544
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-20151125.203311-105.pom b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-20151125.203311-105.pom
deleted file mode 100644
index 1b086f0..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-20151125.203311-105.pom
+++ /dev/null
@@ -1,22 +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>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric-shadows</artifactId>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>shadows-core</module>
-    <module>shadows-maps</module>
-    <module>shadows-multidex</module>
-    <module>shadows-support-v4</module>
-    <module>shadows-httpclient</module>
-    <module>shadows-play-services</module>
-  </modules>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-20151125.203311-105.pom.sha1 b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-20151125.203311-105.pom.sha1
deleted file mode 100644
index dddd4dd..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-20151125.203311-105.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-655c0140b8ef98c5ae8bdc3a2bce237b644b4fa1
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-SNAPSHOT.pom b/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-SNAPSHOT.pom
deleted file mode 100644
index 1b086f0..0000000
--- a/common/m2/repository/org/robolectric/robolectric-shadows/3.1-SNAPSHOT/robolectric-shadows-3.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,22 +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>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric-shadows</artifactId>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>shadows-core</module>
-    <module>shadows-maps</module>
-    <module>shadows-multidex</module>
-    <module>shadows-support-v4</module>
-    <module>shadows-httpclient</module>
-    <module>shadows-play-services</module>
-  </modules>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/_remote.repositories b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index c623f81..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 15:10:39 PST 2015
-robolectric-utils-3.1-20151125.203302-106.jar>temp=
-robolectric-utils-3.1-20151125.203302-106.pom>temp=
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
deleted file mode 100644
index b9ba1aa..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-utils</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203302</timestamp>
-      <buildNumber>106</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203302</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
deleted file mode 100644
index f252ff4..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1178ead67b1494c5eea7151600c15bc459cbf05f
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype.xml b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype.xml
deleted file mode 100644
index b9ba1aa..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-utils</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203302</timestamp>
-      <buildNumber>106</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203302</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
deleted file mode 100644
index bd4d635..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1178ead67b1494c5eea7151600c15bc459cbf05f
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-temp.xml b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-temp.xml
deleted file mode 100644
index b9ba1aa..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-temp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric-utils</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203302</timestamp>
-      <buildNumber>106</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203302</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203302-106</value>
-        <updated>20151125203302</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1 b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
deleted file mode 100644
index f252ff4..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1178ead67b1494c5eea7151600c15bc459cbf05f
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/resolver-status.properties b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index 77d195e..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:35:57 PST 2015
-maven-metadata-temp.xml.lastUpdated=1448501757085
-maven-metadata-sonatype-nexus-snapshots.xml.lastUpdated=1448501757085
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.jar b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.jar
deleted file mode 100644
index dabca0d..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.jar.sha1 b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.jar.sha1
deleted file mode 100644
index 41c0742..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fda8d45d2b32c9913b1ff00fb6bf265bbd661c1d
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.pom b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.pom
deleted file mode 100644
index 3e80faf..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.pom
+++ /dev/null
@@ -1,63 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric-utils</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.android.apps.common.testing.accessibility.framework</groupId>
-      <artifactId>accessibility-test-framework</artifactId>
-      <version>2.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.pom.sha1 b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.pom.sha1
deleted file mode 100644
index 28e008b..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-20151125.203302-106.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e18435c8c2eecc45179190105786b9a42878ab6a
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-SNAPSHOT.jar b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-SNAPSHOT.jar
deleted file mode 100644
index dabca0d..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-SNAPSHOT.pom b/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-SNAPSHOT.pom
deleted file mode 100644
index 3e80faf..0000000
--- a/common/m2/repository/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,63 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric-utils</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.android.apps.common.testing.accessibility.framework</groupId>
-      <artifactId>accessibility-test-framework</artifactId>
-      <version>2.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/_remote.repositories b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index ef45a37..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:36:05 PST 2015
-robolectric-3.1-20151125.203418-71.pom>temp=
-robolectric-3.1-20151125.203418-71.jar>temp=
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
deleted file mode 100644
index ec09cef..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203418</timestamp>
-      <buildNumber>71</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203418</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203418-71</value>
-        <updated>20151125203418</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203418-71</value>
-        <updated>20151125203418</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203418-71</value>
-        <updated>20151125203418</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203418-71</value>
-        <updated>20151125203418</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1 b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
deleted file mode 100644
index f0beadf..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-31c176d3dbfe44e213dd4b731cd6c39560bd59b4
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-temp.xml b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-temp.xml
deleted file mode 100644
index ec09cef..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-temp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>robolectric</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203418</timestamp>
-      <buildNumber>71</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203418</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203418-71</value>
-        <updated>20151125203418</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203418-71</value>
-        <updated>20151125203418</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203418-71</value>
-        <updated>20151125203418</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203418-71</value>
-        <updated>20151125203418</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1 b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
deleted file mode 100644
index f0beadf..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-31c176d3dbfe44e213dd4b731cd6c39560bd59b4
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/resolver-status.properties b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index a026530..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:35:56 PST 2015
-maven-metadata-sonatype-nexus-snapshots.xml.lastUpdated=1448501756246
-maven-metadata-temp.xml.lastUpdated=1448501756103
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.jar b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.jar
deleted file mode 100644
index c1ad850..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.jar.sha1 b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.jar.sha1
deleted file mode 100644
index 8ad843c..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-68f4d597b22830abbf8080116a4c8362d417c599
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.pom b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.pom
deleted file mode 100644
index 319582c..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.pom
+++ /dev/null
@@ -1,173 +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>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Robolectric Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-resources</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-utils</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>shadows-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk16</artifactId>
-      <version>1.46</version>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-util</artifactId>
-      <version>5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.ximpleware</groupId>
-      <artifactId>vtd-xml</artifactId>
-      <version>2.11</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.4.8</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-ant-tasks</artifactId>
-      <version>2.1.3</version>
-      <exclusions>
-         <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.8.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Xmx2048m -XX:MaxPermSize=1024m</argLine>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.pom.sha1 b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.pom.sha1
deleted file mode 100644
index 9ceb4db..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-20151125.203418-71.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cc8aa81a3aaaf2f5948b2402e431133ac7e01bf9
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-SNAPSHOT.jar b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-SNAPSHOT.jar
deleted file mode 100644
index c1ad850..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-SNAPSHOT.pom b/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-SNAPSHOT.pom
deleted file mode 100644
index 319582c..0000000
--- a/common/m2/repository/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,173 +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>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-parent</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>robolectric</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Robolectric Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-resources</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-utils</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>shadows-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk16</artifactId>
-      <version>1.46</version>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-util</artifactId>
-      <version>5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.ximpleware</groupId>
-      <artifactId>vtd-xml</artifactId>
-      <version>2.11</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.4.8</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-ant-tasks</artifactId>
-      <version>2.1.3</version>
-      <exclusions>
-         <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.8.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Xmx2048m -XX:MaxPermSize=1024m</argLine>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/_remote.repositories b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index 76f8fcf..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:36:07 PST 2015
-shadows-core-3.1-20151125.203400-71.jar>temp=
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
deleted file mode 100644
index 594fee9..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>shadows-core</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203400</timestamp>
-      <buildNumber>71</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203400</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>16</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>17</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>18</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>19</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>21</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>22</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1 b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
deleted file mode 100644
index f2cd4d6..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype-nexus-snapshots.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-004a8168bed6985e371704af12818f8ef774f211
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype.xml b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype.xml
deleted file mode 100644
index 594fee9..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>shadows-core</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203400</timestamp>
-      <buildNumber>71</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203400</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>16</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>17</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>18</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>19</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>21</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>22</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1 b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
deleted file mode 100644
index 05b485b..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-sonatype.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-004a8168bed6985e371704af12818f8ef774f211
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-temp.xml b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-temp.xml
deleted file mode 100644
index 594fee9..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-temp.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>shadows-core</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203400</timestamp>
-      <buildNumber>71</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203400</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>16</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>17</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>18</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>19</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>21</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>22</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203400-71</value>
-        <updated>20151125203400</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1 b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
deleted file mode 100644
index f2cd4d6..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-004a8168bed6985e371704af12818f8ef774f211
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/resolver-status.properties b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index 3deb47f..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:35:57 PST 2015
-maven-metadata-temp.xml.lastUpdated=1448501757302
-maven-metadata-sonatype-nexus-snapshots.xml.lastUpdated=1448501757301
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71-21.jar b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71-21.jar
deleted file mode 100644
index fc93632..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71-21.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71-21.jar.sha1 b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71-21.jar.sha1
deleted file mode 100644
index 1be94b7..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71-21.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a09f235577c1a1037897e2b0057679d4616d7554
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.jar b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.jar
deleted file mode 100644
index 8764d8d..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.jar.sha1 b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.jar.sha1
deleted file mode 100644
index c65bdfb..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-671f15a25aae81ca9eaaf635d52fd081c15f1e3b
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.pom b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.pom
deleted file mode 100644
index b8b19b0..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.pom
+++ /dev/null
@@ -1,530 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-shadows</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>shadows-core</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Robolectric Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-utils</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-resources</artifactId>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.ibm.icu</groupId>
-      <artifactId>icu4j</artifactId>
-      <version>53.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
-    <!-- SQLite Dependencies -->
-    <dependency>
-      <groupId>com.almworks.sqlite4java</groupId>
-      <artifactId>sqlite4java</artifactId>
-      <version>0.282</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <version>${libsqlite.version}</version>
-      <classifier>natives-windows-x86</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <version>${libsqlite.version}</version>
-      <classifier>natives-windows-x86_64</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <version>${libsqlite.version}</version>
-      <classifier>natives-mac-x86_64</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <version>${libsqlite.version}</version>
-      <classifier>natives-linux-x86</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <classifier>natives-linux-x86_64</classifier>
-      <version>${libsqlite.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>target/natives</directory>
-      </resource>
-
-      <resource>
-        <directory>src/main/resources</directory>
-        <excludes>
-          <exclude>**/*.vm</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <outputDirectory>dist</outputDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <generatedSourcesDirectory>target/generated-sources</generatedSourcesDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <configuration>
-          <outputDirectory>dist</outputDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <jarOutputDirectory>${basedir}/dist</jarOutputDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>com.googlecode.mavennatives</groupId>
-        <artifactId>maven-nativedependencies-plugin</artifactId>
-        <version>0.0.7</version>
-        <executions>
-          <execution>
-            <id>unpacknatives</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <separateDirs>true</separateDirs>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-velocity-plugin</artifactId>
-        <version>1.1.0</version>
-        <configuration>
-          <api>${api}</api>
-          <fileset>
-            <directory>${project.basedir}/src/main/resources</directory>
-            <includes>
-              <include>**/*.vm</include>
-            </includes>
-          </fileset>
-          <output>target/generated-shadows</output>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-shadows</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>process-templates</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.9.1</version>
-        <executions>
-          <execution>
-            <id>add-source-directories</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>target/generated-shadows</source>
-                <source>target/generated-sources</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.bsc.maven</groupId>
-        <artifactId>maven-processor-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <additionalSourceDirectories>
-            <sourceDirectory>target/generated-shadows</sourceDirectory>
-          </additionalSourceDirectories>
-          <outputDirectory>target/generated-sources</outputDirectory>
-          <compilerArguments>-source ${maven.compiler.source} -target ${maven.compiler.target} -Aorg.robolectric.annotation.processing.shadowPackage=org.robolectric</compilerArguments>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.robolectric</groupId>
-            <artifactId>robolectric-processor</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>android-16</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>4.1.2_r1-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>16</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-17</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>4.2.2_r1.2-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>17</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-18</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>4.3_r2-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>18</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-19</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>4.4_r1-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>19</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-21</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>5.0.0_r2-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>21</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-22</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>5.1.1_r9-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>22</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-latest</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>5.1.1_r9-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>22</api>
-      </properties>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-    </profile>
-
-    <profile>
-      <id>dist</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-clean-plugin</artifactId>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>dist</directory>
-                </fileset>
-              </filesets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>upload</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>1.9.1</version>
-            <executions>
-              <execution>
-                <id>add-source-directories</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>target/generated-shadows</source>
-                    <source>target/generated-sources</source>
-                  </sources>
-                </configuration>
-              </execution>
-
-              <execution>
-                <id>attach-artifacts</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                  <artifacts>
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-16.jar</file>
-                      <type>jar</type>
-                      <classifier>16</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-17.jar</file>
-                      <type>jar</type>
-                      <classifier>17</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-18.jar</file>
-                      <type>jar</type>
-                      <classifier>18</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-19.jar</file>
-                      <type>jar</type>
-                      <classifier>19</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-21.jar</file>
-                      <type>jar</type>
-                      <classifier>21</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-22.jar</file>
-                      <type>jar</type>
-                      <classifier>22</classifier>
-                    </artifact>
-                  </artifacts>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.pom.sha1 b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.pom.sha1
deleted file mode 100644
index 08aa017..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-20151125.203400-71.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cb2d684c9ad351702e06f2adbb9bf78912eeeedc
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT-21.jar b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT-21.jar
deleted file mode 100644
index fc93632..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT-21.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT.jar b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT.jar
deleted file mode 100644
index 8764d8d..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT.pom b/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT.pom
deleted file mode 100644
index b8b19b0..0000000
--- a/common/m2/repository/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,530 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-shadows</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>shadows-core</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Robolectric Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-utils</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric-resources</artifactId>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.ibm.icu</groupId>
-      <artifactId>icu4j</artifactId>
-      <version>53.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
-    <!-- SQLite Dependencies -->
-    <dependency>
-      <groupId>com.almworks.sqlite4java</groupId>
-      <artifactId>sqlite4java</artifactId>
-      <version>0.282</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <version>${libsqlite.version}</version>
-      <classifier>natives-windows-x86</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <version>${libsqlite.version}</version>
-      <classifier>natives-windows-x86_64</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <version>${libsqlite.version}</version>
-      <classifier>natives-mac-x86_64</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <version>${libsqlite.version}</version>
-      <classifier>natives-linux-x86</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.axet.litedb</groupId>
-      <artifactId>libsqlite</artifactId>
-      <classifier>natives-linux-x86_64</classifier>
-      <version>${libsqlite.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>target/natives</directory>
-      </resource>
-
-      <resource>
-        <directory>src/main/resources</directory>
-        <excludes>
-          <exclude>**/*.vm</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <outputDirectory>dist</outputDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <generatedSourcesDirectory>target/generated-sources</generatedSourcesDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <configuration>
-          <outputDirectory>dist</outputDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <jarOutputDirectory>${basedir}/dist</jarOutputDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>com.googlecode.mavennatives</groupId>
-        <artifactId>maven-nativedependencies-plugin</artifactId>
-        <version>0.0.7</version>
-        <executions>
-          <execution>
-            <id>unpacknatives</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <separateDirs>true</separateDirs>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.robolectric</groupId>
-        <artifactId>robolectric-velocity-plugin</artifactId>
-        <version>1.1.0</version>
-        <configuration>
-          <api>${api}</api>
-          <fileset>
-            <directory>${project.basedir}/src/main/resources</directory>
-            <includes>
-              <include>**/*.vm</include>
-            </includes>
-          </fileset>
-          <output>target/generated-shadows</output>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-shadows</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>process-templates</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.9.1</version>
-        <executions>
-          <execution>
-            <id>add-source-directories</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>target/generated-shadows</source>
-                <source>target/generated-sources</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.bsc.maven</groupId>
-        <artifactId>maven-processor-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <additionalSourceDirectories>
-            <sourceDirectory>target/generated-shadows</sourceDirectory>
-          </additionalSourceDirectories>
-          <outputDirectory>target/generated-sources</outputDirectory>
-          <compilerArguments>-source ${maven.compiler.source} -target ${maven.compiler.target} -Aorg.robolectric.annotation.processing.shadowPackage=org.robolectric</compilerArguments>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.robolectric</groupId>
-            <artifactId>robolectric-processor</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>android-16</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>4.1.2_r1-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>16</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-17</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>4.2.2_r1.2-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>17</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-18</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>4.3_r2-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>18</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-19</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>4.4_r1-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>19</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-21</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>5.0.0_r2-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>21</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-22</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <classifier>${api}</classifier>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>5.1.1_r9-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>22</api>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>android-latest</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <outputDirectory>dist</outputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.robolectric</groupId>
-          <artifactId>android-all</artifactId>
-          <version>5.1.1_r9-robolectric-0</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <api>22</api>
-      </properties>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-    </profile>
-
-    <profile>
-      <id>dist</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-clean-plugin</artifactId>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>dist</directory>
-                </fileset>
-              </filesets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>upload</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>1.9.1</version>
-            <executions>
-              <execution>
-                <id>add-source-directories</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>target/generated-shadows</source>
-                    <source>target/generated-sources</source>
-                  </sources>
-                </configuration>
-              </execution>
-
-              <execution>
-                <id>attach-artifacts</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                  <artifacts>
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-16.jar</file>
-                      <type>jar</type>
-                      <classifier>16</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-17.jar</file>
-                      <type>jar</type>
-                      <classifier>17</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-18.jar</file>
-                      <type>jar</type>
-                      <classifier>18</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-19.jar</file>
-                      <type>jar</type>
-                      <classifier>19</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-21.jar</file>
-                      <type>jar</type>
-                      <classifier>21</classifier>
-                    </artifact>
-
-                    <artifact>
-                      <file>dist/shadows-core-${project.version}-22.jar</file>
-                      <type>jar</type>
-                      <classifier>22</classifier>
-                    </artifact>
-                  </artifacts>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/_remote.repositories b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index 9012ccb..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:36:05 PST 2015
-shadows-httpclient-3.1-20151125.203500-70.pom>temp=
-shadows-httpclient-3.1-20151125.203500-70.jar>temp=
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/maven-metadata-temp.xml b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/maven-metadata-temp.xml
deleted file mode 100644
index c663e66..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/maven-metadata-temp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.robolectric</groupId>
-  <artifactId>shadows-httpclient</artifactId>
-  <version>3.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20151125.203500</timestamp>
-      <buildNumber>70</buildNumber>
-    </snapshot>
-    <lastUpdated>20151125203500</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>3.1-20151125.203500-70</value>
-        <updated>20151125203500</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>3.1-20151125.203500-70</value>
-        <updated>20151125203500</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>sources</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203500-70</value>
-        <updated>20151125203500</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <classifier>javadoc</classifier>
-        <extension>jar</extension>
-        <value>3.1-20151125.203500-70</value>
-        <updated>20151125203500</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1 b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
deleted file mode 100644
index e0e3397..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/maven-metadata-temp.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-106be76374c3d7fac41a41c637a138ab7fa2792f
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/resolver-status.properties b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index 0ac8133..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Nov 25 17:35:54 PST 2015
-maven-metadata-temp.xml.lastUpdated=1448501754158
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.jar b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.jar
deleted file mode 100644
index a50a239..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.jar.sha1 b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.jar.sha1
deleted file mode 100644
index 75f544f..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9c8f3c71c0c02b4a0666ff61607029676c104a09
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.pom b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.pom
deleted file mode 100644
index 6ab2d01..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.pom
+++ /dev/null
@@ -1,97 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-shadows</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>shadows-httpclient</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Robolectric Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric</artifactId>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.0.3</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.bsc.maven</groupId>
-        <artifactId>maven-processor-plugin</artifactId>
-        <configuration>
-          <additionalSourceDirectories>
-            <sourceDirectory>target/generated-shadows</sourceDirectory>
-          </additionalSourceDirectories>
-          <outputDirectory>target/generated-sources</outputDirectory>
-          <compilerArguments>-source ${maven.compiler.source} -target ${maven.compiler.target} -Aorg.robolectric.annotation.processing.shadowPackage=org.robolectric.shadows.httpclient</compilerArguments>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.robolectric</groupId>
-            <artifactId>robolectric-processor</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.pom.sha1 b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.pom.sha1
deleted file mode 100644
index 0dd7248..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-20151125.203500-70.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5d3d99149fcc309835c1a2e01dba53931e5f777c
\ No newline at end of file
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-SNAPSHOT.jar b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-SNAPSHOT.jar
deleted file mode 100644
index a50a239..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-SNAPSHOT.pom b/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-SNAPSHOT.pom
deleted file mode 100644
index 6ab2d01..0000000
--- a/common/m2/repository/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,97 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.robolectric</groupId>
-    <artifactId>robolectric-shadows</artifactId>
-    <version>3.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>shadows-httpclient</artifactId>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Robolectric Dependencies -->
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>robolectric</artifactId>
-    </dependency>
-
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.0.3</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.robolectric</groupId>
-      <artifactId>android-all</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.bsc.maven</groupId>
-        <artifactId>maven-processor-plugin</artifactId>
-        <configuration>
-          <additionalSourceDirectories>
-            <sourceDirectory>target/generated-shadows</sourceDirectory>
-          </additionalSourceDirectories>
-          <outputDirectory>target/generated-sources</outputDirectory>
-          <compilerArguments>-source ${maven.compiler.source} -target ${maven.compiler.target} -Aorg.robolectric.annotation.processing.shadowPackage=org.robolectric.shadows.httpclient</compilerArguments>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.robolectric</groupId>
-            <artifactId>robolectric-processor</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1-sources.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2-sources.jar
index fb82dad..70c2d9a 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2.jar
similarity index 75%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1.jar
rename to common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2.jar
index 37f4e5a..ca793c1 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2.pom
similarity index 96%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1.pom
rename to common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2.pom
index 8f8fcdb..fd90e1c 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta1/baseLibrary-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta2/baseLibrary-2.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
   <artifactId>baseLibrary</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>Data Binding Base Library</name>
   <description>Shared library between Data Binding runtime lib and compiler</description>
   <url>http://tools.android.com</url>
diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2-sources.jar b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2-sources.jar
new file mode 100644
index 0000000..bb54987
--- /dev/null
+++ b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2.jar b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2.jar
new file mode 100644
index 0000000..9e7cf31
--- /dev/null
+++ b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.pom b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2.pom
similarity index 70%
copy from common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.pom
copy to common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2.pom
index 71e5979..3a1d849 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta2/compiler-2.0.0-beta2.pom
@@ -3,10 +3,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
-  <artifactId>compilerCommon</artifactId>
-  <version>2.0.0-beta1</version>
-  <name>Data Binding Compiler Common</name>
-  <description>Common library that can be shared between different build tools</description>
+  <artifactId>compiler</artifactId>
+  <version>2.0.0-beta2</version>
+  <name>Data Binding Annotation Processor</name>
+  <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
   <url>http://tools.android.com</url>
   <inceptionYear>2007</inceptionYear>
   <licenses>
@@ -27,21 +27,27 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.googlecode.juniversalchardet</groupId>
       <artifactId>juniversalchardet</artifactId>
       <version>1.0.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>baseLibrary</artifactId>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>1.0.0-beta-4584</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -62,5 +68,11 @@
       <version>2.4</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1-sources.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2-sources.jar
index 3b6e9c5..5bb412c 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2.jar
similarity index 92%
rename from common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.jar
rename to common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2.jar
index 2eaac68..ef7c7c7 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.jar
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2.pom
similarity index 96%
rename from common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.pom
rename to common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2.pom
index 71e5979..e52ad03 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta1/compilerCommon-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta2/compilerCommon-2.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
   <artifactId>compilerCommon</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>Data Binding Compiler Common</name>
   <description>Common library that can be shared between different build tools</description>
   <url>http://tools.android.com</url>
@@ -27,12 +27,6 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.googlecode.juniversalchardet</groupId>
       <artifactId>juniversalchardet</artifactId>
       <version>1.0.3</version>
@@ -45,6 +39,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>baseLibrary</artifactId>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2-sources.jar
similarity index 95%
rename from common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2-sources.jar
index 338f06c..6164825 100644
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2.jar
similarity index 80%
rename from common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2.jar
index f1d7271..062f91e 100644
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2.pom
index 20e3d11..d7ce6d7 100644
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-beta1/annotations-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/annotations/25.0.0-beta2/annotations-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>annotations</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools Annotations library</name>
   <description>annotations used throughout the Android tools libraries.</description>
   <url>http://tools.android.com</url>
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2-sources.jar
index eb65666..e7644f9 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2.jar
similarity index 74%
rename from common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2.jar
index 6b3aa72..928afca 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1.pom b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2.pom
index 05ddf67..637b367 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta1/builder-model-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta2/builder-model-2.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-model</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>Android Builder Model library</name>
   <description>Model for the Builder library.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2-sources.jar
similarity index 96%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2-sources.jar
index 31e6a5f..f461190 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2.jar
similarity index 77%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2.jar
index 6184f80..5dd51e5 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2.pom
index 8e91018..f617ad6 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta1/builder-test-api-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta2/builder-test-api-2.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-test-api</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>Android Builder Test API library</name>
   <description>API for the Test extension point in the Builder library.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2-sources.jar
similarity index 96%
rename from common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2-sources.jar
index 1522710..d99ed27 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2.jar
similarity index 90%
rename from common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2.jar
index 861bbff..735561d 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1.pom b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2.pom
similarity index 91%
rename from common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2.pom
index 928d3ad..5556c91 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta1/builder-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta2/builder-2.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>Android Builder library</name>
   <description>Library to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,12 +27,18 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.0.0-beta1</version>
+      <groupId>com.android.tools.jill</groupId>
+      <artifactId>jill-api</artifactId>
+      <version>0.9.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
@@ -45,15 +51,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.9.0</version>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -63,12 +63,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.squareup</groupId>
       <artifactId>javawriter</artifactId>
       <version>2.5.0</version>
@@ -77,13 +71,25 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-test-api</artifactId>
-      <version>2.0.0-beta1</version>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>manifest-merger</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -93,36 +99,30 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.jack</groupId>
+      <artifactId>jack-api</artifactId>
+      <version>0.9.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <version>5.0.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>1.48</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
@@ -130,8 +130,8 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.0.0-beta1</version>
+      <artifactId>sdk-common</artifactId>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2-sources.jar
index eed698f..7262f07 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2.jar
similarity index 74%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2.jar
index ea74165..5d12af8 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2.pom
index e5ec181..e0103c3 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta1/gradle-api-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta2/gradle-api-2.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-api</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>Android Gradle API</name>
   <description>APIs to customize Android Gradle Builds</description>
   <url>http://tools.android.com</url>
@@ -33,16 +33,16 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>annotations</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2-sources.jar
similarity index 89%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2-sources.jar
index bbbf12e..a207c5e 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2.jar
similarity index 85%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2.jar
index 699e2dd..80edad0 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2.pom
index 907aec1..a5773d7 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta1/gradle-core-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta2/gradle-core-2.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-core</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>Core Library for Android Gradle Plug-in</name>
   <description>Core library to build Android Gradle plugin.</description>
   <url>http://tools.android.com</url>
@@ -33,16 +33,22 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>tools.base.instant-run</groupId>
+      <artifactId>instant-run-runtime</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>17.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.0.0-beta1</version>
-      <scope>compile</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>tools.base.instant-run</groupId>
@@ -51,6 +57,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>tools.base</groupId>
+      <artifactId>project-test-lib</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
@@ -63,28 +75,22 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-runtime</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder</artifactId>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-api</artifactId>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -99,21 +105,15 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <version>5.0.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.0.0-beta1</version>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
+      <version>2.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1-sources.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2-sources.jar
index a121c82..2822fbc 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2.jar
index dee5abe..4870746 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2.pom
index c5c9292..86c7569 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta1/gradle-experimental-0.6.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta2/gradle-experimental-0.6.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-experimental</artifactId>
-  <version>0.6.0-beta1</version>
+  <version>0.6.0-beta2</version>
   <name>Gradle Plug-in for Android Using Component Model</name>
   <description>Gradle plug-in to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,18 +27,18 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-core</artifactId>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>tools.base</groupId>
       <artifactId>project-test-lib</artifactId>
       <version>unspecified</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2-sources.jar
index 566fc29..bacedee 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2.jar
similarity index 77%
rename from common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2.jar
index 31b1183..12d55d8 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2.pom
index 7e8efe8..4221a7f 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta1/gradle-2.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta2/gradle-2.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle</artifactId>
-  <version>2.0.0-beta1</version>
+  <version>2.0.0-beta2</version>
   <name>Gradle Plug-in for Android</name>
   <description>Gradle plug-in to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,18 +27,18 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-core</artifactId>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>tools.base</groupId>
       <artifactId>project-test-lib</artifactId>
       <version>unspecified</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2-sources.jar
index a2c3087..1a237da 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2.jar
index e1a9b34..bc06e94 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2.pom
index e607856..6f3d258 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta1/manifest-merger-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta2/manifest-merger-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>manifest-merger</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools Manifest Merger library</name>
   <description>A Library to merge Android manifests.</description>
   <url>http://tools.android.com</url>
@@ -33,12 +33,24 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -52,20 +64,8 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2-sources.jar
similarity index 95%
rename from common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2-sources.jar
index 4d37803..db29f88 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2.jar
similarity index 85%
rename from common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2.jar
index 7ff7b14..727a151 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2.pom
index 43183d5..3b96bbe 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-beta1/common-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/common/25.0.0-beta2/common-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>common</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools common library</name>
   <description>common library used by other Android tools libraries.</description>
   <url>http://tools.android.com</url>
@@ -33,18 +33,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>annotations</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2-sources.jar
index a952794..29be498 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2.jar
similarity index 91%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2.jar
index f1afe0d..fb5cbd0 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2.pom
index a734a53..6c7de48 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta1/ddmlib-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta2/ddmlib-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.ddms</groupId>
   <artifactId>ddmlib</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools ddmlib</name>
   <description>Library providing APIs to talk to Android devices</description>
   <url>http://tools.android.com</url>
@@ -33,18 +33,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.1</version>
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2-sources.jar
index 44c6c82..71f700d 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2.jar
index c11703e..eeabaf0 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2.pom
index 037f7bf..cb265e1 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta1/dvlib-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta2/dvlib-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>dvlib</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools dvlib</name>
   <description>A Library to manage the Android device database XML files.</description>
   <url>http://tools.android.com</url>
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar
index c00fe4f..982aa4a 100644
--- a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar
+++ b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
index 9b0ebd1..172ad0f 100644
--- a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
+++ b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.jar b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.jar
index 0cb8286..92d3003 100644
--- a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.jar
+++ b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
index 07cb36d..e951f84 100644
--- a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
+++ b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2-sources.jar
index f6eee03..15ea76f 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2.jar
index bdd2455..afce78b 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2.pom
index e4c7a4e..6a05608 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta1/layoutlib-api-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta2/layoutlib-api-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.layoutlib</groupId>
   <artifactId>layoutlib-api</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools layoutlib-api</name>
   <description>Library to use the rendering library for Android layouts: layoutlib</description>
   <url>http://tools.android.com</url>
@@ -33,24 +33,24 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.intellij</groupId>
       <artifactId>annotations</artifactId>
       <version>12.0</version>
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2-sources.jar
index ecc3f78..bc415e6 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2.jar
index e270827..04866c3 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2.pom
index ccc924a..5f8ef75 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta1/lint-api-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta2/lint-api-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-api</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools Lint API</name>
   <description>API to build lint checks</description>
   <url>http://tools.android.com</url>
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <version>5.0.3</version>
@@ -47,13 +53,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2-sources.jar
index 799bd62..8b2a8fe 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2.jar
index d9df0dd..7733157 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2.pom
index d62de63..a19d60f 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta1/lint-checks-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta2/lint-checks-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-checks</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Lint Checks</name>
   <description>Checks for Android Lint</description>
   <url>http://tools.android.com</url>
@@ -27,15 +27,15 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.3</version>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-api</artifactId>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.0.0-beta1</version>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>5.0.3</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2-sources.jar
index 75d20ff..4a8c5bb 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2.jar
index 1c4ed45..df7eeeb 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2.pom
index c19c66c..d338e62 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta1/lint-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta2/lint-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Lint Tool</name>
   <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint-checks</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2-sources.jar
index 97ca492..214e4d6 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2.jar
index 990d264..be7a0b6 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2.pom
index 7ea399b..9c22766 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-beta1/repository-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-beta2/repository-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>repository</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools repository</name>
   <description>A library for downloading and managing package repositories</description>
   <url>http://tools.android.com</url>
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -38,11 +44,5 @@
       <version>1.8.1</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2-sources.jar
index 5c729fb..f1697c9 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2.jar
index 65e0524..f6bad6b 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2.pom
index 4139a75..b362e51 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta1/sdk-common-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta2/sdk-common-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdk-common</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools sdk-common library</name>
   <description>sdk-common library used by other Android tools libraries.</description>
   <url>http://tools.android.com</url>
@@ -27,10 +27,10 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.0.0-beta1</version>
-      <scope>compile</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -45,39 +45,39 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>test</scope>
+      <artifactId>sdklib</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-model</artifactId>
-      <version>2.0.0-beta1</version>
+      <version>2.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>2.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.0.0-beta1</version>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>1.48</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1-sources.jar b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2-sources.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1-sources.jar
rename to common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2-sources.jar
index fb39b3a..89511e9 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1-sources.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1.jar b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2.jar
similarity index 89%
rename from common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1.jar
rename to common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2.jar
index 6f6c65e..937bfb1 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1.pom b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1.pom
rename to common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2.pom
index c77eaba..07131e8 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta1/sdklib-25.0.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta2/sdklib-25.0.0-beta2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdklib</artifactId>
-  <version>25.0.0-beta1</version>
+  <version>25.0.0-beta2</version>
   <name>Android Tools sdklib</name>
   <description>A library to parse and download the Android SDK.</description>
   <url>http://tools.android.com</url>
@@ -33,6 +33,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>repository</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
       <version>4.1</version>
@@ -45,21 +51,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
-      <version>25.0.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.layoutlib</groupId>
       <artifactId>layoutlib-api</artifactId>
-      <version>25.0.0-beta1</version>
+      <version>25.0.0-beta2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -74,5 +68,11 @@
       <version>1.8.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>dvlib</artifactId>
+      <version>25.0.0-beta2</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/commons-codec/NOTICE b/common/offline-m2/commons-codec/NOTICE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/common/offline-m2/commons-codec/NOTICE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/common/offline-m2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar b/common/offline-m2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar
new file mode 100644
index 0000000..1d7417c
--- /dev/null
+++ b/common/offline-m2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar
Binary files differ
diff --git a/common/offline-m2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom b/common/offline-m2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom
new file mode 100644
index 0000000..0da640a
--- /dev/null
+++ b/common/offline-m2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom
@@ -0,0 +1,343 @@
+<?xml version="1.0"?>

+<!--

+Licensed to the Apache Software Foundation (ASF) under one or more

+contributor license agreements.  See the NOTICE file distributed with

+this work for additional information regarding copyright ownership.

+The ASF licenses this file to You under the Apache License, Version 2.0

+(the "License"); you may not use this file except in compliance with

+the License.  You may obtain a copy of the License at

+

+     http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+-->

+<!--

+ To produce reports, use the reporting profile, for example: mvn -Preporting clean site

+ You may need to use the -U option to update your environment if you get an error.  

+ -->

+<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">

+  <parent>

+    <groupId>org.apache.commons</groupId>

+    <artifactId>commons-parent</artifactId>

+    <version>35</version>

+  </parent>

+  <modelVersion>4.0.0</modelVersion>

+  <groupId>commons-codec</groupId>

+  <artifactId>commons-codec</artifactId>

+  <!-- Remember to update the version in default.properties as well -->

+  <version>1.10</version>

+  <name>Apache Commons Codec</name>

+  <inceptionYear>2002</inceptionYear>

+  <description>

+     The Apache Commons Codec package contains simple encoder and decoders for

+     various formats such as Base64 and Hexadecimal.  In addition to these

+     widely used encoders and decoders, the codec package also maintains a

+     collection of phonetic encoding utilities.

+  </description>

+  <prerequisites>

+    <maven>3.0.0</maven>

+  </prerequisites>  

+  <url>http://commons.apache.org/proper/commons-codec/</url>

+  <issueManagement>

+    <system>jira</system>

+    <url>http://issues.apache.org/jira/browse/CODEC</url>

+  </issueManagement>

+  <scm>

+    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/codec/trunk</connection>

+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/codec/trunk</developerConnection>

+    <url>http://svn.apache.org/viewvc/commons/proper/codec/trunk</url>

+  </scm>

+  <distributionManagement>

+    <site>

+      <id>stagingSite</id>

+      <name>Apache Staging Website</name>

+      <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}/</url>

+    </site>

+  </distributionManagement>

+  <developers>

+    <developer>

+      <name>Henri Yandell</name>

+      <id>bayard</id>

+      <email>bayard@apache.org</email>

+    </developer>

+    <developer>

+      <name>Tim OBrien</name>

+      <id>tobrien</id>

+      <email>tobrien@apache.org</email>

+      <timezone>-6</timezone>

+    </developer>

+    <developer>

+      <name>Scott Sanders</name>

+      <id>sanders</id>

+      <email>sanders@totalsync.com</email>

+    </developer>

+    <developer>

+      <name>Rodney Waldhoff</name>

+      <id>rwaldhoff</id>

+      <email>rwaldhoff@apache.org</email>

+    </developer>

+    <developer>

+      <name>Daniel Rall</name>

+      <id>dlr</id>

+      <email>dlr@finemaltcoding.com</email>

+    </developer>

+    <developer>

+      <name>Jon S. Stevens</name>

+      <id>jon</id>

+      <email>jon@collab.net</email>

+    </developer>

+    <developer>

+      <name>Gary Gregory</name>

+      <id>ggregory</id>

+      <email>ggregory@apache.org</email>

+      <url>http://www.garygregory.com</url>

+      <timezone>-5</timezone>

+    </developer>

+    <developer>

+      <name>David Graham</name>

+      <id>dgraham</id>

+      <email>dgraham@apache.org</email>

+    </developer>

+    <developer>

+      <name>Julius Davies</name>

+      <id>julius</id>

+      <email>julius@apache.org</email>

+      <organizationUrl>http://juliusdavies.ca/</organizationUrl>

+      <timezone>-8</timezone>

+    </developer>

+    <developer>

+      <name>Thomas Neidhart</name>

+      <id>tn</id>

+      <email>tn@apache.org</email>

+    </developer>

+  </developers>

+  <contributors>

+    <contributor>

+      <name>Christopher O'Brien</name>

+      <email>siege@preoccupied.net</email>

+      <roles>

+        <role>hex</role>

+        <role>md5</role>

+        <role>architecture</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Martin Redington</name>

+      <roles>

+        <role>Representing xml-rpc</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Jeffery Dever</name>

+      <roles>

+        <role>Representing http-client</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Steve Zimmermann</name>

+      <email>steve.zimmermann@heii.com</email>

+      <roles>

+        <role>Documentation</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Benjamin Walstrum</name>

+      <email>ben@walstrum.com</email>

+    </contributor>

+    <contributor>

+      <name>Oleg Kalnichevski</name>

+      <email>oleg@ural.ru</email>

+      <roles>

+        <role>Representing http-client</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Dave Dribin</name>

+      <email>apache@dave.dribin.org</email>

+      <roles>

+        <role>DigestUtil</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Alex Karasulu</name>

+      <email>aok123 at bellsouth.net</email>

+      <roles>

+        <role>Submitted Binary class and test</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Matthew Inger</name>

+      <email>mattinger at yahoo.com</email>

+      <roles>

+        <role>Submitted DIFFERENCE algorithm for Soundex and RefinedSoundex</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Jochen Wiedmann</name>

+      <email>jochen@apache.org</email>

+      <roles>

+        <role>Base64 code [CODEC-69]</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Sebastian Bazley</name>

+      <email>sebb@apache.org</email>

+      <roles>

+        <role>Streaming Base64</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Matthew Pocock</name>

+      <email>turingatemyhamster@gmail.com</email>

+      <roles>

+        <role>Beider-Morse phonetic matching</role>

+      </roles>

+    </contributor>

+    <contributor>

+      <name>Colm Rice</name>

+      <email>colm_rice at hotmail dot com</email>

+      <roles>

+        <role>Submitted Match Rating Approach (MRA) phonetic encoder and tests [CODEC-161]</role>

+      </roles>

+    </contributor>

+  </contributors>

+  <!-- Codec should depend on very little -->

+  <dependencies>

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+      <version>4.11</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+  <properties>

+    <maven.compiler.source>1.6</maven.compiler.source>

+    <maven.compiler.target>1.6</maven.compiler.target>

+    <commons.componentid>codec</commons.componentid>

+    <commons.release.version>1.10</commons.release.version>

+    <!-- The RC version used in the staging repository URL. -->

+    <commons.rc.version>RC1</commons.rc.version>

+    <commons.jira.id>CODEC</commons.jira.id>

+    <commons.jira.pid>12310464</commons.jira.pid>

+    <!-- Ensure copies work OK (can be removed later when this is in parent POM) -->

+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

+    <commons.encoding>UTF-8</commons.encoding>

+    <checkstyle.header.file>${basedir}/LICENSE-header.txt</checkstyle.header.file>

+  </properties>

+  <build>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-scm-publish-plugin</artifactId>

+          <configuration>

+            <ignorePathsToDelete>

+              <ignorePathToDelete>archive**</ignorePathToDelete>

+            </ignorePathsToDelete>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-surefire-plugin</artifactId>

+        <configuration>

+          <excludes>

+            <exclude>**/*AbstractTest.java</exclude>

+            <exclude>**/*PerformanceTest.java</exclude>

+          </excludes>

+        </configuration>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-jar-plugin</artifactId>

+        <version>2.4</version>

+        <executions>

+          <execution>

+            <goals>

+              <goal>test-jar</goal>

+            </goals>

+          </execution>

+        </executions>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-assembly-plugin</artifactId>

+        <version>2.5</version>

+        <configuration>

+          <descriptors>

+            <descriptor>src/main/assembly/bin.xml</descriptor>

+            <descriptor>src/main/assembly/src.xml</descriptor>

+          </descriptors>

+          <tarLongFileMode>gnu</tarLongFileMode>

+        </configuration>

+      </plugin>

+    </plugins>

+  </build>

+  <reporting>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-checkstyle-plugin</artifactId>

+        <!-- Use 2.9.1 instead of 2.10; 2.10 seems to scan the 'target' 

+        dir and wants license headers in .properties to be the header for 

+        Java files. -->

+        <version>2.9.1</version>

+        <configuration>

+          <configLocation>${basedir}/checkstyle.xml</configLocation>

+          <enableRulesSummary>false</enableRulesSummary>

+          <headerFile>${basedir}/LICENSE-header.txt</headerFile>

+        </configuration>

+        <!-- We need to specify reportSets because 2.9.1 creates two reports -->

+        <reportSets>

+          <reportSet>

+            <reports>

+              <report>checkstyle</report>

+            </reports>

+          </reportSet>

+        </reportSets>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-pmd-plugin</artifactId>

+        <version>3.2</version>

+        <configuration>

+          <targetJdk>${maven.compiler.target}</targetJdk>

+          <linkXref>true</linkXref>

+          <rulesets>

+            <ruleset>${basedir}/pmd.xml</ruleset>

+          </rulesets>

+        </configuration>

+      </plugin>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>findbugs-maven-plugin</artifactId>

+        <version>2.5.5</version>

+      </plugin>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>taglist-maven-plugin</artifactId>

+        <version>2.4</version>

+        <configuration>

+          <tags>

+            <tag>TODO</tag>

+            <tag>NOPMD</tag>

+            <tag>NOTE</tag>

+          </tags>

+        </configuration>

+      </plugin>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>javancss-maven-plugin</artifactId>

+        <version>2.0</version>

+      </plugin>

+    </plugins>

+  </reporting>

+</project>

diff --git a/common/offline-m2/org/apache/apache/15/apache-15.pom b/common/offline-m2/org/apache/apache/15/apache-15.pom
new file mode 100644
index 0000000..0e471bf
--- /dev/null
+++ b/common/offline-m2/org/apache/apache/15/apache-15.pom
@@ -0,0 +1,411 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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>
+
+  <!-- for more information, see the documentation of this POM: http://maven.apache.org/pom/asf/ -->
+  <groupId>org.apache</groupId>
+  <artifactId>apache</artifactId>
+  <version>15</version>
+  <packaging>pom</packaging>
+
+  <name>The Apache Software Foundation</name>
+  <description>
+    The Apache Software Foundation provides support for the Apache community of open-source software projects.
+    The Apache projects are characterized by a collaborative, consensus based development process, an open and
+    pragmatic software license, and a desire to create high quality software that leads the way in its field.
+    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers
+    and users.
+  </description>
+  <url>http://www.apache.org/</url>
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <mailingLists>
+    <mailingList>
+      <name>Apache Announce List</name>
+      <subscribe>announce-subscribe@apache.org</subscribe>
+      <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
+      <post>announce@apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <prerequisites><!-- just for information: not inherited in child poms -->
+    <maven>2.2.1</maven><!-- prerequisite of some plugins -->
+  </prerequisites>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-15</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-15</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/pom/tags/apache-15</url>
+  </scm>
+
+  <distributionManagement>
+    <repository>
+      <id>apache.releases.https</id>
+      <name>Apache Release Distribution Repository</name>
+      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache.snapshots.https</id>
+      <name>${distMgmtSnapshotsName}</name>
+      <url>${distMgmtSnapshotsUrl}</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <properties>
+    <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
+    <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+    <organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
+    <gpg.useagent>true</gpg.useagent>
+    <arguments />
+    <!-- Specify the default compiler source/target as 1.4 for backwards compatibility -->
+    <maven.compiler.source>1.4</maven.compiler.source>
+    <maven.compiler.target>1.4</maven.compiler.target>    
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://repository.apache.org/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <!-- set versions of common plugins for reproducibility, ordered alphabetically -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.4.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.8</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-docck-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>1.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>2.17</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>1.9</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.5</version>
+          <configuration>
+            <archive>
+              <manifest>
+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              </manifest>
+            </archive>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.9.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>3.3</version>
+        </plugin>
+        <!-- START SNIPPET: release-plugin-configuration -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.5.1</version>
+          <configuration>
+            <useReleaseProfile>false</useReleaseProfile>
+            <goals>deploy</goals>
+            <arguments>-Papache-release ${arguments}</arguments>
+            <waitBeforeTagging>10</waitBeforeTagging>
+          </configuration>
+        </plugin>
+        <!-- END SNIPPET: release-plugin-configuration -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-plugin</artifactId>
+          <version>1.9.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-publish-plugin</artifactId>
+          <version>1.0-beta-2</version><!-- last version compatible with Maven 2: latest is configured in profile -->
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.4</version>
+          <dependencies><!-- TODO remove when upgrading m-site-p to 3.4.1: see MSITE-724 -->
+            <dependency>
+              <groupId>org.apache.maven</groupId>
+              <artifactId>maven-archiver</artifactId>
+              <version>2.5</version>
+            </dependency>
+            <dependency>
+              <groupId>org.codehaus.plexus</groupId>
+              <artifactId>plexus-archiver</artifactId>
+              <version>2.4.4</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.17</version><!-- keep maven-failsafe-plugin in sync -->
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.11</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>clirr-maven-plugin</artifactId>
+          <version>2.6.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!-- We want to package up license resources in the JARs produced -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <!-- START SNIPPET: release-profile -->
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <!-- Create a source-release artifact that contains the fully buildable 
+               project directory source structure. This is the artifact which is 
+               the official subject of any release vote. -->
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.apache.resources</groupId>
+                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                <version>1.0.4</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                  <descriptorRefs>
+                    <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                  </descriptorRefs>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- We want to deploy the artifact to a staging location for perusal -->
+          <plugin>
+            <inherited>true</inherited>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <configuration>
+              <updateReleaseInfo>true</updateReleaseInfo>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- END SNIPPET: release-profile -->
+
+    <profile>
+      <id>maven-3</id>
+      <activation>
+        <file>
+          <!--  This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+          <exists>${basedir}</exists>
+        </file>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-scm-publish-plugin</artifactId>
+              <version>1.1</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-descriptor</id>
+                <goals>
+                  <goal>attach-descriptor</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>    
+  </profiles>
+</project>
+
diff --git a/common/offline-m2/org/apache/commons/commons-parent/35/commons-parent-35.pom b/common/offline-m2/org/apache/commons/commons-parent/35/commons-parent-35.pom
new file mode 100644
index 0000000..b840506
--- /dev/null
+++ b/common/offline-m2/org/apache/commons/commons-parent/35/commons-parent-35.pom
@@ -0,0 +1,1437 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+<!--

+

+   Licensed to the Apache Software Foundation (ASF) under one or more

+   contributor license agreements.  See the NOTICE file distributed with

+   this work for additional information regarding copyright ownership.

+   The ASF licenses this file to You under the Apache License, Version 2.0

+   (the "License"); you may not use this file except in compliance with

+   the License.  You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

+

+-->

+<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>

+    <groupId>org.apache</groupId>

+    <artifactId>apache</artifactId>

+    <version>15</version>

+  </parent>

+  <groupId>org.apache.commons</groupId>

+  <artifactId>commons-parent</artifactId>

+  <packaging>pom</packaging>

+  <version>35</version>

+  <name>Apache Commons Parent</name>

+  <url>http://commons.apache.org/</url>

+  <description>The Apache Commons Parent POM provides common settings for all Apache Commons components.</description>

+

+<!--

+Version 35:

+

+- Suppress test Javadocs

+- Update JaCoCo -> 0.7.2.201409121644

+- Update maven-compiler-plugin to 3.1 -> 3.2

+- Update maven-source-plugin to 2.2.1 -> 2.4

+- Update maven-site-plugin 3.3 -> 3.4

+- Update maven-gpg-plugin 1.4 -> 1.5

+- Update maven-jar-plugin 2.4 -> 2.5

+- Update maven-release-plugin 2.4.2 -> 2.5.1

+- Update maven-bundle-plugin 2.4.0 -> 2.5.3

+- Update buildnumber-maven-plugin 1.2 -> 1.3

+- Update wagon-ssh 2.3 -> 2.6

+- Update maven-scm-publish-plugin 1.0 -> 1.1

+- Update jdepend-maven-plugin 2.0-beta-2 -> 2.0

+- Update apache-rat-plugin 0.10 -> 0.11

+- Update maven-clean-plugin 2.5 -> 2.6.

+- Update maven-changes-plugin 2.9 -> 2.11

+- Update maven-deploy-plugin 2.8.1 -> 2.8.2

+- Update maven-install-plugin 2.5.1 -> 2.5.2

+- Update maven-javadic-plugin 2.9.1 -> 2.10.1

+- Update apache 13 -> 15

+- Add property commons.findbugs.version.

+

+ -->

+

+  <!-- Maven versions plugin reports an error if this is omitted -->

+  <prerequisites>

+    <maven>3.0</maven>

+  </prerequisites>

+

+  <ciManagement>

+    <system>continuum</system>

+    <url>https://continuum-ci.apache.org/</url>

+  </ciManagement>

+

+  <!--

+    Starting with version 22, the RAT plugin has changed Maven group and id, so any existing configuration

+    needs to be updated.

+    To fix component POMs, please change any occurrences of:

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>rat-maven-plugin</artifactId>

+    to the new values:

+        <groupId>org.apache.rat</groupId>

+        <artifactId>apache-rat-plugin</artifactId>

+

+    Site deployment

+    ===============

+    Cannot define this here at present, see https://issues.apache.org/jira/browse/COMMONSSITE-26.

+

+    The following should be added to the component POM:

+

+    <distributionManagement>

+      <site>

+        <id>commons.site</id>

+        <name>Apache Commons Site SVN</name>

+        <url>scm:svn:${commons.scmPubUrl}</url>

+      </site>

+    </distributionManagement>

+

+    Alternatively you can map the component's existing site id to the

+    commons.scmPubServer property.

+

+    Coverage tool selection

+    =======================

+    Starting with release 30, there are optional profiles for both Cobertura and JaCoCo.

+    These can be enabled independently on the command-line:

+

+    mvn site -Pcobertura -Pjacoco

+

+    Or the component can define a default coverage tool by creating either (or both) of the following files:

+

+    src/site/resources/profile.cobertura

+    src/site/resources/profile.jacoco

+

+    These can later be overridden by cancelling the profile:

+

+    mvn site -P!jacoco

+

+  -->

+

+  <!--

+    This section *must* be overwritten by subprojects. It is only to allow

+    a release of the commons-parent POM.

+  -->

+  <scm>

+    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk</connection>

+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk</developerConnection>

+    <url>http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk</url>

+  </scm>

+

+  <mailingLists>

+    <!-- N.B. commons-site now uses the Apache POM so has its own copy of the mailing list definitions -->

+    <!--

+        Components should normally override the default mailing list report by using the comnand

+        mvn commons:mail-page

+        This generates the file src/site/xdoc/mail-lists.xml which when processed will replace the PIR version.

+     -->

+    <!-- Changes to this list should be synchronised with the commons build plugin -->

+    <mailingList>

+      <name>Commons User List</name>

+      <subscribe>user-subscribe@commons.apache.org</subscribe>

+      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>

+      <post>user@commons.apache.org</post>

+      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>

+      <otherArchives>

+        <otherArchive>http://markmail.org/list/org.apache.commons.users/</otherArchive>

+        <otherArchive>http://old.nabble.com/Commons---User-f319.html</otherArchive>

+        <otherArchive>http://www.mail-archive.com/user@commons.apache.org/</otherArchive>

+        <otherArchive>http://news.gmane.org/gmane.comp.jakarta.commons.user</otherArchive>

+      </otherArchives>

+    </mailingList>

+    <mailingList>

+      <name>Commons Dev List</name>

+      <subscribe>dev-subscribe@commons.apache.org</subscribe>

+      <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>

+      <post>dev@commons.apache.org</post>

+      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>

+      <otherArchives>

+        <otherArchive>http://markmail.org/list/org.apache.commons.dev/</otherArchive>

+        <otherArchive>http://old.nabble.com/Commons---Dev-f317.html</otherArchive>

+        <otherArchive>http://www.mail-archive.com/dev@commons.apache.org/</otherArchive>

+        <otherArchive>http://news.gmane.org/gmane.comp.jakarta.commons.devel</otherArchive>

+      </otherArchives>

+    </mailingList>

+    <mailingList>

+      <name>Commons Issues List</name>

+      <subscribe>issues-subscribe@commons.apache.org</subscribe>

+      <unsubscribe>issues-unsubscribe@commons.apache.org</unsubscribe>

+      <archive>http://mail-archives.apache.org/mod_mbox/commons-issues/</archive>

+      <otherArchives>

+        <otherArchive>http://markmail.org/list/org.apache.commons.issues/</otherArchive>

+        <otherArchive>http://old.nabble.com/Commons---Issues-f25499.html</otherArchive>

+        <otherArchive>http://www.mail-archive.com/issues@commons.apache.org/</otherArchive>

+      </otherArchives>

+    </mailingList>

+    <mailingList>

+      <name>Commons Commits List</name>

+      <subscribe>commits-subscribe@commons.apache.org</subscribe>

+      <unsubscribe>commits-unsubscribe@commons.apache.org</unsubscribe>

+      <archive>http://mail-archives.apache.org/mod_mbox/commons-commits/</archive>

+      <otherArchives>

+        <otherArchive>http://markmail.org/list/org.apache.commons.commits/</otherArchive>

+        <otherArchive>http://www.mail-archive.com/commits@commons.apache.org/</otherArchive>

+      </otherArchives>

+    </mailingList>

+    <mailingList>

+      <name>Apache Announce List</name>

+      <subscribe>announce-subscribe@apache.org</subscribe>

+      <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>

+      <archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>

+      <otherArchives>

+        <otherArchive>http://markmail.org/list/org.apache.announce/</otherArchive>

+        <otherArchive>http://old.nabble.com/Apache-News-and-Announce-f109.html</otherArchive>

+        <otherArchive>http://www.mail-archive.com/announce@apache.org/</otherArchive>

+        <otherArchive>http://news.gmane.org/gmane.comp.apache.announce</otherArchive>

+      </otherArchives>

+    </mailingList>

+  </mailingLists>

+  <build>

+    <!-- TODO find a better way to add N&L files to jars and test jars

+         See also maven-remote-resources-plugin configuration below.

+    -->

+    <resources>

+      <!-- This is the default setting from the super-pom -->

+      <resource>

+        <directory>src/main/resources</directory>

+      </resource>

+      <!-- hack to ensure the N&L appear in jars -->

+      <resource>

+        <directory>${basedir}</directory>

+        <targetPath>META-INF</targetPath>

+        <includes>

+          <include>NOTICE.txt</include>

+          <include>LICENSE.txt</include>

+        </includes>

+      </resource>

+    </resources>

+    <!-- ensure test jars also get NOTICE & LICENSE files -->

+    <testResources>

+      <!-- This is the default setting from the super-pom -->

+      <testResource>

+        <directory>src/test/resources</directory>

+      </testResource>

+      <!-- hack to ensure the N&L appear in jars -->

+      <testResource>

+        <directory>${basedir}</directory>

+        <targetPath>META-INF</targetPath>

+        <includes>

+          <include>NOTICE.txt</include>

+          <include>LICENSE.txt</include>

+        </includes>

+      </testResource>

+    </testResources>

+    <pluginManagement>

+      <plugins>

+        <!-- org.apache.maven.plugins, alpha order by artifact id -->

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-antrun-plugin</artifactId>

+          <version>1.7</version>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-assembly-plugin</artifactId>

+          <version>2.4.1</version>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-clean-plugin</artifactId>

+          <version>2.6</version>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-compiler-plugin</artifactId>

+          <version>${commons.compiler.version}</version>

+          <configuration>

+            <source>${maven.compiler.source}</source>

+            <target>${maven.compiler.target}</target>

+            <encoding>${commons.encoding}</encoding>

+            <fork>${commons.compiler.fork}</fork>

+            <compilerVersion>${commons.compiler.compilerVersion}</compilerVersion>

+            <executable>${commons.compiler.javac}</executable>

+          </configuration>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-deploy-plugin</artifactId>

+          <version>2.8.2</version>

+        </plugin>

+        <!-- Apache parent includes docck -->

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-gpg-plugin</artifactId>

+          <version>1.5</version>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-install-plugin</artifactId>

+          <version>2.5.2</version>

+        </plugin>

+        <!-- Apache parent: invoker -->

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-jar-plugin</artifactId>

+          <version>2.5</version>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-javadoc-plugin</artifactId>

+          <version>${commons.javadoc.version}</version>

+          <configuration>

+            <!-- keep only errors and warnings -->

+            <quiet>true</quiet>

+            <encoding>${commons.encoding}</encoding>

+            <docEncoding>${commons.docEncoding}</docEncoding>

+            <notimestamp>true</notimestamp>

+            <links>

+              <link>${commons.javadoc.java.link}</link>

+              <link>${commons.javadoc.javaee.link}</link>

+            </links>

+            <archive>

+              <manifest>

+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>

+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>

+              </manifest>

+            </archive>

+          </configuration>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-release-plugin</artifactId>

+          <version>2.5.1</version>

+        </plugin>

+        <plugin>

+          <!-- TODO see above - find better way to add N&L files to jars and test jars -->

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-remote-resources-plugin</artifactId>

+          <!-- override old version from Apache pom 13 -->

+          <version>1.5</version>

+          <configuration>

+            <!--

+                Apache parent POM automatically adds "LICENSE" and "NOTICE" files

+                to jars - duplicating the "LICENSE.txt" and "NOTICE.txt"

+                files that components already have.

+             -->

+            <skip>true</skip>

+          </configuration>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-resources-plugin</artifactId>

+          <version>2.7</version>

+        </plugin>

+        <!-- Apache parent: scm -->

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-site-plugin</artifactId>

+          <version>${commons.site-plugin.version}</version>

+          <configuration>

+            <!-- don't deploy site with maven-site-plugin -->

+            <skipDeploy>true</skipDeploy>

+          </configuration>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-source-plugin</artifactId>

+          <version>2.4</version>

+          <configuration>

+            <archive>

+              <manifest>

+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>

+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>

+              </manifest>

+            </archive>

+          </configuration>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-surefire-plugin</artifactId>

+          <version>${commons.surefire.version}</version>

+        </plugin>

+        <!-- Other plugins, alpha order by groupId and artifactId -->

+        <plugin>

+          <groupId>org.apache.commons</groupId>

+          <artifactId>commons-build-plugin</artifactId>

+          <version>1.4</version>

+          <configuration>

+            <commons.release.name>${commons.release.name}</commons.release.name>

+          </configuration>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.felix</groupId>

+          <artifactId>maven-bundle-plugin</artifactId>

+          <version>2.5.3</version>

+          <inherited>true</inherited>

+        </plugin>

+        <plugin>

+          <groupId>org.apache.rat</groupId>

+          <artifactId>apache-rat-plugin</artifactId>

+          <version>${commons.rat.version}</version>

+        </plugin>

+        <plugin>

+          <groupId>org.codehaus.mojo</groupId>

+          <artifactId>buildnumber-maven-plugin</artifactId>

+          <version>1.3</version>

+        </plugin>

+        <plugin>

+          <groupId>org.codehaus.mojo</groupId>

+          <artifactId>clirr-maven-plugin</artifactId>

+          <version>${commons.clirr.version}</version>

+          <configuration>

+            <minSeverity>${minSeverity}</minSeverity>

+          </configuration>

+        </plugin>

+        <!-- Apache parent: plexus & modello -->

+      </plugins>

+    </pluginManagement>

+    <plugins>

+      <!-- org.apache.maven.plugins, alpha order by artifact id -->

+      <plugin>

+          <!-- Parent POM is released, so needs source archive for ASF mirrors -->

+          <artifactId>maven-assembly-plugin</artifactId>

+          <configuration>

+              <descriptors>

+                  <descriptor>src/main/assembly/src.xml</descriptor>

+              </descriptors>

+              <tarLongFileMode>gnu</tarLongFileMode>

+          </configuration>

+      </plugin>

+      <plugin>

+        <!--

+          - Copy LICENSE.txt and NOTICE.txt so that they are included

+          - in the -javadoc jar file for the component.

+          -->

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-antrun-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>javadoc.resources</id>

+            <phase>generate-sources</phase>

+            <goals>

+              <goal>run</goal>

+            </goals>

+            <configuration>

+              <target>

+                <copy todir="${project.build.directory}/apidocs/META-INF">

+                  <fileset dir="${basedir}">

+                    <include name="LICENSE.txt" />

+                    <include name="NOTICE.txt" />

+                  </fileset>

+                </copy>

+              </target>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-compiler-plugin</artifactId>

+      </plugin>

+      <!-- Unfortunately the much simpler

+           <prerequisites><maven>3.0</maven></prerequisites>

+           is not inherited so we have to use the enforcer plugin

+      -->

+      <plugin>

+        <inherited>true</inherited>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-enforcer-plugin</artifactId>

+        <version>1.3.1</version>

+        <executions>

+          <execution>

+            <id>enforce-maven-3</id>

+            <goals>

+              <goal>enforce</goal>

+            </goals>

+            <configuration>

+              <rules>

+                <requireMavenVersion>

+                  <version>3.0.0</version>

+                </requireMavenVersion>

+              </rules>

+              <fail>true</fail>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-jar-plugin</artifactId>

+        <configuration>

+          <archive>

+            <manifestFile>${commons.manifestfile}</manifestFile>

+            <manifestEntries>

+              <Specification-Title>${project.name}</Specification-Title>

+              <Specification-Version>${project.version}</Specification-Version>

+              <Specification-Vendor>${project.organization.name}</Specification-Vendor>

+              <Implementation-Title>${project.name}</Implementation-Title>

+              <Implementation-Version>${project.version}</Implementation-Version>

+              <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>

+              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>

+              <Implementation-Build>${implementation.build}</Implementation-Build>

+              <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>

+              <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>

+            </manifestEntries>

+          </archive>

+        </configuration>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-surefire-plugin</artifactId>

+        <configuration>

+          <jvm>${commons.surefire.java}</jvm>

+        </configuration>

+      </plugin>

+      <!-- Other plugins, alpha order by groupId and artifactId -->

+      <plugin>

+        <groupId>org.apache.commons</groupId>

+        <artifactId>commons-build-plugin</artifactId>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.felix</groupId>

+        <artifactId>maven-bundle-plugin</artifactId>

+        <configuration>

+          <!--

+            dummy entry to stop bundle plugin from picking up jar config and reporting

+            WARNING: Duplicate name in Manifest

+            See http://markmail.org/message/mpkl24wk3jrjhhjg

+          -->

+          <archive>

+            <forced>true</forced>

+          </archive>

+          <excludeDependencies>true</excludeDependencies>

+          <manifestLocation>${project.build.directory}/osgi</manifestLocation>

+          <instructions>

+            <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->

+            <_nouses>true</_nouses>

+            <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd -->

+            <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME,JAVA_1_8_HOME</_removeheaders>

+            <Bundle-SymbolicName>${commons.osgi.symbolicName}</Bundle-SymbolicName>

+            <Export-Package>${commons.osgi.export}</Export-Package>

+            <Private-Package>${commons.osgi.private}</Private-Package>

+            <Import-Package>${commons.osgi.import}</Import-Package>

+            <DynamicImport-Package>${commons.osgi.dynamicImport}</DynamicImport-Package>

+            <Bundle-DocURL>${project.url}</Bundle-DocURL>

+          </instructions>

+        </configuration>

+        <executions>

+          <execution>

+            <id>bundle-manifest</id>

+            <phase>process-classes</phase>

+            <goals>

+              <goal>manifest</goal>

+            </goals>

+          </execution>

+        </executions>

+      </plugin>

+      <!-- Needed for command-line access, e.g mvn apache-rat:rat and mvn apache-rat:check -->

+      <plugin>

+        <groupId>org.apache.rat</groupId>

+        <artifactId>apache-rat-plugin</artifactId>

+        <version>${commons.rat.version}</version>

+        <!-- Should agree with config in reporting section -->

+        <configuration>

+          <!--

+               If you wish to override this list in the component (child) pom, ensure you use

+                   <excludes combine.children="merge">

+               so that the child pom entries replace the parent entries

+           -->

+          <excludes combine.children="append">

+            <exclude>site-content/**</exclude>

+            <exclude>.checkstyle</exclude>

+            <exclude>.fbprefs</exclude>

+            <exclude>.pmd</exclude>

+            <exclude>src/site/resources/download_*.cgi</exclude>

+            <exclude>src/site/resources/profile.*</exclude>

+          </excludes>

+        </configuration>

+      </plugin>

+

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-scm-publish-plugin</artifactId>

+        <version>${commons.scm-publish.version}</version>

+        <configuration>

+          <content>${project.reporting.outputDirectory}</content>

+          <pubScmUrl>scm:svn:${commons.scmPubUrl}</pubScmUrl>

+          <checkoutDirectory>${commons.scmPubCheckoutDirectory}</checkoutDirectory>

+          <serverId>${commons.scmPubServer}</serverId>

+          <tryUpdate>true</tryUpdate>

+        </configuration>

+        <executions>

+          <execution>

+            <id>scm-publish</id>

+            <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->

+            <goals>

+              <goal>publish-scm</goal>

+            </goals>

+          </execution>

+        </executions>

+      </plugin>

+

+    </plugins>

+  </build>

+

+  <reporting>

+    <!-- N.B. plugins defined here in the <reporting> section ignore what's defined in <pluginManagement>

+         in the <build> section above, so we have to define the versions here. -->

+    <plugins>

+      <!-- org.apache.maven.plugins, alpha order by artifact id -->

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-changes-plugin</artifactId>

+        <version>${commons.changes.version}</version>

+        <configuration>

+          <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>

+          <columnNames>Fix Version,Key,Component,Summary,Type,Resolution,Status</columnNames>

+          <!-- Sort cols in natural order when using JQL for JIRA 5.1 -->

+          <sortColumnNames>Fix Version DESC,Type,Key DESC</sortColumnNames>

+          <resolutionIds>Fixed</resolutionIds>

+          <statusIds>Resolved,Closed</statusIds>

+          <!-- Don't include sub-task -->

+          <typeIds>Bug,New Feature,Task,Improvement,Wish,Test</typeIds>

+          <!-- For JIRA >= 5.1 -->

+          <useJql>true</useJql>

+        </configuration>

+        <reportSets>

+          <reportSet>

+            <reports>

+              <report>changes-report</report>

+              <report>jira-report</report>

+            </reports>

+          </reportSet>

+        </reportSets>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-javadoc-plugin</artifactId>

+        <version>${commons.javadoc.version}</version>

+        <configuration>

+          <!-- keep only errors and warnings -->

+          <quiet>true</quiet>

+          <source>${maven.compiler.source}</source>

+          <encoding>${commons.encoding}</encoding>

+          <docencoding>${commons.docEncoding}</docencoding>

+          <notimestamp>true</notimestamp>

+          <linksource>true</linksource>

+          <!-- prevent svnpub to be too much noisy -->

+          <notimestamp>true</notimestamp>

+          <links>

+            <link>${commons.javadoc.java.link}</link>

+            <link>${commons.javadoc.javaee.link}</link>

+          </links>

+        </configuration>

+        <!-- Suppress test Javadocs -->

+        <reportSets>

+          <reportSet>

+            <id>default</id>

+            <reports>

+              <report>javadoc</report>

+            </reports>

+          </reportSet>

+        </reportSets>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-jxr-plugin</artifactId>

+        <version>${commons.jxr.version}</version>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-project-info-reports-plugin</artifactId>

+        <version>${commons.project-info.version}</version>

+        <!--

+            Unfortunately it does not appear to be possible to override

+            reports configured in a parent POM.

+            See https://jira.codehaus.org/browse/MPIR-241

+            and https://issues.apache.org/jira/browse/MPOM-32

+            So we define here all those reports that are suitable for

+            all components.

+            Components can add extra reports if they wish, but cannot disable any.

+        -->

+        <reportSets>

+          <reportSet>

+            <reports>

+              <report>index</report>

+              <report>summary</report>

+              <report>modules</report>

+<!--          <report>license</report>               site must link to ASF page instead  -->

+              <report>project-team</report>

+              <report>scm</report>

+              <report>issue-tracking</report>

+              <report>mailing-list</report>

+              <report>dependency-info</report>

+              <report>dependency-management</report>

+              <report>dependencies</report>

+              <report>dependency-convergence</report>

+              <report>cim</report>

+<!--          <report>plugin-management</report>      not very useful for end users -->

+<!--          <report>plugins</report>                not very useful for end users -->

+              <report>distribution-management</report>

+            </reports>

+          </reportSet>

+        </reportSets>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-site-plugin</artifactId>

+        <version>${commons.site-plugin.version}</version>

+        <configuration>

+          <!-- Exclude the navigation file for Maven 1 sites

+               and the changes file used by the changes-plugin,

+               as they interfere with the site generation. -->

+          <moduleExcludes>

+            <xdoc>navigation.xml,changes.xml</xdoc>

+          </moduleExcludes>

+        </configuration>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-surefire-report-plugin</artifactId>

+        <version>${commons.surefire.version}</version>

+        <configuration>

+          <aggregate>${commons.surefire-report.aggregate}</aggregate>

+        </configuration>

+      </plugin>

+      <!-- Other plugins, alpha order by groupId and artifactId -->

+      <plugin>

+        <groupId>org.apache.rat</groupId>

+        <artifactId>apache-rat-plugin</artifactId>

+        <version>${commons.rat.version}</version>

+        <!-- Should agree with config in build section -->

+        <configuration>

+          <!--

+               If you wish to override this list in the component (child) pom, ensure you use

+                   <excludes combine.children="merge">

+               so that the child pom entries replace the parent entries

+           -->

+          <excludes combine.children="append">

+            <exclude>site-content/**</exclude>

+            <exclude>.pmd</exclude>

+            <exclude>src/site/resources/download_*.cgi</exclude>

+            <exclude>src/site/resources/profile.*</exclude>

+          </excludes>

+        </configuration>

+      </plugin>

+      <plugin>

+          <groupId>org.codehaus.mojo</groupId>

+          <artifactId>clirr-maven-plugin</artifactId>

+          <version>${commons.clirr.version}</version>

+          <configuration>

+              <minSeverity>${minSeverity}</minSeverity>

+          </configuration>

+      </plugin>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>jdepend-maven-plugin</artifactId>

+        <version>${commons.jdepend.version}</version>

+      </plugin>

+    </plugins>

+  </reporting>

+

+  <profiles>

+

+    <profile>

+      <id>jacoco</id>

+      <activation>

+        <!--

+            N.B. in spite of what the Maven docs may say,

+            activation conditions are ORed together, see:

+            http://jira.codehaus.org/browse/MNG-4565

+            Fairly useless, but that's what was done in

+            http://jira.codehaus.org/browse/MNG-3106

+

+            So we cannot also check for Java 1.5+

+            This should not be a problem now as the profile is optional.

+            Components that still target Java 1.4 or earlier

+            just need to ensure they don't use JaCoCo by default.

+        -->

+        <file>

+          <exists>src/site/resources/profile.jacoco</exists>

+        </file>

+      </activation>

+      <build>

+        <plugins>

+          <plugin>

+          <groupId>org.jacoco</groupId>

+          <artifactId>jacoco-maven-plugin</artifactId>

+          <version>${commons.jacoco.version}</version>

+          <!-- Note that since JaCoCo relies on an agent to perform tests,

+               it changes the surefire arguments line. If a component also

+               needs to change the argument line of maven-surefire-plugin,

+               then it must add ${argLine} property (which is set by JaCoCo)

+               in the argLine configuration element of maven-surefire-plugin

+               to preserve JaCoCo settings. -->

+          <executions>

+            <execution>

+              <id>prepare-agent</id>

+              <phase>process-test-classes</phase>

+              <goals>

+                <goal>prepare-agent</goal>

+              </goals>

+            </execution>

+            <execution>

+              <id>report</id>

+              <phase>site</phase>

+              <goals>

+                <goal>report</goal>

+              </goals>

+            </execution>

+            <execution>

+              <id>check</id>

+              <goals>

+                <goal>check</goal>

+              </goals>

+              <configuration>

+                <rules>

+                  <rule>

+                    <element>BUNDLE</element>

+                    <limits>

+                      <limit>

+                        <counter>CLASS</counter>

+                        <value>COVEREDRATIO</value>

+                        <minimum>${commons.jacoco.classRatio}</minimum>

+                      </limit>

+                      <limit>

+                        <counter>INSTRUCTION</counter>

+                        <value>COVEREDRATIO</value>

+                        <minimum>${commons.jacoco.instructionRatio}</minimum>

+                      </limit>

+                      <limit>

+                        <counter>METHOD</counter>

+                        <value>COVEREDRATIO</value>

+                        <minimum>${commons.jacoco.methodRatio}</minimum>

+                      </limit>

+                      <limit>

+                        <counter>BRANCH</counter>

+                        <value>COVEREDRATIO</value>

+                        <minimum>${commons.jacoco.branchRatio}</minimum>

+                      </limit>

+                      <limit>

+                        <counter>LINE</counter>

+                        <value>COVEREDRATIO</value>

+                        <minimum>${commons.jacoco.lineRatio}</minimum>

+                      </limit>

+                      <limit>

+                        <counter>COMPLEXITY</counter>

+                        <value>COVEREDRATIO</value>

+                        <minimum>${commons.jacoco.complexityRatio}</minimum>

+                      </limit>

+                    </limits>

+                  </rule>

+                </rules>

+                <haltOnFailure>${commons.jacoco.haltOnFailure}</haltOnFailure>

+              </configuration>

+            </execution>

+          </executions>

+          </plugin>

+        </plugins>

+      </build>

+      <reporting>

+        <plugins>

+          <plugin>

+            <groupId>org.jacoco</groupId>

+            <artifactId>jacoco-maven-plugin</artifactId>

+            <version>${commons.jacoco.version}</version>

+          </plugin>

+        </plugins>

+      </reporting>

+    </profile>

+

+    <profile>

+      <id>cobertura</id>

+      <activation>

+        <file>

+          <exists>src/site/resources/profile.cobertura</exists>

+        </file>

+      </activation>

+      <reporting>

+        <plugins>

+          <plugin>

+            <groupId>org.codehaus.mojo</groupId>

+            <artifactId>cobertura-maven-plugin</artifactId>

+            <version>${commons.cobertura.version}</version>

+          </plugin>

+        </plugins>

+      </reporting>

+    </profile>

+

+    <!--

+         Profile for Commons releases via Nexus.

+         Assembles artifacts, creates source and javadoc jars, signs them and adds hashes.

+    -->

+    <profile>

+      <id>release</id>

+      <build>

+        <plugins>

+          <!-- We want to sign the artifact, the POM, and all attached artifacts -->

+          <plugin>

+            <artifactId>maven-gpg-plugin</artifactId>

+            <configuration>

+              <passphrase>${gpg.passphrase}</passphrase>

+            </configuration>

+            <executions>

+              <execution>

+                <id>sign-artifacts</id>

+                <phase>verify</phase>

+                <goals>

+                  <goal>sign</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+          <plugin>

+            <artifactId>maven-install-plugin</artifactId>

+            <configuration>

+              <createChecksum>true</createChecksum>

+            </configuration>

+          </plugin>

+          <plugin>

+            <artifactId>maven-source-plugin</artifactId>

+            <executions>

+              <execution>

+                <id>create-source-jar</id>

+                <goals>

+                  <goal>jar</goal>

+                  <goal>test-jar</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+          <plugin>

+            <artifactId>maven-jar-plugin</artifactId>

+            <executions>

+              <execution>

+                <goals>

+                  <goal>test-jar</goal>

+                </goals>

+                <configuration>

+                 <!-- Avoids an error when releasing the parent pom -->

+                 <skipIfEmpty>true</skipIfEmpty>

+                </configuration>

+              </execution>

+            </executions>

+          </plugin>

+          <plugin>

+            <artifactId>maven-release-plugin</artifactId>

+            <configuration>

+              <!-- Pass these arguments to the deploy plugin. -->

+              <arguments>-Prelease</arguments>

+            </configuration>

+          </plugin>

+          <plugin>

+            <artifactId>maven-javadoc-plugin</artifactId>

+            <executions>

+              <execution>

+                <id>create-javadoc-jar</id>

+                <goals>

+                  <goal>javadoc</goal>

+                  <goal>jar</goal>

+                </goals>

+                <phase>package</phase>

+              </execution>

+            </executions>

+            <configuration>

+              <source>${maven.compiler.source}</source>

+            </configuration>

+          </plugin>

+          <plugin>

+            <artifactId>maven-assembly-plugin</artifactId>

+            <inherited>true</inherited>

+            <executions>

+              <execution>

+                <goals>

+                  <goal>single</goal>

+                </goals>

+                <phase>package</phase>

+              </execution>

+            </executions>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

+

+     <!--

+       profile to update the Apache parent pom profile of the same name

+       to better suit the requirements of Apache Commons.

+       [Requires further work]

+     -->

+    <profile>

+      <id>apache-release</id>

+      <build>

+        <plugins>

+          <plugin>

+            <artifactId>maven-release-plugin</artifactId>

+            <configuration>

+                <releaseProfiles>apache-release</releaseProfiles>

+            </configuration>

+          </plugin>

+          <plugin>

+            <groupId>org.apache.maven.plugins</groupId>

+            <artifactId>maven-source-plugin</artifactId>

+            <executions>

+              <execution>

+                <id>attach-test-sources</id>

+                <goals>

+                  <goal>test-jar</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+          <plugin>

+            <artifactId>maven-install-plugin</artifactId>

+            <configuration>

+              <createChecksum>true</createChecksum>

+            </configuration>

+          </plugin>

+          <plugin>

+            <groupId>org.apache.maven.plugins</groupId>

+            <artifactId>maven-jar-plugin</artifactId>

+            <executions>

+              <execution>

+                <goals>

+                  <goal>test-jar</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

+

+    <!--

+       Profile for running the build using JDK 1.3

+       (JAVA_1_3_HOME needs to be defined, e.g. in settings.xml or an environment variable)

+      -->

+    <profile>

+      <id>java-1.3</id>

+      <properties>

+        <commons.compiler.fork>true</commons.compiler.fork>

+        <commons.compiler.compilerVersion>1.3</commons.compiler.compilerVersion>

+        <commons.compiler.javac>${JAVA_1_3_HOME}/bin/javac</commons.compiler.javac>

+        <commons.surefire.java>${JAVA_1_3_HOME}/bin/java</commons.surefire.java>

+      </properties>

+    </profile>

+

+    <!--

+       Profile for running the build using JDK 1.4

+       (JAVA_1_4_HOME needs to be defined, e.g. in settings.xml or an environment variable)

+      -->

+    <profile>

+      <id>java-1.4</id>

+      <properties>

+        <commons.compiler.fork>true</commons.compiler.fork>

+        <commons.compiler.compilerVersion>1.4</commons.compiler.compilerVersion>

+        <commons.compiler.javac>${JAVA_1_4_HOME}/bin/javac</commons.compiler.javac>

+        <commons.surefire.java>${JAVA_1_4_HOME}/bin/java</commons.surefire.java>

+      </properties>

+    </profile>

+

+    <!--

+       Profile for running the build using JDK 1.5

+       (JAVA_1_5_HOME needs to be defined, e.g. in settings.xml or an environment variable)

+      -->

+    <profile>

+      <id>java-1.5</id>

+      <properties>

+        <commons.compiler.fork>true</commons.compiler.fork>

+        <commons.compiler.compilerVersion>1.5</commons.compiler.compilerVersion>

+        <commons.compiler.javac>${JAVA_1_5_HOME}/bin/javac</commons.compiler.javac>

+        <commons.surefire.java>${JAVA_1_5_HOME}/bin/java</commons.surefire.java>

+      </properties>

+    </profile>

+

+    <!--

+       Profile for running the build using JDK 1.6

+       (JAVA_1_6_HOME needs to be defined, e.g. in settings.xml or an environment variable)

+      -->

+    <profile>

+      <id>java-1.6</id>

+      <properties>

+        <commons.compiler.fork>true</commons.compiler.fork>

+        <commons.compiler.compilerVersion>1.6</commons.compiler.compilerVersion>

+        <commons.compiler.javac>${JAVA_1_6_HOME}/bin/javac</commons.compiler.javac>

+        <commons.surefire.java>${JAVA_1_6_HOME}/bin/java</commons.surefire.java>

+      </properties>

+    </profile>

+

+    <!--

+       Profile for running the build using JDK 1.7

+       (JAVA_1_7_HOME needs to be defined, e.g. in settings.xml or an environment variable)

+      -->

+    <profile>

+      <id>java-1.7</id>

+      <properties>

+        <commons.compiler.fork>true</commons.compiler.fork>

+        <commons.compiler.compilerVersion>1.7</commons.compiler.compilerVersion>

+        <commons.compiler.javac>${JAVA_1_7_HOME}/bin/javac</commons.compiler.javac>

+        <commons.surefire.java>${JAVA_1_7_HOME}/bin/java</commons.surefire.java>

+      </properties>

+    </profile>

+

+    <!--

+       Profile for running the build using JDK 1.8

+       (JAVA_1_8_HOME needs to be defined, e.g. in settings.xml or an environment variable)

+      -->

+    <profile>

+      <id>java-1.8</id>

+      <properties>

+        <commons.compiler.fork>true</commons.compiler.fork>

+        <commons.compiler.compilerVersion>1.8</commons.compiler.compilerVersion>

+        <commons.compiler.javac>${JAVA_1_8_HOME}/bin/javac</commons.compiler.javac>

+        <commons.surefire.java>${JAVA_1_8_HOME}/bin/java</commons.surefire.java>

+      </properties>

+    </profile>

+

+    <!--

+       Profile for running the build using JDK 1.9

+       (JAVA_1_9_HOME needs to be defined, e.g. in settings.xml or an environment variable)

+      -->

+    <profile>

+      <id>java-1.9</id>

+      <properties>

+        <commons.compiler.fork>true</commons.compiler.fork>

+        <commons.compiler.compilerVersion>1.9</commons.compiler.compilerVersion>

+        <commons.compiler.javac>${JAVA_1_9_HOME}/bin/javac</commons.compiler.javac>

+        <commons.surefire.java>${JAVA_1_9_HOME}/bin/java</commons.surefire.java>

+      </properties>

+    </profile>

+

+    <!-- N.B. when adding new java profiles, be sure to update

+         the _removeheaders list in the maven_bundle_plugin configuration -->

+

+    <!--

+     | Profile to allow testing of deploy phase

+     | e.g.

+     | mvn deploy -Ptest-deploy -Prelease -Dgpg.skip

+     -->

+    <profile>

+      <id>test-deploy</id>

+      <properties>

+        <altDeploymentRepository>id::default::file:target/deploy</altDeploymentRepository>

+      </properties>

+    </profile>

+

+    <!--

+      Profile to build all Commons "proper" components.

+

+      The trunks of all "proper" components can be checked out using:

+          https://svn.apache.org/repos/asf/commons/trunks-proper/

+

+      This profile is a convenience which can be used, for example, to build all the component sites:

+          mvn -Ptrunks-proper site

+

+      or, to clean up:

+          mvn -Ptrunks-proper clean

+

+      see http://issues.apache.org/jira/browse/COMMONSSITE-30

+      -->

+    <profile>

+      <id>trunks-proper</id>

+      <modules>

+        <!-- not yet using mvn module>../attributes</module-->

+        <module>../bcel</module>

+        <module>../beanutils</module>

+        <module>../betwixt</module>

+        <module>../chain</module>

+        <module>../cli</module>

+        <module>../codec</module>

+        <module>../collections</module>

+        <module>../compress</module>

+        <module>../configuration</module>

+        <module>../daemon</module>

+        <module>../dbcp</module>

+        <module>../dbutils</module>

+        <module>../digester</module>

+        <module>../discovery</module>

+        <module>../el</module>

+        <module>../email</module>

+        <module>../exec</module>

+        <module>../fileupload</module>

+        <module>../functor</module>

+        <module>../imaging</module>

+        <module>../io</module>

+        <module>../jci</module>

+        <module>../jcs</module>

+        <!-- not yet using mvn module>../jelly</module-->

+        <module>../jexl</module>

+        <module>../jxpath</module>

+        <module>../lang</module>

+        <module>../launcher</module>

+        <module>../logging</module>

+        <module>../math</module>

+        <module>../modeler</module>

+        <module>../net</module>

+        <module>../ognl</module>

+        <module>../pool</module>

+        <module>../primitives</module>

+        <module>../proxy</module>

+        <module>../scxml</module>

+        <!-- not yet using mvn module>../transaction</module-->

+        <module>../validator</module>

+        <module>../vfs</module>

+      </modules>

+    </profile>

+

+    <!--

+        Configure site plugin to support both Maven2 and Maven3, see:

+        http://maven.apache.org/plugins/maven-site-plugin/maven-3.html#Using_the_same_version_of_maven-site-plugin_for_both_Maven_2_and_Maven_3

+    -->

+    <profile>

+      <id>maven-3</id>

+      <activation>

+        <file>

+          <!--  The basedir expression is only recognized by Maven 3.x (see MNG-2363) -->

+          <exists>${basedir}</exists>

+        </file>

+      </activation>

+      <build>

+        <plugins>

+          <plugin>

+            <artifactId>maven-site-plugin</artifactId>

+            <dependencies>

+              <dependency>

+                  <!-- add support for ssh/scp -->

+                  <groupId>org.apache.maven.wagon</groupId>

+                  <artifactId>wagon-ssh</artifactId>

+                  <version>${commons.wagon-ssh.version}</version>

+                </dependency>

+              </dependencies>

+            <executions>

+              <execution>

+                <id>attach-descriptor</id>

+                <goals>

+                  <goal>attach-descriptor</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

+

+    <profile>

+      <!--

+          Generate release notes in top-level directory from src/changes/changes.xml

+          Usage:

+          mvn changes:announcement-generate -Prelease-notes [-Dchanges.version=nnn]

+

+          Defining changes.version allows one to create the RN without first removing the SNAPSHOT suffix.

+

+          Requires file src/changes/release-notes.vm.

+          A sample template is available from:

+          https://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk/src/changes/release-notes.vm

+       -->

+      <id>release-notes</id>

+      <build>

+        <plugins>

+           <plugin>

+            <groupId>org.apache.maven.plugins</groupId>

+            <artifactId>maven-changes-plugin</artifactId>

+            <version>${commons.changes.version}</version>

+            <configuration>

+              <template>release-notes.vm</template>

+              <templateDirectory>src/changes</templateDirectory>

+              <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>

+              <outputDirectory>.</outputDirectory>

+              <announcementFile>RELEASE-NOTES.txt</announcementFile>

+              <announceParameters>

+                <releaseVersion>${commons.release.version}</releaseVersion>

+              </announceParameters>

+            </configuration>

+            <executions>

+              <execution>

+                <id>create-release-notes</id>

+                <phase>generate-resources</phase>

+                <goals>

+                  <goal>announcement-generate</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

+

+    <!--

+        Automatically run the buildnumber plugin unless the buildNumber.skip property is defined as true

+    -->

+    <profile>

+     <id>svn-buildnumber</id>

+     <activation>

+       <property><name>!buildNumber.skip</name><value>!true</value></property>

+     </activation>

+     <build>

+       <plugins>

+         <plugin>

+           <groupId>org.codehaus.mojo</groupId>

+           <artifactId>buildnumber-maven-plugin</artifactId>

+           <executions>

+             <execution>

+               <phase>generate-resources</phase>

+               <goals>

+                 <goal>create</goal>

+               </goals>

+             </execution>

+           </executions>

+           <configuration>

+             <!-- Use committed revision so it does not change every time svn update is run -->

+             <useLastCommittedRevision>true</useLastCommittedRevision>

+             <!-- default revision number if unavailable -->

+             <revisionOnScmFailure>??????</revisionOnScmFailure>

+             <doCheck>false</doCheck>

+             <doUpdate>false</doUpdate>

+           </configuration>

+         </plugin>

+       </plugins>

+     </build>

+   </profile>

+   <!-- optional profile to use javasvn instead of the SVN CLI for the buildNumber plugin -->

+   <profile>

+     <id>javasvn</id>

+     <build>

+       <plugins>

+         <plugin>

+           <groupId>org.codehaus.mojo</groupId>

+           <artifactId>buildnumber-maven-plugin</artifactId>

+           <configuration>

+             <providerImplementations>

+               <svn>javasvn</svn>

+             </providerImplementations>

+           </configuration>

+         </plugin>

+       </plugins>

+     </build>

+   </profile>

+    <profile>

+      <id>jdk7-findbugs</id>

+      <activation>

+        <jdk>[1.7,)</jdk>

+      </activation>

+      <properties>

+        <commons.findbugs.version>3.0.0</commons.findbugs.version>

+      </properties>

+    </profile>

+

+  </profiles>

+

+  <properties>

+    <!-- configuration bits for cutting a release candidate, must be overridden by components -->

+    <commons.release.version>${project.version}</commons.release.version>

+    <commons.rc.version>RC1</commons.rc.version>

+    <commons.jira.id>COMMONSSITE</commons.jira.id>

+

+    <!-- Default configuration for compiler source and target JVM -->

+    <!-- Do NOT change this; it must remain as 1.3 -->

+    <maven.compiler.source>1.3</maven.compiler.source>

+    <maven.compiler.target>1.3</maven.compiler.target>

+

+    <!-- compiler and surefire plugin settings for "java" profiles -->

+    <commons.compiler.fork>false</commons.compiler.fork>

+    <commons.compiler.compilerVersion />

+    <commons.compiler.javac />

+    <commons.surefire.java />

+

+    <!-- plugin versions (allows same value in reporting and build sections) -->

+    <commons.surefire.version>2.17</commons.surefire.version>

+    <commons.surefire-report.version>2.17</commons.surefire-report.version>

+    <!-- 2.9.1 includes fix for Javadoc vulnerability (CVE-2013-1571, VU#225657) MJAVADOC-370 -->

+    <commons.javadoc.version>2.10.1</commons.javadoc.version>

+    <commons.rat.version>0.11</commons.rat.version>

+    <commons.changes.version>2.11</commons.changes.version>

+    <commons.clirr.version>2.6.1</commons.clirr.version>

+    <commons.jxr.version>2.4</commons.jxr.version>

+    <commons.project-info.version>2.7</commons.project-info.version>

+    <commons.wagon-ssh.version>2.6</commons.wagon-ssh.version>

+    <commons.site-plugin.version>3.4</commons.site-plugin.version>

+    <commons.jacoco.version>0.7.2.201409121644</commons.jacoco.version>

+    <commons.cobertura.version>2.6</commons.cobertura.version>

+    <commons.jdepend.version>2.0</commons.jdepend.version>

+    <commons.compiler.version>3.2</commons.compiler.version>

+    <commons.scm-publish.version>1.1</commons.scm-publish.version>

+    <commons.findbugs.version>2.5.5</commons.findbugs.version>

+

+    <!-- Default values for the download-page generation by commons-build-plugin -->

+    <commons.release.name>${project.artifactId}-${commons.release.version}</commons.release.name>

+    <commons.release.desc />

+    <commons.binary.suffix>-bin</commons.binary.suffix>

+    <commons.release.2.name>${project.artifactId}-${commons.release.2.version}</commons.release.2.name>

+    <commons.release.2.desc />

+    <commons.release.2.binary.suffix>-bin</commons.release.2.binary.suffix>

+    <commons.release.3.name>${project.artifactId}-${commons.release.3.version}</commons.release.3.name>

+    <commons.release.3.desc />

+    <commons.release.3.binary.suffix>-bin</commons.release.3.binary.suffix>

+

+    <!-- Default values for the jacoco-maven-plugin reports -->

+    <commons.jacoco.classRatio>1.00</commons.jacoco.classRatio>

+    <commons.jacoco.instructionRatio>0.90</commons.jacoco.instructionRatio>

+    <commons.jacoco.methodRatio>0.95</commons.jacoco.methodRatio>

+    <commons.jacoco.branchRatio>0.85</commons.jacoco.branchRatio>

+    <commons.jacoco.complexityRatio>0.85</commons.jacoco.complexityRatio>

+    <commons.jacoco.lineRatio>0.90</commons.jacoco.lineRatio>

+    <commons.jacoco.haltOnFailure>false</commons.jacoco.haltOnFailure>

+

+    <!-- Commons Component Id -->

+    <commons.componentid>${project.artifactId}</commons.componentid>

+

+    <!-- Configuration properties for the OSGi maven-bundle-plugin -->

+    <commons.osgi.symbolicName>org.apache.commons.${commons.componentid}</commons.osgi.symbolicName>

+    <commons.osgi.export>org.apache.commons.*;version=${project.version};-noimport:=true</commons.osgi.export>

+    <commons.osgi.import>*</commons.osgi.import>

+    <commons.osgi.dynamicImport />

+    <commons.osgi.private />

+

+    <!-- location of any manifest file used by maven-jar-plugin -->

+    <commons.manifestfile>${project.build.directory}/osgi/MANIFEST.MF</commons.manifestfile>

+

+    <!--

+      Make the deployment protocol pluggable. This allows to switch to

+      other protocols like scpexe, which some users prefer over scp.

+    -->

+    <commons.deployment.protocol>scp</commons.deployment.protocol>

+

+    <!--

+      Encoding of Java source files: Make sure, that the compiler and

+      the javadoc generator use the right encoding. Subprojects may

+      overwrite this, if they are using another encoding.

+    -->

+    <commons.encoding>iso-8859-1</commons.encoding>

+    <commons.docEncoding>${commons.encoding}</commons.docEncoding>

+    <!-- Define encoding for filtering -->

+    <project.build.sourceEncoding>${commons.encoding}</project.build.sourceEncoding>

+    <project.reporting.outputEncoding>${commons.encoding}</project.reporting.outputEncoding>

+

+    <!-- Javadoc link to Java API.  Default is Java 1.7; components can override to other versions -->

+    <commons.javadoc.java.link>http://docs.oracle.com/javase/7/docs/api/</commons.javadoc.java.link>

+    <commons.javadoc.javaee.link>http://docs.oracle.com/javaee/6/api/</commons.javadoc.javaee.link>

+

+    <!-- build meta inf -->

+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>

+    <implementation.build>${scmBranch}@r${buildNumber}; ${maven.build.timestamp}</implementation.build>

+

+    <!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->

+    <minSeverity>info</minSeverity>

+

+    <!-- Allow surefire-report aggregation to be easily configured for multi-module projects -->

+    <commons.surefire-report.aggregate>false</commons.surefire-report.aggregate>

+

+    <!-- scm publish plugin configuration -->

+    <commons.site.cache>${user.home}/commons-sites</commons.site.cache>

+    <!-- value modules can override it -->

+    <commons.site.path>${project.artifactId}</commons.site.path>

+

+    <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${project.artifactId}</commons.scmPubUrl>

+    <commons.scmPubCheckoutDirectory>${commons.site.cache}/${commons.site.path}</commons.scmPubCheckoutDirectory>

+    <commons.scmPubServer>commons.site</commons.scmPubServer>

+

+    <sonar.host.url>https://analysis.apache.org/</sonar.host.url>

+

+  </properties>

+

+</project>

diff --git a/common/offline-m2/org/jetbrains/kotlin/NOTICE b/common/offline-m2/org/jetbrains/kotlin/NOTICE
new file mode 100644
index 0000000..5d912e4
--- /dev/null
+++ b/common/offline-m2/org/jetbrains/kotlin/NOTICE
@@ -0,0 +1,8 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Kotlin Compiler distribution.                 ==
+   =========================================================================
+
+   Kotlin Compiler
+   Copyright 2010-2015 JetBrains s.r.o and respective authors and developers
diff --git a/common/offline-m2/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-4584/kotlin-project-1.0.0-beta-4584.pom b/common/offline-m2/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-4584/kotlin-project-1.0.0-beta-4584.pom
new file mode 100644
index 0000000..4c545a7
--- /dev/null
+++ b/common/offline-m2/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-4584/kotlin-project-1.0.0-beta-4584.pom
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.jetbrains.kotlin</groupId>
+    <artifactId>kotlin-project</artifactId>
+    <version>1.0.0-beta-4584</version>
+    <packaging>pom</packaging>
+
+    <name>Kotlin</name>
+    <description>Kotlin is a statically typed programming language that compiles to JVM byte codes and JavaScript</description>
+    <url>http://kotlinlang.org/</url>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>A business-friendly OSS license</comments>
+        </license>
+    </licenses>
+
+    <scm>
+        <url>https://github.com/JetBrains/kotlin</url>
+        <connection>scm:git:https://github.com/JetBrains/kotlin.git</connection>
+        <developerConnection>scm:git:https://github.com/JetBrains/kotlin.git</developerConnection>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>JetBrains</id>
+            <name>JetBrains Team</name>
+            <organization>JetBrains</organization>
+            <organizationUrl>http://www.jetbrains.com</organizationUrl>
+        </developer>
+    </developers>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project-root>../../..</project-root>
+
+        <junit-version>4.11</junit-version>
+        <pegdown.version>1.1.0</pegdown.version>
+        <surefire-version>2.16</surefire-version>
+        <exec-maven-plugin.version>1.2.1</exec-maven-plugin.version>
+        <selenium.version>2.37.1</selenium.version>
+
+        <kotlin-dist>${project-root}/dist</kotlin-dist>
+        <kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
+
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
+    </properties>
+
+    <prerequisites>
+        <maven>3.0.2</maven>
+    </prerequisites>
+
+    <distributionManagement>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+        <snapshotRepository>
+            <id>sonatype-nexus-staging</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <modules>
+        <module>tools/kotlin-compiler</module>
+        <module>tools/kotlin-compiler-embeddable</module>
+        <module>tools/kotlin-jdk-annotations</module>
+        <module>tools/kotlin-android-sdk-annotations</module>
+        <module>tools/kotlin-maven-plugin</module>
+
+        <module>tools/runtime</module>
+        <module>stdlib</module>
+        <module>tools/kotlin-reflect</module>
+        <module>tools/kotlin-osgi-bundle</module>
+
+        <!--NB! kotlin-js-library should be built before kotlin-gradle-plugin-->
+        <!--because it is used in tests but cannot be added as test-dependency-->
+        <!--(kotlin-gradle-plugin module will be recognized as kotlin-js module)-->
+        <module>tools/idl2k</module>
+        <module>tools/kotlin-js-library</module>
+        <module>tools/kotlin-annotation-processing</module>
+        <module>examples/annotation-processor-example</module>
+        <module>tools/kotlin-gradle-plugin</module>
+        <module>tools/kotlin-gradle-plugin-core</module>
+        <module>tools/kotlin-gradle-plugin-api</module>
+        <module>tools/kotlin-android-extensions</module>
+        <module>tools/kotlin-maven-plugin-test</module>
+        <module>tools/kotlin-js-tests</module>
+        <module>tools/kotlin-js-tests-junit</module>
+
+        <module>kotlin.test</module>
+
+        <module>examples/kotlin-java-example</module>
+        <module>examples/js-example</module>
+        <module>examples/kotlin-js-library-example</module>
+        <module>examples/browser-example</module>
+        <module>examples/browser-example-with-library</module>
+        <module>examples/kotlin-gradle-subplugin-example</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>${maven.compiler.source}</source>
+                        <target>${maven.compiler.target}</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.1.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.9</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.7</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.7</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire-version}</version>
+                <configuration>
+                    <forkMode>once</forkMode>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                    <useManifestOnlyJar>false</useManifestOnlyJar>
+                    <failIfNoTests>false</failIfNoTests>
+                    <includes>
+                        <include>**/*Test.*</include>
+                    </includes>
+                    <excludes>
+                    </excludes>
+                    <systemProperties>
+                        <project.version>${project.version}</project.version>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-empty-javadoc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${highest-basedir}/lib/empty-javadoc.jar</file>
+                                    <type>jar</type>
+                                    <classifier>javadoc</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.commonjava.maven.plugins</groupId>
+                <artifactId>directory-maven-plugin</artifactId>
+                <version>0.1</version>
+                <executions>
+                    <execution>
+                        <id>directories</id>
+                        <goals>
+                            <goal>highest-basedir</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <property>highest-basedir</property>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>sign-artifacts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.4</version>
+                        <configuration>
+                            <passphrase>${kotlin.key.passphrase}</passphrase>
+                            <keyname>${kotlin.key.name}</keyname>
+                            <homedir>${highest-basedir}/.gnupg</homedir>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/common/offline-m2/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/kotlin-runtime-1.0.0-beta-4584.jar b/common/offline-m2/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/kotlin-runtime-1.0.0-beta-4584.jar
new file mode 100644
index 0000000..24e6031
--- /dev/null
+++ b/common/offline-m2/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/kotlin-runtime-1.0.0-beta-4584.jar
Binary files differ
diff --git a/common/offline-m2/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/kotlin-runtime-1.0.0-beta-4584.pom b/common/offline-m2/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/kotlin-runtime-1.0.0-beta-4584.pom
new file mode 100644
index 0000000..46f4413
--- /dev/null
+++ b/common/offline-m2/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/kotlin-runtime-1.0.0-beta-4584.pom
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
+        <version>1.0.0-beta-4584</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>kotlin-runtime</artifactId>
+    <packaging>jar</packaging>
+
+    <build>
+        <sourceDirectory>target/copied-sources</sourceDirectory>
+
+        <resources>
+            <resource>
+                <directory>${basedir}/../../../dist/builtins</directory>
+                <includes>
+                    <include>**/*.kotlin_*</include>
+                </includes>
+                <excludes>
+                    <exclude>kotlin/internal/**/*</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+
+                <executions>
+                    <execution>
+                        <id>copy-sources</id>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <target>
+                                <delete dir="${basedir}/target/copied-sources" failonerror="false"/>
+                                <copy todir="${basedir}/target/copied-sources">
+                                    <fileset dir="${basedir}/../../../core/builtins/src"/>
+                                    <fileset dir="${basedir}/../../../core/runtime.jvm/src"/>
+                                </copy>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>attach-empty-javadoc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <skipAttach>true</skipAttach>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/common/offline-m2/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/kotlin-stdlib-1.0.0-beta-4584.jar b/common/offline-m2/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/kotlin-stdlib-1.0.0-beta-4584.jar
new file mode 100644
index 0000000..5221e0c
--- /dev/null
+++ b/common/offline-m2/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/kotlin-stdlib-1.0.0-beta-4584.jar
Binary files differ
diff --git a/common/offline-m2/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/kotlin-stdlib-1.0.0-beta-4584.pom b/common/offline-m2/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/kotlin-stdlib-1.0.0-beta-4584.pom
new file mode 100644
index 0000000..737b419
--- /dev/null
+++ b/common/offline-m2/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/kotlin-stdlib-1.0.0-beta-4584.pom
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
+        <version>1.0.0-beta-4584</version>
+    </parent>
+
+    <artifactId>kotlin-stdlib</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-runtime</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+
+        <plugins>
+             <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                 <configuration>
+                     <args>
+                         <arg>-Xmultifile-facades-open</arg>
+                     </args>
+                 </configuration>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>