Skip to content

Commit 5f37e53

Browse files
elharonick-someone
authored andcommitted
switch to an internal annotation for ignoring JRE
requirements Fixes #3652 RELNOTES=Removed dependency on `animal-sniffer-annotations`. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=273964192
1 parent 368c337 commit 5f37e53

File tree

8 files changed

+36
-12
lines changed

8 files changed

+36
-12
lines changed

android/guava/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
<groupId>com.google.j2objc</groupId>
4343
<artifactId>j2objc-annotations</artifactId>
4444
</dependency>
45-
<dependency>
46-
<groupId>org.codehaus.mojo</groupId>
47-
<artifactId>animal-sniffer-annotations</artifactId>
48-
<version>${animal.sniffer.version}</version>
49-
</dependency>
5045
<!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? -->
5146
<!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text -->
5247
</dependencies>

android/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import java.util.concurrent.TimeUnit;
3737
import java.util.concurrent.TimeoutException;
3838
import org.checkerframework.checker.nullness.compatqual.NullableDecl;
39-
import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
4039

4140
/** Static methods used to implement {@link Futures#getChecked(Future, Class)}. */
4241
@GwtIncompatible
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* Copyright 2019 The Guava Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5+
* in compliance with the License. You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software distributed under the License
10+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11+
* or implied. See the License for the specific language governing permissions and limitations under
12+
* the License.
13+
*/
14+
15+
package com.google.common.util.concurrent;
16+
17+
@interface IgnoreJRERequirement {}

android/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<artifactId>animal-sniffer-maven-plugin</artifactId>
150150
<version>${animal.sniffer.version}</version>
151151
<configuration>
152+
<annotations>com.google.common.util.concurrent.IgnoreJRERequirement</annotations>
152153
<signature>
153154
<groupId>org.codehaus.mojo.signature</groupId>
154155
<artifactId>java16-sun</artifactId>

guava/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
<groupId>com.google.j2objc</groupId>
4343
<artifactId>j2objc-annotations</artifactId>
4444
</dependency>
45-
<dependency>
46-
<groupId>org.codehaus.mojo</groupId>
47-
<artifactId>animal-sniffer-annotations</artifactId>
48-
<version>${animal.sniffer.version}</version>
49-
</dependency>
5045
<!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? -->
5146
<!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text -->
5247
</dependencies>

guava/src/com/google/common/util/concurrent/FuturesGetChecked.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import java.util.concurrent.TimeUnit;
3737
import java.util.concurrent.TimeoutException;
3838
import org.checkerframework.checker.nullness.qual.Nullable;
39-
import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
4039

4140
/** Static methods used to implement {@link Futures#getChecked(Future, Class)}. */
4241
@GwtIncompatible
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* Copyright 2019 The Guava Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5+
* in compliance with the License. You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software distributed under the License
10+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11+
* or implied. See the License for the specific language governing permissions and limitations under
12+
* the License.
13+
*/
14+
15+
package com.google.common.util.concurrent;
16+
17+
@interface IgnoreJRERequirement {}

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
<artifactId>animal-sniffer-maven-plugin</artifactId>
151151
<version>${animal.sniffer.version}</version>
152152
<configuration>
153+
<annotations>com.google.common.util.concurrent.IgnoreJRERequirement</annotations>
153154
<signature>
154155
<groupId>org.codehaus.mojo.signature</groupId>
155156
<artifactId>java18</artifactId>

0 commit comments

Comments
 (0)