You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by as...@apache.org on 2019/05/29 11:23:19 UTC
[oozie] branch master updated: OOZIE-3490 [Java 11] Remove
com.sun:tools dependency from core module (kmarton via asalamon74)
This is an automated email from the ASF dual-hosted git repository.
asalamon74 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new 1d19c53 OOZIE-3490 [Java 11] Remove com.sun:tools dependency from core module (kmarton via asalamon74)
1d19c53 is described below
commit 1d19c53392e48e172bab60320b03ad45443b7821
Author: Andras Salamon <as...@apache.org>
AuthorDate: Wed May 29 13:22:42 2019 +0200
OOZIE-3490 [Java 11] Remove com.sun:tools dependency from core module (kmarton via asalamon74)
---
core/pom.xml | 8 ----
.../oozie/util/TestMetricsInstrumentation.java | 47 ----------------------
release-log.txt | 1 +
3 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 0d6bf7b..7541bf6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -238,14 +238,6 @@
</dependency>
<dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>${targetJavaVersion}</version>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- <scope>system</scope>
- </dependency>
-
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<scope>provided</scope>
diff --git a/core/src/test/java/org/apache/oozie/util/TestMetricsInstrumentation.java b/core/src/test/java/org/apache/oozie/util/TestMetricsInstrumentation.java
index dbb75ed..8d74725 100644
--- a/core/src/test/java/org/apache/oozie/util/TestMetricsInstrumentation.java
+++ b/core/src/test/java/org/apache/oozie/util/TestMetricsInstrumentation.java
@@ -28,9 +28,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import com.sun.tools.attach.VirtualMachine;
-import com.sun.tools.attach.VirtualMachineDescriptor;
-import com.sun.tools.attach.spi.AttachProvider;
import org.apache.oozie.service.Services;
import org.apache.oozie.test.XTestCase;
@@ -219,48 +216,4 @@ public class TestMetricsInstrumentation extends XTestCase {
} catch (UnsupportedOperationException uoe) {
}
}
-
- public void testJMXInstrumentation() throws Exception {
- final AttachProvider attachProvider = AttachProvider.providers().get(0);
-
- VirtualMachineDescriptor descriptor = null;
-
- //Setting the id of the VM unique, so we can find it.
- String uniqueId = UUID.randomUUID().toString();
- System.setProperty("processSettings.unique.id", uniqueId);
-
- //Finding our own VM by the id.
- for(VirtualMachineDescriptor d : VirtualMachine.list()) {
- String remoteUniqueId = VirtualMachine.attach(d).getSystemProperties().getProperty("processSettings.unique.id");
- if(remoteUniqueId != null && remoteUniqueId.equals(uniqueId))
- {
- descriptor = d;
- break;
- }
- }
-
- assertNotNull("Could not find own virtual machine", descriptor);
-
- //Attaching JMX agent to our own VM
- final VirtualMachine virtualMachine = attachProvider.attachVirtualMachine(descriptor);
- String agent = virtualMachine.getSystemProperties().getProperty("java.home") +
- File.separator + "lib" + File.separator + "management-agent.jar";
- virtualMachine.loadAgent(agent);
- final Object portObject = virtualMachine.getAgentProperties().
- get("com.sun.management.jmxremote.localConnectorAddress");
-
- final JMXServiceURL target = new JMXServiceURL(portObject + "");
-
- JMXConnector jmxc = JMXConnectorFactory.connect(target);
- MBeanServerConnection conn = jmxc.getMBeanServerConnection();
-
- //Query a value through JMX from our own VM
- Object value = null;
- try {
- value = conn.getAttribute(new ObjectName("metrics:name=jvm.memory.heap.committed"),"Value");
- } catch (Exception e) {
- fail("Could not fetch metric");
- }
- assertNotNull("JMX service error", value);
- }
}
diff --git a/release-log.txt b/release-log.txt
index 9540f82..b6cda0c 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3490 [Java 11] Remove com.sun:tools dependency from core module (kmarton via asalamon74)
OOZIE-3393 amend Add Oozie instrumentation delayed metric in CoordMaterializeTriggerService (zuston via asalamon74)
OOZIE-3500 Flaky tests based on WorkflowTestCase (asalamon74 via kmarton)
OOZIE-3498 TestOozieCLI testRetryWithRetryCount and testRetryForTimeout is flaky (asalamon74 via kmarton)