From 9a423667bcbab9ccd275d47eeaef3b9d306af99a Mon Sep 17 00:00:00 2001 From: Martin Oberhuber Date: Tue, 13 Jun 2017 15:08:00 +0200 Subject: [PATCH] Bug 516330 - Make terminal.connector.serial REQUIRE gnu.io non-optional As the o.e.tm.terminal.connector.serial , which is based on RXTX, was taken out of the master terminal.feature, it is now only available as a separate feature. Consequently, it only makes sense installing when RXTX is also available - the RXTX dependency was thus made non-optional. Change-Id: If6528a6518da57335c7449def359e0f645c77b67 Signed-off-by: Martin Oberhuber --- .../META-INF/MANIFEST.MF | 4 ++-- plugins/org.eclipse.tm.terminal.connector.serial/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF index 4b027b2589d..791331692d5 100644 --- a/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.connector.serial/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.connector.serial;singleton:=true -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.3.0.qualifier Bundle-Activator: org.eclipse.tm.terminal.connector.serial.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", @@ -21,4 +21,4 @@ Export-Package: org.eclipse.tm.terminal.connector.serial.activator;x-internal:=t org.eclipse.tm.terminal.connector.serial.interfaces, org.eclipse.tm.terminal.connector.serial.launcher, org.eclipse.tm.terminal.connector.serial.nls;x-internal:=true -Import-Package: gnu.io;resolution:=optional +Import-Package: gnu.io diff --git a/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml b/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml index a70e9caa7f7..75a812e11d0 100644 --- a/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml +++ b/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml @@ -11,7 +11,7 @@ ../../admin/pom-build.xml - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT org.eclipse.tm.terminal.connector.serial eclipse-plugin