1 files changed, 44 insertions, 49 deletions
diff --git a/guava/pom.xml b/guava/pom.xml
index 32e6b76..14709e9 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -5,87 +5,82 @@
   <parent>
     <groupId>com.google.guava</groupId>
     <artifactId>guava-parent</artifactId>
-    <version>14.0.1</version>
+    <version>11.0.2</version>
   </parent>
   <artifactId>guava</artifactId>
   <name>Guava: Google Core Libraries for Java</name>
-  <packaging>bundle</packaging>
   <description>
     Guava is a suite of core and expanded libraries that include
     utility classes, google's collections, io classes, and much
     much more.
 
-    Guava has two code dependencies - javax.annotation
-    per the JSR-305 spec and javax.inject per the JSR-330 spec.
+    This project is a complete packaging of all the Guava libraries
+    into a single jar.  Individual portions of Guava can be used
+    by downloading the appropriate module and its dependencies.
+
+    Guava (complete) has only one code dependency - javax.annotation,
+    per the JSR-305 spec.
   </description>
   <dependencies>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
       <version>1.3.9</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>guava-bootstrap</artifactId>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
-        <extensions>true</extensions>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <instructions>
-            <Export-Package>!com.google.common.base.internal,com.google.common.*</Export-Package>
-            <Import-Package>
-              javax.annotation;resolution:=optional,
-              javax.inject;resolution:=optional,
-              sun.misc.*;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.5</source>
+          <target>1.5</target>
+          <!-- Prepend guava-bootstrap to avoid an API incompatibility between JDK5 and JDK6 -->
+          <compilerArgument>-Xbootclasspath/p:${project.build.directory}/dependency/guava-bootstrap-${project.version}.jar</compilerArgument>
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.3</version>
         <executions>
           <execution>
-            <id>attach-sources</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
+            <id>prep-guava-bootstrap</id>
+            <phase>process-sources</phase>
+            <goals><goal>copy-dependencies</goal></goals>
+            <configuration>
+              <includeArtifactIds>guava-bootstrap</includeArtifactIds>
+              <excludeTransitive>true</excludeTransitive>
+              <includeScope>provided</includeScope>
+            </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
         <executions>
           <execution>
-            <id>attach-docs</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
           </execution>
         </executions>
       </plugin>
@@ -96,13 +91,13 @@
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java16-sun</artifactId>
+            <artifactId>java15-sun</artifactId>
             <version>1.0</version>
           </signature>
         </configuration>
         <executions>
           <execution>
-            <id>check-java16-sun</id>
+            <id>check-java15</id>
             <phase>test</phase>
             <goals>
               <goal>check</goal>
@@ -127,12 +122,12 @@
         </configuration>
         <executions>
           <execution>
-            <id>generate-javadoc-site-report</id>
+            <id>generate-javadoc</id>
             <phase>site</phase>
             <goals><goal>javadoc</goal></goals>
           </execution>
           <execution>
-            <id>generate-jdiff-site-report</id>
+            <id>generate-jdiff</id>
             <phase>site</phase>
             <goals><goal>javadoc</goal></goals>
             <configuration>