Skip to content

Commit d209b0c

Browse files
sgammonsgammon
committed
feat: add jpms definition for annotations
- feat: add `module-info` to `annotations` module - feat: ship `annotations` as a `Multi-Release` JAR - feat: support `1.8` through latest JDK for `annotations` module - fix: `HEAD-SNAPSHOT` → `1.0-HEAD-SNAPSHOT`, because of a Maven Compiler Plugin issue precluding use as a module version[0] [0]: https://issues.apache.org/jira/browse/MCOMPILER-579 Signed-off-by: Sam Gammon <sam@elide.ventures>
1 parent 9da2d55 commit d209b0c

File tree

11 files changed

+74
-12
lines changed

11 files changed

+74
-12
lines changed

‎annotation/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.errorprone</groupId>
2323
<artifactId>error_prone_parent</artifactId>
24-
<version>HEAD-SNAPSHOT</version>
24+
<version>1.0-HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<name>@BugPattern annotation</name>

‎annotations/pom.xml‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.errorprone</groupId>
2323
<artifactId>error_prone_parent</artifactId>
24-
<version>HEAD-SNAPSHOT</version>
24+
<version>1.0-HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<name>error-prone annotations</name>
@@ -49,10 +49,40 @@
4949
<groupId>org.apache.maven.plugins</groupId>
5050
<artifactId>maven-compiler-plugin</artifactId>
5151
<configuration>
52-
<source>8</source>
53-
<target>8</target>
5452
<compilerArgs combine.self="override" />
5553
</configuration>
54+
<executions>
55+
<execution>
56+
<id>default-compile</id>
57+
<configuration>
58+
<source>1.8</source>
59+
<target>1.8</target>
60+
<excludes>
61+
<exclude>module-info.java</exclude>
62+
</excludes>
63+
</configuration>
64+
</execution>
65+
<execution>
66+
<id>compile-java9</id>
67+
<configuration>
68+
<source>9</source>
69+
<target>9</target>
70+
<release>9</release>
71+
<multiReleaseOutput>true</multiReleaseOutput>
72+
</configuration>
73+
</execution>
74+
</executions>
75+
</plugin>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-jar-plugin</artifactId>
79+
<configuration>
80+
<archive>
81+
<manifestEntries>
82+
<Multi-Release>true</Multi-Release>
83+
</manifestEntries>
84+
</archive>
85+
</configuration>
5686
</plugin>
5787
</plugins>
5888
</build>

‎annotations/src/main/java/module-info.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright 2015 The Error Prone Authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
open module com.google.errorprone.annotation {
18+
requires java.base;
19+
requires java.compiler;
20+
exports com.google.errorprone.annotations;
21+
exports com.google.errorprone.annotations.concurrent;
22+
}

‎check_api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.errorprone</groupId>
2323
<artifactId>error_prone_parent</artifactId>
24-
<version>HEAD-SNAPSHOT</version>
24+
<version>1.0-HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<name>error-prone check api</name>

‎core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.errorprone</groupId>
2323
<artifactId>error_prone_parent</artifactId>
24-
<version>HEAD-SNAPSHOT</version>
24+
<version>1.0-HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<name>error-prone library</name>

‎docgen/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.errorprone</groupId>
2323
<artifactId>error_prone_parent</artifactId>
24-
<version>HEAD-SNAPSHOT</version>
24+
<version>1.0-HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<name>Documentation tool for generating Error Prone bugpattern documentation</name>

‎docgen_processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.errorprone</groupId>
2323
<artifactId>error_prone_parent</artifactId>
24-
<version>HEAD-SNAPSHOT</version>
24+
<version>1.0-HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<name>JSR-269 annotation processor for @BugPattern annotation</name>

‎pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<name>Error Prone parent POM</name>
2222
<groupId>com.google.errorprone</groupId>
2323
<artifactId>error_prone_parent</artifactId>
24-
<version>HEAD-SNAPSHOT</version>
24+
<version>1.0-HEAD-SNAPSHOT</version>
2525
<packaging>pom</packaging>
2626

2727
<description>Error Prone is a static analysis tool for Java that catches common programming mistakes at compile-time.</description>
@@ -204,6 +204,16 @@
204204
<exclude>**/testdata/**</exclude>
205205
</testExcludes>
206206
</configuration>
207+
<executions>
208+
<execution>
209+
<id>default-compile</id>
210+
<configuration>
211+
<compilerArgs combine.children="append">
212+
<arg>-Xlint:-options</arg>
213+
</compilerArgs>
214+
</configuration>
215+
</execution>
216+
</executions>
207217
</plugin>
208218
<plugin>
209219
<groupId>org.apache.maven.plugins</groupId>

‎refaster/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>error_prone_parent</artifactId>
2121
<groupId>com.google.errorprone</groupId>
22-
<version>HEAD-SNAPSHOT</version>
22+
<version>1.0-HEAD-SNAPSHOT</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

‎test_helpers/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.errorprone</groupId>
2323
<artifactId>error_prone_parent</artifactId>
24-
<version>HEAD-SNAPSHOT</version>
24+
<version>1.0-HEAD-SNAPSHOT</version>
2525
</parent>
2626

2727
<name>error-prone test helpers</name>

0 commit comments

Comments
 (0)