[SCM] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, master, updated. debian/11.0.2-2-9-gf91bdad
Jakub Adam
jakub.adam at ktknet.cz
Mon Dec 31 21:21:00 UTC 2012
The following commit has been merged in the master branch:
commit cf3c3de35060c0d27a79b17bca6d7945d1a1e34b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Mon Dec 31 21:46:27 2012 +0100
Install using correct pom.xml for this upstream version
diff --git a/debian/changelog b/debian/changelog
index 3fa99c0..d0d52a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+guava-libraries (13.0.1-2) UNRELEASED; urgency=low
+
+ * Install using correct pom.xml for this upstream version.
+ - fixes old version number in filenames of the created artifacts.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz> Mon, 31 Dec 2012 21:43:06 +0100
+
guava-libraries (13.0.1-1) experimental; urgency=low
[ tony mancill ]
diff --git a/debian/pom.xml b/debian/pom.xml
index 14709e9..acb6b48 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.guava</groupId>
<artifactId>guava-parent</artifactId>
- <version>11.0.2</version>
+ <version>13.0.1</version>
</parent>
<artifactId>guava</artifactId>
<name>Guava: Google Core Libraries for Java</name>
@@ -14,11 +14,7 @@
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,
+ Guava has only one code dependency - javax.annotation,
per the JSR-305 spec.
</description>
<dependencies>
@@ -26,61 +22,70 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<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>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</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>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</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>
+ <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,
+ sun.misc.*;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
</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>
+ <phase>post-integration-test</phase>
+ <goals><goal>jar</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>attach-docs</id>
+ <phase>post-integration-test</phase>
+ <goals><goal>jar</goal></goals>
</execution>
</executions>
</plugin>
@@ -91,13 +96,13 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java15-sun</artifactId>
+ <artifactId>java16-sun</artifactId>
<version>1.0</version>
</signature>
</configuration>
<executions>
<execution>
- <id>check-java15</id>
+ <id>check-java16-sun</id>
<phase>test</phase>
<goals>
<goal>check</goal>
@@ -122,12 +127,12 @@
</configuration>
<executions>
<execution>
- <id>generate-javadoc</id>
+ <id>generate-javadoc-site-report</id>
<phase>site</phase>
<goals><goal>javadoc</goal></goals>
</execution>
<execution>
- <id>generate-jdiff</id>
+ <id>generate-jdiff-site-report</id>
<phase>site</phase>
<goals><goal>javadoc</goal></goals>
<configuration>
--
guava-libraries: suite of Google Common Libraries for Java 5.0
More information about the pkg-java-commits
mailing list