integrate m-api 3.2.3

Signed-off-by: Lukas Jungmann <[email protected]>
eclipse-ee4j · May 7, 2020 · 4cc3537 · 4cc3537
1 parent ebe0fce
commit 4cc3537
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/api-only/src/main/java/module-info.java b/api-only/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -10,7 +10,7 @@
 
 module gmbal {
     requires java.logging;
-    requires transitive java.management;
+    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
@@ -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
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -10,7 +10,7 @@
 
 module gmbal {
     requires java.logging;
-    requires transitive java.management;
+    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
@@ -84,7 +84,7 @@
     <properties>
         <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>
 
@@ -214,8 +214,6 @@
                         <configuration>
                             <compilerArgs>
                                 <arg>-Xlint:all</arg>
-                                <arg>--add-reads</arg>
-                                <arg>gmbal=ALL-UNNAMED</arg>
                             </compilerArgs>
                         </configuration>
                     </execution>