move JMXServiceProvider to non-HotSpot project

makulu1987 · Sep 30, 2019 · 2ab6683 · 2ab6683
1 parent 1d9d339
commit 2ab6683
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 165 deletions.
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -709,21 +709,15 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "org.graalvm.compiler.hotspot.management.jdk11" : {
+    "org.graalvm.compiler.management" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "org.graalvm.compiler.serviceprovider.jdk11",
-        "org.graalvm.compiler.hotspot.management",
+        "org.graalvm.compiler.serviceprovider",
       ],
-      "requiresConcealed" : {
-        "jdk.internal.vm.ci" : ["jdk.vm.ci.hotspot"],
-      },
       "requires" : [
         "jdk.management",
       ],
-      "overlayTarget" : "org.graalvm.compiler.hotspot.management",
-      "multiReleaseJarVersion" : "11",
       "checkstyle" : "org.graalvm.compiler.graph",
       "annotationProcessors" : [
         "GRAAL_SERVICEPROVIDER_PROCESSOR",
@@ -732,29 +726,6 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "org.graalvm.compiler.hotspot.management.jdk13" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.serviceprovider.jdk13",
-        "org.graalvm.compiler.hotspot.management",
-      ],
-      "requires" : [
-        "jdk.management",
-      ],
-      "requiresConcealed" : {
-        "jdk.internal.vm.ci" : ["jdk.vm.ci.hotspot"],
-      },
-      "overlayTarget" : "org.graalvm.compiler.hotspot.management",
-      "multiReleaseJarVersion" : "13",
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "annotationProcessors" : [
-        "GRAAL_SERVICEPROVIDER_PROCESSOR",
-      ],
-      "javaCompliance" : "13+",
-      "workingSets" : "Graal,HotSpot",
-    },
-
     "org.graalvm.compiler.hotspot.management.libgraal" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -2622,6 +2593,7 @@
       },
       "subDir" : "src",
       "dependencies" : [
+        "org.graalvm.compiler.management",
         "org.graalvm.compiler.hotspot.management",
       ],
       "distDependencies" : [

diff --git a/...er.hotspot.management.jdk11/src/org/graalvm/compiler/hotspot/management/package-info.java b/...er.hotspot.management.jdk11/src/org/graalvm/compiler/hotspot/management/package-info.java
diff --git a/...spot.management.jdk13/src/org/graalvm/compiler/hotspot/management/JMXServiceProvider.java b/...spot.management.jdk13/src/org/graalvm/compiler/hotspot/management/JMXServiceProvider.java
diff --git a/...er.hotspot.management.jdk13/src/org/graalvm/compiler/hotspot/management/package-info.java b/...er.hotspot.management.jdk13/src/org/graalvm/compiler/hotspot/management/package-info.java
diff --git a/...otspot/management/JMXServiceProvider.java → ...mpiler/management/JMXServiceProvider.java b/...otspot/management/JMXServiceProvider.java → ...mpiler/management/JMXServiceProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.hotspot.management;
+package org.graalvm.compiler.management;
 
 import static java.lang.Thread.currentThread;
 
@@ -35,7 +35,7 @@
 import com.sun.management.ThreadMXBean;
 
 /**
- * Implementation of {@link JMXService} for LabsJDK 11.
+ * Implementation of {@link JMXService} for JDK 11+.
  */
 @ServiceProvider(JMXService.class)
 public class JMXServiceProvider extends JMXService {

diff --git a/...ompiler.serviceprovider.jdk11/src/org/graalvm/compiler/serviceprovider/GraalServices.java b/...ompiler.serviceprovider.jdk11/src/org/graalvm/compiler/serviceprovider/GraalServices.java
@@ -29,7 +29,7 @@
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
 
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.InputStream; 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.ArrayList;