Merge pull request #20 from lukasj/is19

#19: Provide JPMS descriptors
eclipse-ee4j · May 7, 2020 · bf7ef2e · bf7ef2e
2 parents 0aa7292 + 4cc3537
commit bf7ef2e
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ build/**
 .idea/**
 *.iml
 **/dependency-reduced-pom.xml
+/target/
diff --git a/api-only/src/main/java/module-info.java b/api-only/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0, which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+module gmbal {
+    requires java.logging;
+    requires transitive org.glassfish.external.management.api;
+
+    exports org.glassfish.gmbal;
+    exports org.glassfish.pfl.tf.timer.spi;
+}
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -83,7 +83,7 @@
                         <configuration>
                             <includeArtifactIds>gmbal-api-only</includeArtifactIds>
                             <classifier>sources</classifier>
-                            <excludes>**/pfl/**,META-INF/**</excludes>
+                            <excludes>module-info.*,**/pfl/**,META-INF/**</excludes>
                             <outputDirectory>${project.build.directory}/generated-sources/api</outputDirectory>
                         </configuration>
                     </execution>
@@ -108,6 +108,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <configuration>
+                            <compilerArgs>
+                                <arg>-Xlint:all</arg>
+                                <arg>--add-reads</arg>
+                                <arg>gmbal=ALL-UNNAMED</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -135,6 +151,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>META-INF/jpms.args</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/impl/src/main/java/module-info.java b/impl/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0, which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+module gmbal {
+    requires java.logging;
+    requires transitive org.glassfish.external.management.api;
+
+    exports org.glassfish.gmbal;
+    exports org.glassfish.gmbal.impl.trace;
+}
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -16,7 +16,8 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.6</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.glassfish.gmbal</groupId>
@@ -81,9 +82,9 @@
     </mailingLists>
 
     <properties>
-        <jdkVersion>1.8</jdkVersion>
+        <jdkVersion>8</jdkVersion>
         <pfl.version>4.1.0</pfl.version>
-        <gmbal.commons.version>3.2.2</gmbal.commons.version>
+        <gmbal.commons.version>3.2.3</gmbal.commons.version>
         <legal.doc.source>${project.basedir}/..</legal.doc.source>
     </properties>
 
@@ -148,16 +149,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
-                    <configuration>
-                        <source>${jdkVersion}</source>
-                        <target>${jdkVersion}</target>
-                    </configuration>
+                    <version>3.8.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>4.2.0</version>
+                    <version>4.2.1</version>
                 </plugin>
                 <!-- override default "built-by" entry, which points to a developer's user id -->
                 <plugin>
@@ -167,10 +164,6 @@
                     <configuration>
                         <archive>
                             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                            <manifestEntries>
-                                <Built-By>Oracle</Built-By>
-                                <Automatic-Module-Name>gmbal</Automatic-Module-Name>
-                            </manifestEntries>
                         </archive>
                     </configuration>
                 </plugin>
@@ -192,10 +185,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.1.1</version>
                     <configuration>
-                        <detectJavaApiLink>false</detectJavaApiLink>
-                        <detectOfflineLinks>false</detectOfflineLinks>
+                        <release>${jdkVersion}</release>
+                        <sourceFileExcludes>
+                            <sourceFileExclude>module-info.java</sourceFileExclude>
+                        </sourceFileExcludes>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -207,6 +202,36 @@
         </pluginManagement>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>9</release>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <configuration>
+                            <compilerArgs>
+                                <arg>-Xlint:all</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>base-compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <release>${jdkVersion}</release>
+                            <excludes>
+                                <exclude>module-info.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- prevent the site plugin from deploying to the scm url -->
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
@@ -292,7 +317,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
                 <reportSets>
                     <reportSet>
                         <id>javadoc-only</id>