[Git][java-team/guava-libraries][master] Build the guava-testlib module (required by Bazel)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / guava-libraries


Commits:
976ed59b by Emmanuel Bourg at 2020-05-10T23:26:41+02:00
Build the guava-testlib module (required by Bazel)

- - - - -


9 changed files:

- debian/changelog
- debian/control
- debian/libguava-java.poms
- debian/maven.ignoreRules
- debian/maven.properties
- debian/maven.rules
- − debian/patches/02-remove-source-in-javadoc.patch
- + debian/patches/24-module-dependency.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+guava-libraries (29.0-2) unstable; urgency=medium
+
+  * Build the guava-testlib module (required by Bazel)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 10 May 2020 22:13:01 +0200
+
 guava-libraries (29.0-1) unstable; urgency=medium
 
   * Upload to unstable


=====================================
debian/control
=====================================
@@ -8,12 +8,14 @@ Uploaders:
 Build-Depends:
  debhelper-compat (= 12),
  default-jdk,
+ junit4,
  libanimal-sniffer-java,
  libatinject-jsr330-api-java,
  libjsr305-java,
  libmaven-bundle-plugin-java,
  libmaven-dependency-plugin-java,
  libmaven-javadoc-plugin-java,
+ libtruth-java,
  maven-debian-helper,
  zip
 Standards-Version: 4.5.0
@@ -36,6 +38,19 @@ Description: Suite of Google common libraries for Java
  Guava has two code dependencies - javax.annotation per the JSR-305 spec
  and javax.inject per the JSR-330 spec.
 
+Package: libguava-testlib-java
+Architecture: all
+Depends:
+ libguava-java,
+ junit4,
+ ${misc:Depends}
+Description: Google Testing Libraries for Java
+ Guava is a suite of core and expanded libraries that include
+ utility classes, google's collections, io classes, concurrency
+ support and other features.
+ .
+ Guava testlib is a set of Java classes for more convenient unit testing..
+
 Package: libguava-java-doc
 Architecture: all
 Section: doc


=====================================
debian/libguava-java.poms
=====================================
@@ -29,5 +29,5 @@ pom.xml --no-parent --has-package-version
 guava/pom.xml --has-package-version --java-lib
 guava-bom/pom.xml --ignore
 guava-gwt/pom.xml --ignore
-guava-testlib/pom.xml --ignore
+guava-testlib/pom.xml --has-package-version --java-lib --package=libguava-testlib-java
 guava-tests/pom.xml --ignore


=====================================
debian/maven.ignoreRules
=====================================
@@ -1,13 +1,11 @@
 
 com.google.guava guava-gwt jar * * *
-com.google.guava guava-testlib jar * * *
 com.google.guava guava-tests jar * * *
 com.google.guava failureaccess * * * *
 com.google.guava listenablefuture * * * *
 com.google.caliper caliper * * * *
 com.google.errorprone error_prone_annotations * * * *
 com.google.j2objc j2objc-annotations * * * *
-junit junit * * * *
 org.apache.maven.plugins maven-gpg-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
 org.checkerframework checker-qual * * * *
@@ -15,4 +13,3 @@ org.codehaus.mojo animal-sniffer-maven-plugin * * * *
 org.easymock easymock * * * *
 org.mockito mockito-core * * * *
 org.sonatype.oss oss-parent * * * *
-org.truth0 truth * * * *


=====================================
debian/maven.properties
=====================================
@@ -1,2 +1,4 @@
 
 project.build.sourceEncoding=UTF-8
+maven.test.skip=true
+linksource=false


=====================================
debian/maven.rules
=====================================
@@ -2,3 +2,4 @@
 com.google.guava guava-parent pom s/.*/debian/ * *
 com.google.guava guava bundle s/.*/debian/ * *
 s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * *
+junit junit * s/.*/4.x/ * *


=====================================
debian/patches/02-remove-source-in-javadoc.patch deleted
=====================================
@@ -1,13 +0,0 @@
-Description: Removes the browsable source files generated with the Javadoc
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/guava/pom.xml
-+++ b/guava/pom.xml
-@@ -183,6 +183,7 @@
-               <location>${project.basedir}/javadoc-link/checker-framework</location>
-             </offlineLink>
-           </offlineLinks>
-+          <linksource>false</linksource>
-           <links>
-             <link>https://errorprone.info/api/latest/</link>
-           </links>


=====================================
debian/patches/24-module-dependency.patch
=====================================
@@ -0,0 +1,13 @@
+Description: Adjust the type of the guava dependency in the guava-testlib module
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/guava-testlib/pom.xml
++++ b/guava-testlib/pom.xml
+@@ -34,6 +34,7 @@
+       <groupId>${project.groupId}</groupId>
+       <artifactId>guava</artifactId>
+       <version>${project.version}</version>
++      <type>bundle</type>
+     </dependency>
+     <dependency>
+       <groupId>junit</groupId>


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-02-remove-source-in-javadoc.patch
 04-source-encoding.patch
 06-preserve-pre-guava18-methods.patch
 08-preserve-enums-methods.patch
@@ -17,3 +16,4 @@
 21-preserve-tostringhelper.patch
 22-preserve-futures-methods.patch
 23-java8-compatibility.patch
+24-module-dependency.patch



View it on GitLab: https://salsa.debian.org/java-team/guava-libraries/-/commit/976ed59b778f58d80e1bb44155761bf2765f4346

-- 
View it on GitLab: https://salsa.debian.org/java-team/guava-libraries/-/commit/976ed59b778f58d80e1bb44155761bf2765f4346
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200510/ac65d1ac/attachment.html>