add proper JPMS descriptor, upgrade build plugins (#72)

* add proper JPMS descriptor, upgrade build plugins Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com> * drop build on JDK 8 Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
jakartaee · Feb 7, 2020 · b623aa8 · b623aa8
1 parent 71b1d1c
commit b623aa8
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,7 @@ language: java
 sudo: false
 
 jdk:
-  - oraclejdk8
   - oraclejdk11
-  - openjdk8
   - openjdk11
 
 cache:

diff --git a/api/pom.xml b/api/pom.xml
@@ -96,7 +96,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
+                    <version>3.8.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.build</groupId>
@@ -106,12 +106,12 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>4.2.0</version>
+                    <version>4.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -121,7 +121,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -183,12 +183,28 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <compilerArgument>-Xlint:unchecked</compilerArgument>
+                    <release>9</release>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                    </compilerArgs>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>base-compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <release>8</release>
+                            <excludes>
+                                <exclude>module-info.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.glassfish.build</groupId>
@@ -253,12 +269,6 @@
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                        <manifestEntries>
-                            <!-- for JDK 9 -->
-                            <Automatic-Module-Name>
-                                jakarta.annotation
-                            </Automatic-Module-Name>
-                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
@@ -283,10 +293,13 @@
                 <configuration>
                     <source>8</source>
                     <doctitle>Jakarta Annotations ${project.version} API Specification</doctitle>
+                    <additionalOptions>
+                        <additionalOption>--frames</additionalOption>
+                    </additionalOptions>
                     <sourceFileExcludes>
-                        <sourceFileExclude>**/module-info.java</sourceFileExclude>
-                        <sourceFileExclude>target/**/*.java</sourceFileExclude>
+                        <sourceFileExclude>module-info.java</sourceFileExclude>
                     </sourceFileExcludes>
+                    <notimestamp>true</notimestamp>
                     <docfilessubdirs>true</docfilessubdirs>
                     <links>
                         <link>http://docs.oracle.com/javase/8/docs/api/</link>
@@ -296,7 +309,7 @@
                     <header><![CDATA[<br>Jakarta Annotations API v${project.version}]]>
                     </header>
                     <bottom><![CDATA[
-                    Copyright &#169; 2019 Eclipse Foundation. All rights reserved.<br>
+                    Copyright &#169; 2019, 2020 Eclipse Foundation. All rights reserved.<br>
                     Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license terms</a>.]]>
                     </bottom>
                 </configuration>

diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+
+module jakarta.annotation {
+
+    exports jakarta.annotation;
+    exports jakarta.annotation.security;
+    exports jakarta.annotation.sql;
+
+}