diff --git a/core/pom.xml b/core/pom.xml
index c770a102f8..a898d4c2a4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -54,12 +54,12 @@
         <dependency>
             <groupId>com.google.code.guice</groupId>
             <artifactId>guice</artifactId>
-            <version>2.0-r936</version>
+            <version>2.0-r937</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.guice</groupId>
             <artifactId>guice-assistedinject</artifactId>
-            <version>2.0-r936</version>
+            <version>2.0-r937</version>
         </dependency>
         <dependency>
             <groupId>com.google.collections</groupId>
diff --git a/repo/com/google/appengine/appengine-api/maven-metadata-local.xml b/repo/com/google/appengine/appengine-api/maven-metadata-local.xml
deleted file mode 100644
index a73c89f739..0000000000
--- a/repo/com/google/appengine/appengine-api/maven-metadata-local.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
-
-    ====================================================================
-    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.
-    ====================================================================
-
--->
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>com.google.appengine</groupId>
-  <artifactId>appengine-api</artifactId>
-  <version>1.2.0</version>
-  <versioning>
-    <versions>
-      <version>1.2.0</version>
-    </versions>
-    <lastUpdated>20090430184532</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar
new file mode 100644
index 0000000000..2c31058a36
Binary files /dev/null and b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar differ
diff --git a/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar.md5 b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar.md5
new file mode 100644
index 0000000000..b560aded48
--- /dev/null
+++ b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar.md5
@@ -0,0 +1 @@
+4f95d594853fa0823d070bf974d33a5f
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar.sha1 b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar.sha1
new file mode 100644
index 0000000000..7f6d74d9cd
--- /dev/null
+++ b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.jar.sha1
@@ -0,0 +1 @@
+5e6f9c7268be63a46e15ff443b9e6d39c5b9cc33
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom
new file mode 100644
index 0000000000..e732bc522b
--- /dev/null
+++ b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom
@@ -0,0 +1,9 @@
+<?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>com.google.code.guice</groupId>
+  <artifactId>guice-assistedinject</artifactId>
+  <version>2.0-r937</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom.md5 b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom.md5
new file mode 100644
index 0000000000..a690a94a86
--- /dev/null
+++ b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom.md5
@@ -0,0 +1 @@
+03834b15c5456ace448fb990c27fb492
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom.sha1 b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom.sha1
new file mode 100644
index 0000000000..c5c2657ab4
--- /dev/null
+++ b/repo/com/google/code/guice/guice-assistedinject/2.0-r937/guice-assistedinject-2.0-r937.pom.sha1
@@ -0,0 +1 @@
+75662414aa14be8c23bf2c235e355446af222eff
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-assistedinject/maven-metadata-local.xml b/repo/com/google/code/guice/guice-assistedinject/maven-metadata-local.xml
deleted file mode 100644
index a04703a131..0000000000
--- a/repo/com/google/code/guice/guice-assistedinject/maven-metadata-local.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
-
-    ====================================================================
-    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.
-    ====================================================================
-
--->
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>com.google.code.guice</groupId>
-  <artifactId>guice-assistedinject</artifactId>
-  <version>2.0-r936</version>
-  <versioning>
-    <versions>
-      <version>2.0-r936</version>
-    </versions>
-    <lastUpdated>20090428093101</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar
new file mode 100644
index 0000000000..83274b06ed
Binary files /dev/null and b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar differ
diff --git a/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar.md5 b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar.md5
new file mode 100644
index 0000000000..cfd0c3f02f
--- /dev/null
+++ b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar.md5
@@ -0,0 +1 @@
+847dc79207b4df8e6e055331e099556b
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar.sha1 b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar.sha1
new file mode 100644
index 0000000000..61cb2c8e67
--- /dev/null
+++ b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.jar.sha1
@@ -0,0 +1 @@
+336bda74c30720784227bcd414deb0d97abb7a70
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom
new file mode 100644
index 0000000000..563b6537ac
--- /dev/null
+++ b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom
@@ -0,0 +1,9 @@
+<?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>com.google.code.guice</groupId>
+  <artifactId>guice-multibindings</artifactId>
+  <version>2.0-r937</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom.md5 b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom.md5
new file mode 100644
index 0000000000..9c1e9e06d2
--- /dev/null
+++ b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom.md5
@@ -0,0 +1 @@
+3d2251f095b34846d82d7d68278e430f
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom.sha1 b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom.sha1
new file mode 100644
index 0000000000..794443297a
--- /dev/null
+++ b/repo/com/google/code/guice/guice-multibindings/2.0-r937/guice-multibindings-2.0-r937.pom.sha1
@@ -0,0 +1 @@
+dcccab423de140526a2449622e75693146fd82b3
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-multibindings/maven-metadata-local.xml b/repo/com/google/code/guice/guice-multibindings/maven-metadata-local.xml
deleted file mode 100644
index e6d532eab1..0000000000
--- a/repo/com/google/code/guice/guice-multibindings/maven-metadata-local.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
-
-    ====================================================================
-    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.
-    ====================================================================
-
--->
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>com.google.code.guice</groupId>
-  <artifactId>guice-multibindings</artifactId>
-  <version>2.0-r936</version>
-  <versioning>
-    <versions>
-      <version>2.0-r936</version>
-    </versions>
-    <lastUpdated>20090428093111</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar
new file mode 100644
index 0000000000..4c07c1468f
Binary files /dev/null and b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar differ
diff --git a/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar.md5 b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar.md5
new file mode 100644
index 0000000000..5bcffa8350
--- /dev/null
+++ b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar.md5
@@ -0,0 +1 @@
+799fb815eb9095c90e08b7b0f6b36d9b
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar.sha1 b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar.sha1
new file mode 100644
index 0000000000..de63acfa09
--- /dev/null
+++ b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.jar.sha1
@@ -0,0 +1 @@
+12aa6ceafa7e526f60ae2fedddea39204c9a747c
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom
new file mode 100644
index 0000000000..370ac7acbc
--- /dev/null
+++ b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom
@@ -0,0 +1,9 @@
+<?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>com.google.code.guice</groupId>
+  <artifactId>guice-servlet</artifactId>
+  <version>2.0-r937</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom.md5 b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom.md5
new file mode 100644
index 0000000000..798fc8d948
--- /dev/null
+++ b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom.md5
@@ -0,0 +1 @@
+7e41bbafb53f6d691542853f16af9b2a
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom.sha1 b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom.sha1
new file mode 100644
index 0000000000..bb72a95bbe
--- /dev/null
+++ b/repo/com/google/code/guice/guice-servlet/2.0-r937/guice-servlet-2.0-r937.pom.sha1
@@ -0,0 +1 @@
+62965b22fe946bf089830377c112c445df562a9f
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice-servlet/maven-metadata-local.xml b/repo/com/google/code/guice/guice-servlet/maven-metadata-local.xml
deleted file mode 100644
index a422bf4438..0000000000
--- a/repo/com/google/code/guice/guice-servlet/maven-metadata-local.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
-
-    ====================================================================
-    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.
-    ====================================================================
-
--->
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>com.google.code.guice</groupId>
-  <artifactId>guice-servlet</artifactId>
-  <version>2.0-r936</version>
-  <versioning>
-    <versions>
-      <version>2.0-r936</version>
-    </versions>
-    <lastUpdated>20090428093107</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar
new file mode 100644
index 0000000000..bae4e6dac3
Binary files /dev/null and b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar differ
diff --git a/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar.md5 b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar.md5
new file mode 100644
index 0000000000..929b0f38c1
--- /dev/null
+++ b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar.md5
@@ -0,0 +1 @@
+fb8dcb2e96297bfe4a0173d547099f00
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar.sha1 b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar.sha1
new file mode 100644
index 0000000000..03abbe127b
--- /dev/null
+++ b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.jar.sha1
@@ -0,0 +1 @@
+17c82541d56702d52044dde17bcb31da7dd08c2a
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom
new file mode 100644
index 0000000000..0b5153465f
--- /dev/null
+++ b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom
@@ -0,0 +1,9 @@
+<?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>com.google.code.guice</groupId>
+  <artifactId>guice</artifactId>
+  <version>2.0-r937</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom.md5 b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom.md5
new file mode 100644
index 0000000000..9ccbd3db9a
--- /dev/null
+++ b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom.md5
@@ -0,0 +1 @@
+66a735611dc394cff79478309db06c7d
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom.sha1 b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom.sha1
new file mode 100644
index 0000000000..400b1fd6a2
--- /dev/null
+++ b/repo/com/google/code/guice/guice/2.0-r937/guice-2.0-r937.pom.sha1
@@ -0,0 +1 @@
+5a7298288253fd9e9392c6d9cb07a26a3b5aaa42
\ No newline at end of file
diff --git a/repo/com/google/code/guice/guice/maven-metadata-local.xml b/repo/com/google/code/guice/guice/maven-metadata-local.xml
deleted file mode 100644
index bab56ada4f..0000000000
--- a/repo/com/google/code/guice/guice/maven-metadata-local.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
-
-    ====================================================================
-    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.
-    ====================================================================
-
--->
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>com.google.code.guice</groupId>
-  <artifactId>guice</artifactId>
-  <version>2.0-r936</version>
-  <versioning>
-    <versions>
-      <version>2.0-r936</version>
-    </versions>
-    <lastUpdated>20090428093104</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/repo/org/jclouds/jclouds-core/1.0-SNAPSHOT/maven-metadata.xml b/repo/org/jclouds/jclouds-core/1.0-SNAPSHOT/maven-metadata.xml
index 741b6c7710..7a559382af 100644
--- a/repo/org/jclouds/jclouds-core/1.0-SNAPSHOT/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-core/1.0-SNAPSHOT/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-core/maven-metadata.xml b/repo/org/jclouds/jclouds-core/maven-metadata.xml
index d0db810b77..3f763c1c8d 100644
--- a/repo/org/jclouds/jclouds-core/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-core/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-gae/1.0-SNAPSHOT/maven-metadata.xml b/repo/org/jclouds/jclouds-gae/1.0-SNAPSHOT/maven-metadata.xml
index 56dd5aedf3..5c7e3ff892 100644
--- a/repo/org/jclouds/jclouds-gae/1.0-SNAPSHOT/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-gae/1.0-SNAPSHOT/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-gae/maven-metadata.xml b/repo/org/jclouds/jclouds-gae/maven-metadata.xml
index e5154c35af..6079098e4b 100644
--- a/repo/org/jclouds/jclouds-gae/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-gae/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-httpnio/1.0-SNAPSHOT/maven-metadata.xml b/repo/org/jclouds/jclouds-httpnio/1.0-SNAPSHOT/maven-metadata.xml
index e9e5328537..20d7072ade 100644
--- a/repo/org/jclouds/jclouds-httpnio/1.0-SNAPSHOT/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-httpnio/1.0-SNAPSHOT/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-httpnio/maven-metadata.xml b/repo/org/jclouds/jclouds-httpnio/maven-metadata.xml
index 4316d51f08..1a1dc6823e 100644
--- a/repo/org/jclouds/jclouds-httpnio/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-httpnio/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-project/1.0-SNAPSHOT/maven-metadata.xml b/repo/org/jclouds/jclouds-project/1.0-SNAPSHOT/maven-metadata.xml
index 5d1ecdc4e7..7464a08011 100644
--- a/repo/org/jclouds/jclouds-project/1.0-SNAPSHOT/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-project/1.0-SNAPSHOT/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-project/maven-metadata.xml b/repo/org/jclouds/jclouds-project/maven-metadata.xml
index e9240342d8..c98f954e03 100644
--- a/repo/org/jclouds/jclouds-project/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-project/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-s3/1.0-SNAPSHOT/maven-metadata.xml b/repo/org/jclouds/jclouds-s3/1.0-SNAPSHOT/maven-metadata.xml
index 6a39d8dd0c..f65b072bfc 100644
--- a/repo/org/jclouds/jclouds-s3/1.0-SNAPSHOT/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-s3/1.0-SNAPSHOT/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-s3/maven-metadata.xml b/repo/org/jclouds/jclouds-s3/maven-metadata.xml
index 51506d01ea..2ab16b67ae 100644
--- a/repo/org/jclouds/jclouds-s3/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-s3/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-s3nio/1.0-SNAPSHOT/maven-metadata.xml b/repo/org/jclouds/jclouds-s3nio/1.0-SNAPSHOT/maven-metadata.xml
index 47c7f45d9c..3592fffb75 100644
--- a/repo/org/jclouds/jclouds-s3nio/1.0-SNAPSHOT/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-s3nio/1.0-SNAPSHOT/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/jclouds/jclouds-s3nio/maven-metadata.xml b/repo/org/jclouds/jclouds-s3nio/maven-metadata.xml
index 59548e7d88..3ba4ec8a4f 100644
--- a/repo/org/jclouds/jclouds-s3nio/maven-metadata.xml
+++ b/repo/org/jclouds/jclouds-s3nio/maven-metadata.xml
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
 <metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <groupId>org.jclouds</groupId>
diff --git a/repo/org/testng/testng/maven-metadata-local.xml b/repo/org/testng/testng/maven-metadata-local.xml
deleted file mode 100644
index 765375268e..0000000000
--- a/repo/org/testng/testng/maven-metadata-local.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-    Copyright (C) 2009 Adrian Cole <adriancole@jclouds.org>
-
-    ====================================================================
-    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.
-    ====================================================================
-
--->
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>org.testng</groupId>
-  <artifactId>testng</artifactId>
-  <version>5.9</version>
-  <versioning>
-    <versions>
-      <version>5.9</version>
-    </versions>
-    <lastUpdated>20090501171448</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/samples/googleappengine/pom.xml b/samples/googleappengine/pom.xml
index 7fc785c661..b6371e5852 100644
--- a/samples/googleappengine/pom.xml
+++ b/samples/googleappengine/pom.xml
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>com.google.code.guice</groupId>
             <artifactId>guice-servlet</artifactId>
-            <version>2.0-r936</version>
+            <version>2.0-r937</version>
         </dependency>
         <dependency>
             <artifactId>standard</artifactId>