Skip to content

Commit 04fe835

Browse files
tbroyerError Prone Team
authored and
Error Prone Team
committed
Adds type_annotations back but as a relocation to annotations
Adds a dependency to type_annotations into annotations to make sure it'll "update" an older type_annotations dependency present in the same "bag" of dependencies (works best in Gradle; Maven having a "nearest definition" rule so won't always work but hopefully people align versions one way or another). Fixes #4906 COPYBARA_INTEGRATE_REVIEW=#4906 from tbroyer:type_annotations-relocation 31c2f10 PiperOrigin-RevId: 737716541
1 parent 1ad73c2 commit 04fe835

File tree

3 files changed

+49
-0
lines changed

3 files changed

+49
-0
lines changed

annotations/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<artifactId>error_prone_annotations</artifactId>
2929

3030
<dependencies>
31+
<dependency>
32+
<groupId>com.google.errorprone</groupId>
33+
<artifactId>error_prone_type_annotations</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
3136
<dependency>
3237
<groupId>junit</groupId>
3338
<artifactId>junit</artifactId>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<module>core</module>
6666
<module>annotation</module>
6767
<module>annotations</module>
68+
<module>type_annotations</module>
6869
<module>docgen</module>
6970
<module>docgen_processor</module>
7071
<module>refaster</module>

type_annotations/pom.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2025 The Error Prone Authors.
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
<modelVersion>4.0.0</modelVersion>
20+
21+
<parent>
22+
<groupId>com.google.errorprone</groupId>
23+
<artifactId>error_prone_parent</artifactId>
24+
<version>1.0-HEAD-SNAPSHOT</version>
25+
</parent>
26+
27+
<name>error-prone type annotations</name>
28+
<artifactId>error_prone_type_annotations</artifactId>
29+
30+
<distributionManagement>
31+
<relocation>
32+
<artifactId>error_prone_annotations</artifactId>
33+
<message>error_prone_type_annotations has been merged into error_prone_annotations</message>
34+
</relocation>
35+
</distributionManagement>
36+
37+
<licenses>
38+
<license>
39+
<name>Apache 2.0</name>
40+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
41+
</license>
42+
</licenses>
43+
</project>

0 commit comments

Comments
 (0)