[Git][java-team/guava-libraries][master] 2 commits: Removed the non-Guava annotations from the jar

Emmanuel Bourg gitlab at salsa.debian.org
Sun May 10 00:39:32 BST 2020 


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


Commits:
436edab7 by Emmanuel Bourg at 2020-05-10T01:36:44+02:00
Removed the non-Guava annotations from the jar

- - - - -
85b7cadb by Emmanuel Bourg at 2020-05-10T01:36:54+02:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/12-add-j2objc-annotations.patch
- debian/patches/13-add-errorprone-annotations.patch
- debian/patches/14-add-checkerframework-annotations.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+guava-libraries (29.0-1) unstable; urgency=medium
+
+  * Upload to unstable
+  * Removed the non-Guava annotations from the jar
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 10 May 2020 01:31:25 +0200
+
 guava-libraries (29.0-1~exp1) experimental; urgency=medium
 
   * New upstream release (Closes: #959113)


=====================================
debian/control
=====================================
@@ -14,7 +14,8 @@ Build-Depends:
  libmaven-bundle-plugin-java,
  libmaven-dependency-plugin-java,
  libmaven-javadoc-plugin-java,
- maven-debian-helper
+ maven-debian-helper,
+ zip
 Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/java-team/guava-libraries.git
 Vcs-Browser: https://salsa.debian.org/java-team/guava-libraries


=====================================
debian/patches/12-add-j2objc-annotations.patch
=====================================
@@ -77,7 +77,7 @@ Forwarded: not-needed
 + */
 + at Documented
 + at Target({ ElementType.TYPE, ElementType.PACKAGE })
-+ at Retention(RetentionPolicy.CLASS)
++ at Retention(RetentionPolicy.SOURCE)
 +public @interface ReflectionSupport {
 +
 +  /**
@@ -162,7 +162,7 @@ Forwarded: not-needed
 + * @author Keith Stanger
 + */
 + at Target({ ElementType.FIELD })
-+ at Retention(RetentionPolicy.CLASS)
++ at Retention(RetentionPolicy.SOURCE)
 +public @interface RetainedWith {
 +}
 --- /dev/null
@@ -189,7 +189,7 @@ Forwarded: not-needed
 +import static java.lang.annotation.ElementType.FIELD;
 +import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
 +import static java.lang.annotation.ElementType.PARAMETER;
-+import static java.lang.annotation.RetentionPolicy.CLASS;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +
 +import java.lang.annotation.Retention;
 +import java.lang.annotation.Target;
@@ -202,7 +202,7 @@ Forwarded: not-needed
 + * @author Tom Ball
 + */
 + at Target({FIELD, LOCAL_VARIABLE, PARAMETER})
-+ at Retention(CLASS)
++ at Retention(SOURCE)
 +public @interface Weak {
 +}
 --- /dev/null


=====================================
debian/patches/13-add-errorprone-annotations.patch
=====================================
@@ -24,7 +24,7 @@ Forwarded: not-needed
 +
 +import static java.lang.annotation.ElementType.METHOD;
 +import static java.lang.annotation.ElementType.TYPE;
-+import static java.lang.annotation.RetentionPolicy.CLASS;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +
 +import java.lang.annotation.Documented;
 +import java.lang.annotation.Retention;
@@ -38,7 +38,7 @@ Forwarded: not-needed
 + */
 + at Documented
 + at Target({METHOD, TYPE})
-+ at Retention(CLASS)
++ at Retention(SOURCE)
 +public @interface CanIgnoreReturnValue {}
 --- /dev/null
 +++ b/guava/src/com/google/errorprone/annotations/ForOverride.java
@@ -62,7 +62,7 @@ Forwarded: not-needed
 +package com.google.errorprone.annotations;
 +
 +import static java.lang.annotation.ElementType.METHOD;
-+import static java.lang.annotation.RetentionPolicy.CLASS;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +import static javax.lang.model.element.Modifier.FINAL;
 +import static javax.lang.model.element.Modifier.PRIVATE;
 +import static javax.lang.model.element.Modifier.PUBLIC;
@@ -84,7 +84,7 @@ Forwarded: not-needed
 + * protected or package-private visibility, although their effective visibility is actually "none".
 + */
 + at Documented
-+ at Retention(CLASS) // Parent source might not be available while compiling subclass
++ at Retention(SOURCE) // Parent source might not be available while compiling subclass
 + at Target(METHOD)
 +public @interface ForOverride {}
 --- /dev/null
@@ -152,7 +152,7 @@ Forwarded: not-needed
 + * unless you really understand this <b>and</b> you really need the performance benefits of
 + * introducing the data race, do not use this construct.
 + */
-+ at Retention(RetentionPolicy.RUNTIME)
++ at Retention(RetentionPolicy.SOURCE)
 + at Target(ElementType.FIELD)
 +public @interface LazyInit {}
 --- /dev/null
@@ -176,7 +176,7 @@ Forwarded: not-needed
 +package com.google.errorprone.annotations;
 +
 +import static java.lang.annotation.ElementType.TYPE;
-+import static java.lang.annotation.RetentionPolicy.RUNTIME;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +
 +import java.lang.annotation.Documented;
 +import java.lang.annotation.Inherited;
@@ -232,7 +232,7 @@ Forwarded: not-needed
 + */
 + at Documented
 + at Target(TYPE)
-+ at Retention(RUNTIME)
++ at Retention(SOURCE)
 + at Inherited
 +public @interface Immutable {
 +
@@ -295,14 +295,14 @@ Forwarded: not-needed
 + * {@code @CompatibleWith} already present.
 + */
 + at Documented
-+ at Retention(RetentionPolicy.CLASS)
++ at Retention(RetentionPolicy.SOURCE)
 + at Target(ElementType.PARAMETER)
 +public @interface CompatibleWith {
 +  String value();
 +}
 --- /dev/null
 +++ b/guava/src/com/google/errorprone/annotations/MustBeClosed.java
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,42 @@
 +/*
 + * Copyright 2016 The Error Prone Authors.
 + *
@@ -323,8 +323,10 @@ Forwarded: not-needed
 +
 +import static java.lang.annotation.ElementType.CONSTRUCTOR;
 +import static java.lang.annotation.ElementType.METHOD;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +
 +import java.lang.annotation.Documented;
++import java.lang.annotation.Retention;
 +import java.lang.annotation.Target;
 +
 +/**
@@ -340,6 +342,7 @@ Forwarded: not-needed
 + * annotation should be avoided on APIs that may be used on Android, unless desugaring is used.
 + */
 + at Documented
++ at Retention(SOURCE)
 + at Target({CONSTRUCTOR, METHOD})
 +public @interface MustBeClosed {}
 --- /dev/null
@@ -382,7 +385,7 @@ Forwarded: not-needed
 + */
 + at Inherited
 + at Documented
-+ at Retention(RetentionPolicy.RUNTIME)
++ at Retention(RetentionPolicy.SOURCE)
 + at Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
 +public @interface DoNotMock {
 +  /**
@@ -414,14 +417,14 @@ Forwarded: not-needed
 +
 +import static java.lang.annotation.ElementType.FIELD;
 +import static java.lang.annotation.ElementType.METHOD;
-+import static java.lang.annotation.RetentionPolicy.CLASS;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +
 +import java.lang.annotation.Retention;
 +import java.lang.annotation.Target;
 +
 +/** Indicates that the annotated element should be used only while holding the specified lock. */
 + at Target({FIELD, METHOD})
-+ at Retention(CLASS)
++ at Retention(SOURCE)
 +public @interface GuardedBy {
 +  /**
 +   * The lock that should be held, specified in the format <a
@@ -455,7 +458,7 @@ Forwarded: not-needed
 +import static java.lang.annotation.ElementType.METHOD;
 +import static java.lang.annotation.ElementType.PACKAGE;
 +import static java.lang.annotation.ElementType.TYPE;
-+import static java.lang.annotation.RetentionPolicy.RUNTIME;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +
 +import java.lang.annotation.Documented;
 +import java.lang.annotation.Retention;
@@ -472,7 +475,7 @@ Forwarded: not-needed
 + */
 + at Documented
 + at Target({METHOD, CONSTRUCTOR, TYPE, PACKAGE})
-+ at Retention(RUNTIME)
++ at Retention(SOURCE)
 +public @interface CheckReturnValue {}
 --- /dev/null
 +++ b/guava/src/com/google/errorprone/annotations/OverridingMethodsMustInvokeSuper.java
@@ -495,7 +498,7 @@ Forwarded: not-needed
 +package com.google.errorprone.annotations;
 +
 +import static java.lang.annotation.ElementType.METHOD;
-+import static java.lang.annotation.RetentionPolicy.CLASS;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +
 +import java.lang.annotation.Documented;
 +import java.lang.annotation.Retention;
@@ -518,7 +521,7 @@ Forwarded: not-needed
 + */
 + at Documented
 + at Target(METHOD)
-+ at Retention(CLASS)
++ at Retention(SOURCE)
 +public @interface OverridingMethodsMustInvokeSuper {}
 --- /dev/null
 +++ b/guava/src/com/google/errorprone/annotations/DoNotCall.java
@@ -542,7 +545,7 @@ Forwarded: not-needed
 +package com.google.errorprone.annotations;
 +
 +import static java.lang.annotation.ElementType.METHOD;
-+import static java.lang.annotation.RetentionPolicy.CLASS;
++import static java.lang.annotation.RetentionPolicy.SOURCE;
 +
 +import java.lang.annotation.Retention;
 +import java.lang.annotation.Target;
@@ -557,7 +560,7 @@ Forwarded: not-needed
 + * <p>Marking methods annotated with {@code @DoNotCall} as {@code @Deprecated} is recommended, since
 + * it provides IDE users with more immediate feedback.
 + */
-+ at Retention(CLASS)
++ at Retention(SOURCE)
 + at Target(METHOD)
 +public @interface DoNotCall {
 +


=====================================
debian/patches/14-add-checkerframework-annotations.patch
=====================================
@@ -26,7 +26,7 @@ Forwarded: not-needed
 + * @checker_framework.manual #nullness-checker Nullness Checker
 + */
 + at Documented
-+ at Retention(RetentionPolicy.RUNTIME)
++ at Retention(RetentionPolicy.SOURCE)
 + at Target({ ElementType.TYPE_USE, ElementType.TYPE_PARAMETER })
 +public @interface Nullable {
 +}
@@ -86,7 +86,7 @@ Forwarded: not-needed
 + */
 + at Documented
 + at Target(ElementType.TYPE_USE)
-+ at Retention(RetentionPolicy.RUNTIME)
++ at Retention(RetentionPolicy.SOURCE)
 +public @interface MonotonicNonNull {
 +}
 --- /dev/null
@@ -129,7 +129,7 @@ Forwarded: not-needed
 + * @checker_framework.manual #nullness-checker Nullness Checker
 + */
 + at Documented
-+ at Retention(RetentionPolicy.RUNTIME)
++ at Retention(RetentionPolicy.SOURCE)
 + at Target({ ElementType.TYPE_USE, ElementType.TYPE_PARAMETER })
 +public @interface NonNull {
 +}


=====================================
debian/rules
=====================================
@@ -8,6 +8,7 @@ export JAVA_HOME = /usr/lib/jvm/default-java
 override_dh_auto_build:
 	cp -Rvp futures/failureaccess/src/com/google/common/util/concurrent/internal guava/src/com/google/common/util/concurrent/
 	dh_auto_build
+	zip -d ./guava/target/guava-29.0-jre.jar 'org/checkerframework/*' 'com/google/j2objc/annotations/*' 'com/google/errorprone/annotations/*'
 
 get-orig-source:
 	-uscan --download-current-version --force-download --repack --compression xz



View it on GitLab: https://salsa.debian.org/java-team/guava-libraries/-/compare/3e8712d2ac2af32b24d190a7824ee90a1deec89e...85b7cadb86fb00e0ae204ab5e5701cab9f4fca2d

-- 
View it on GitLab: https://salsa.debian.org/java-team/guava-libraries/-/compare/3e8712d2ac2af32b24d190a7824ee90a1deec89e...85b7cadb86fb00e0ae204ab5e5701cab9f4fca2d
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/20200509/70444ca3/attachment.html>

More information about the pkg-java-commits mailing list