#17: define JPMS descriptor (#18)

* #17: define JPMS descriptor Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com> * Set base jdk version to 8 Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · May 7, 2020 · 2fbcf51 · 2fbcf51
1 parent e3d55e3
commit 2fbcf51
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ build/**
 .idea/**
 *.iml
 
+/target/
diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,8 @@
     </distributionManagement>
 
     <properties>
-        <jdkVersion>1.7</jdkVersion>
+        <base.jdk.version>8</base.jdk.version>
+        <upper.jdk.version>9</upper.jdk.version>
         <legal.doc.source>${maven.multiModuleProjectDirectory}</legal.doc.source>
     </properties>
 
@@ -72,10 +73,26 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.0.0-M4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.1.1</version>
+                    <configuration>
+                        <release>${base.jdk.version}</release>
+                        <sourceFileExcludes>
+                            <sourceFileExclude>module-info.java</sourceFileExclude>
+                        </sourceFileExcludes>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>2.9</version>
+                    <version>3.0.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -84,17 +101,33 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>${jdkVersion}</source>
-                    <target>${jdkVersion}</target>
+                    <release>${upper.jdk.version}</release>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                    </compilerArgs>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>base-compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <release>${base.jdk.version}</release>
+                            <excludes>
+                                <exclude>module-info.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.7</version>
+                <version>4.2.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -120,13 +153,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.2</version>
                 <configuration>
                     <archive>  
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                        <manifestEntries>
-                            <Built-By>Oracle</Built-By>
-                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
@@ -160,7 +190,7 @@
             <!-- prevent the site plugin from deploying to the scm url -->
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.2</version>
                 <executions>
                     <execution>
                         <id>stage-for-scm-publish</id>
@@ -188,12 +218,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>3.1.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -213,19 +238,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.0.0</version>
                 <reportSets>
                     <reportSet>
                         <id>aggregate-project-info</id>
                         <inherited>false</inherited>
                         <reports>
                             <report>index</report>
-                            <report>license</report>
-                            <report>issue-tracking</report>
+                            <report>licenses</report>
+                            <report>issue-management</report>
                             <report>dependency-info</report>
                             <report>scm</report>
                             <report>distribution-management</report>
-                            <report>project-team</report>
+                            <report>team</report>
                             <report>summary</report>
                         </reports>
                     </reportSet>
@@ -235,7 +259,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
                 <reportSets>
                     <reportSet>
                         <id>javadoc-only</id>

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2019 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 org.glassfish.external.management.api {
+
+    requires java.logging;
+    requires transitive java.management;
+
+    exports org.glassfish.external.amx;
+    exports org.glassfish.external.arc;
+    exports org.glassfish.external.probe.provider;
+    exports org.glassfish.external.probe.provider.annotations;
+    exports org.glassfish.external.statistics;
+    exports org.glassfish.external.statistics.annotations;
+    exports org.glassfish.external.statistics.impl;
+}