The following commit has been merged in the master branch:
commit b6bf6eba8baf89cd4040c23592716975e4d30f1f
Author: Damien Raude-Morvan <draz...@debian.org>
Date:   Wed Feb 22 23:10:00 2012 +0100

    Update pom.

diff --git a/debian/pom.xml b/debian/pom.xml
index d016fe2..14709e9 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -3,68 +3,35 @@
   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>com.google</groupId>
-    <artifactId>google</artifactId>
-    <version>5</version>
+    <groupId>com.google.guava</groupId>
+    <artifactId>guava-parent</artifactId>
+    <version>11.0.2</version>
   </parent>
-  <groupId>com.google.guava</groupId>
   <artifactId>guava</artifactId>
-  <version>r09</version>
-  <packaging>jar</packaging>
-  <name>Guava (Google Common Libraries)</name>
+  <name>Guava: Google Core Libraries for Java</name>
   <description>
-    Guava is a suite of core and expanded libraries that include 
-    utility classes, google's collections, io classes, and much 
+    Guava is a suite of core and expanded libraries that include
+    utility classes, google's collections, io classes, and much
     much more.
-    
+
     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>
-  <url>http://code.google.com/p/guava-libraries</url>
-  <issueManagement>
-       <system>code.google.com</system>
-       <url>http://code.google.com/p/guava-libraries/issues</url>
-  </issueManagement>
-  <inceptionYear>2010</inceptionYear>
-  <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>
-    </license>
-  </licenses>
-  <prerequisites>
-    <maven>2.0.9</maven>
-  </prerequisites>
-  <scm>
-    
<connection>scm:svn:http://guava-libraries.googlecode.com/svn/trunk/</connection>
-    
<developerConnection>scm:svn:https://guava-libraries.googlecode.com/svn/trunk/</developerConnection>
-    <url>http://code.google.com/p/guava-libraries/source/browse</url>
-  </scm>
-  <developers>
-    <developer>
-      <id>kevinb9n</id>
-      <name>Kevin Bourillion</name>
-      <email>kev...@google.com</email>
-      <organization>Google</organization>
-      <organizationUrl>http://www.google.com</organizationUrl>
-      <roles>
-        <role>owner</role>
-        <role>developer</role>
-      </roles>
-      <timezone>-8</timezone>
-    </developer>
-  </developers>
   <dependencies>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>1.3.7</version>
-      <optional>true</optional>
+      <version>1.3.9</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>guava-bootstrap</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -78,14 +45,107 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
         <configuration>
           <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>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.3</version>
+        <executions>
+          <execution>
+            <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>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <version>1.7</version>
+        <configuration>
+          <signature>
+            <groupId>org.codehaus.mojo.signature</groupId>
+            <artifactId>java15-sun</artifactId>
+            <version>1.0</version>
+          </signature>
+        </configuration>
+        <executions>
+          <execution>
+            <id>check-java15</id>
+            <phase>test</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.8</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <docencoding>UTF-8</docencoding>
+          <charset>UTF-8</charset>
+          <additionalparam>-XDignore.symbol.file</additionalparam>
+          
<excludePackageNames>com.google.common.base.internal</excludePackageNames>
+          <linksource>true</linksource>
+          <links>
+            <link>http://jsr-305.googlecode.com/svn/trunk/javadoc</link>
+          </links>
         </configuration>
+        <executions>
+          <execution>
+            <id>generate-javadoc</id>
+            <phase>site</phase>
+            <goals><goal>javadoc</goal></goals>
+          </execution>
+          <execution>
+            <id>generate-jdiff</id>
+            <phase>site</phase>
+            <goals><goal>javadoc</goal></goals>
+            <configuration>
+              <doclet>jdiff.JDiff</doclet>
+              <docletPath>${project.basedir}/lib/jdiff.jar</docletPath>
+              <additionalparam>
+                -XDignore.symbol.file -apiname 'Guava ${project.version}'
+              </additionalparam>
+              <useStandardDocletOptions>false</useStandardDocletOptions>
+              
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
+              <destDir>jdiff</destDir>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
     <finalName>${project.artifactId}-${project.version}</finalName>
     <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test-disabled</testSourceDirectory>
+    <testSourceDirectory>disabled</testSourceDirectory>
   </build>
 </project>
diff --git a/debian/rules b/debian/rules
index 1012b4b..3f1c350 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,5 +24,5 @@ get-orig-source:
        -uscan --download-current-version --force-download --rename
 
 get-orig-pom:
-       wget 
http://guava-libraries.googlecode.com/svn/tags/release$(VERSION)/pom.xml \
-               -O debian/pom.xml
+       wget 
http://repo1.maven.org/maven2/com/google/guava/guava/$(VERSION)/guava-$(VERSION).pom
 \
+               -O debian/pom.xml -U Debian

-- 
guava-libraries: suite of Google Common Libraries for Java 5.0

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to