[Git][java-team/google-auto-value-java][master] Refresh packaging

[Olek Wojnar]

Olek Wojnar pushed to branch master at Debian Java Maintainers / google-auto-value-java


Commits:
59a3109b by Olek Wojnar at 2020-06-16T17:36:44-04:00
Refresh packaging

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/maven.ignoreRules
- debian/maven.properties
- + debian/maven.rules
- − debian/patches/remove-errorprone.patch
- debian/patches/series
- debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+google-auto-value-java (1.7.2-2) unstable; urgency=high
+
+  * Refresh packaging and rebuild against new auto-service
+  * Remove error-prone patch since that package is now in Debian
+
+ -- Olek Wojnar <olek at debian.org>  Tue, 16 Jun 2020 15:54:40 -0400
+
 google-auto-value-java (1.7.2-1) unstable; urgency=medium
 
   * Initial release (Closes: #960989)


=====================================
debian/control
=====================================
@@ -2,10 +2,11 @@ Source: google-auto-value-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>,
-           Olek Wojnar <olek at debian.org>,
+Uploaders: Olek Wojnar <olek at debian.org>,
+           Andreas Tille <tille at debian.org>,
 Build-Depends: debhelper-compat (= 13),
                default-jdk,
+               liberror-prone-java,
                libescapevelocity-java,
                libgoogle-auto-common-java,
                libgoogle-auto-service-java,


=====================================
debian/maven.ignoreRules
=====================================
@@ -1,4 +1,3 @@
-com.google.errorprone error_prone_annotations
 com.google.guava guava-gwt
 com.google.guava guava-testlib
 com.google.gwt gwt


=====================================
debian/maven.properties
=====================================
@@ -1,3 +1,7 @@
 project.build.sourceEncoding=UTF-8
 maven.test.skip=true
+maven.compiler.source=1.8
+maven.compiler.target=1.8
 maven.compiler.verbose=true
+org.slf4j.simpleLogger.defaultLogLevel=debug
+trimStackTrace=false


=====================================
debian/maven.rules
=====================================
@@ -0,0 +1 @@
+com.google.errorprone error_prone_annotations * s/.*/debian/ * *


=====================================
debian/patches/remove-errorprone.patch deleted
=====================================
@@ -1,49 +0,0 @@
-Description: Remove errorprone references
- Not currently packaged for Debian (although should be soon)
-Author: Olek Wojnar <olek at debian.org>
-Last-Update: 2020-06-03
-
---- a/value/src/main/java/com/google/auto/value/extension/memoized/processor/MemoizeExtension.java
-+++ b/value/src/main/java/com/google/auto/value/extension/memoized/processor/MemoizeExtension.java
-@@ -53,7 +53,6 @@
- import com.google.common.base.Joiner;
- import com.google.common.collect.ImmutableList;
- import com.google.common.collect.ImmutableSet;
--import com.google.errorprone.annotations.FormatMethod;
- import com.squareup.javapoet.AnnotationSpec;
- import com.squareup.javapoet.ClassName;
- import com.squareup.javapoet.CodeBlock;
-@@ -463,7 +462,6 @@
-         }
-       }
- 
--      @FormatMethod
-       private void printMessage(Kind kind, String format, Object... args) {
-         if (kind.equals(ERROR)) {
-           hasErrors = true;
---- a/value/src/main/java/com/google/auto/value/processor/AutoAnnotationProcessor.java
-+++ b/value/src/main/java/com/google/auto/value/processor/AutoAnnotationProcessor.java
-@@ -26,7 +26,6 @@
- import com.google.common.collect.ImmutableMap;
- import com.google.common.collect.ImmutableSet;
- import com.google.common.primitives.Primitives;
--import com.google.errorprone.annotations.FormatMethod;
- import java.io.IOException;
- import java.io.Writer;
- import java.util.Collection;
-@@ -80,7 +79,6 @@
-    * Issue a compilation error. This method does not throw an exception, since we want to continue
-    * processing and perhaps report other errors.
-    */
--  @FormatMethod
-   private void reportError(Element e, String msg, Object... msgParams) {
-     String formattedMessage = String.format(msg, msgParams);
-     processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, formattedMessage, e);
-@@ -90,7 +88,6 @@
-    * Issue a compilation error and return an exception that, when thrown, will cause the processing
-    * of this class to be abandoned. This does not prevent the processing of other classes.
-    */
--  @FormatMethod
-   private AbortProcessingException abortWithError(Element e, String msg, Object... msgParams) {
-     reportError(e, msg, msgParams);
-     return new AbortProcessingException();


=====================================
debian/patches/series
=====================================
@@ -1,6 +1,5 @@
 verbose-build.patch
 remove-incap.patch
-remove-errorprone.patch
 no-shade.patch
 no-gwt.patch
 move-parent-pom.patch


=====================================
debian/upstream/metadata
=====================================
@@ -1,3 +1,3 @@
 Bug-Database: https://github.com/google/auto/labels/Component%3A%20value
-Repository: https://github.com/google/auto
+Repository: https://github.com/google/auto.git
 Repository-Browse: https://github.com/google/auto



View it on GitLab: https://salsa.debian.org/java-team/google-auto-value-java/-/commit/59a3109b41d845f7af27a68d56067be6151e9619

-- 
View it on GitLab: https://salsa.debian.org/java-team/google-auto-value-java/-/commit/59a3109b41d845f7af27a68d56067be6151e9619
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/20200616/950f75a0/attachment.html>