Fix issue 720 -- minor build fixes, from the issue:

* Add macros to append no_aop to the Bundle-(Symbolic)Name to help disambiguate
these bundles in OSGi
* Fix some broken links in the Maven POM
(The API version was already incremented.)

Patch from Stuart McCulloch, thanks Stuart!
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=57798649

1 files changed, 4 insertions, 4 deletions

diff --git a/pom.xml b/pom.xml
index 23aaf7c6..08058390 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,9 +61,9 @@ See the Apache License Version 2.0 for the specific language governing permissio
   </mailingLists>
 
   <scm>
-    <connection>scm:svn:http://google-guice.googlecode.com/svn/trunk</connection>
-    <developerConnection>scm:svn:https://google-guice.googlecode.com/svn/trunk</developerConnection>
-    <url>http://code.google.com/p/google-guice/source/browse</url>
+    <connection>scm:git:https://code.google.com/p/google-guice/</connection>
+    <developerConnection>scm:git:https://code.google.com/p/google-guice/</developerConnection>
+    <url>https://code.google.com/p/google-guice/</url>
   </scm>
 
   <issueManagement>
@@ -73,7 +73,7 @@ See the Apache License Version 2.0 for the specific language governing permissio
 
   <ciManagement>
     <system>Hudson</system>
-    <url>https://grid.sonatype.org/ci/job/Google-Guice/</url>
+    <url>https://grid.sonatype.org/ci/job/google-guice/</url>
   </ciManagement>
 
   <licenses>