diff options
| author | Thomas Watson | 2019-01-21 21:52:59 +0000 |
|---|---|---|
| committer | Thomas Watson | 2019-01-21 21:56:17 +0000 |
| commit | 751b0399af531b9d69a85060649da4d71e4bf5f4 (patch) | |
| tree | 38181cabcd55ea2b403d73852e6facb54e5b5053 | |
| parent | cc9182802aa5b83dce8d5f0f720f98353a4436d2 (diff) | |
| download | rt.equinox.bundles-751b0399af531b9d69a85060649da4d71e4bf5f4.tar.gz rt.equinox.bundles-751b0399af531b9d69a85060649da4d71e4bf5f4.tar.xz rt.equinox.bundles-751b0399af531b9d69a85060649da4d71e4bf5f4.zip | |
Bug 538717 - Fix compile warningI20190121-1800
Change-Id: I7dcc75be6c7a9e242ba191264b6912431bd70c41
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
| -rw-r--r-- | bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF | 10 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.ds/pom.xml | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.ds/src/org/apache/felix/scr/Component.java | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF index 457fa9fa8..ea932a53f 100644 --- a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.ds;singleton:=true -Bundle-Version: 1.5.200.qualifier +Bundle-Version: 1.6.0.qualifier Bundle-Vendor: %bundleVendor Bundle-Activator: org.eclipse.equinox.internal.ds.Activator Bundle-Description: This bundle provides support for OSGi @@ -15,12 +15,12 @@ Import-Package: org.osgi.framework.namespace;version="1.1.0", org.osgi.framework.startlevel;version="1.0.0", org.osgi.framework.wiring;version="1.2.0", - org.osgi.service.component;version="1.3.0", - org.osgi.service.component.runtime;version="1.3.0", - org.osgi.service.component.runtime.dto;version="1.3.0", + org.osgi.service.component;version="1.4.0", + org.osgi.service.component.runtime;version="1.4.0", + org.osgi.service.component.runtime.dto;version="1.4.0", org.osgi.util.promise;version="1.0.0", org.osgi.util.tracker;version="1.5.0" -Require-Bundle: org.apache.felix.scr;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Require-Bundle: org.apache.felix.scr;bundle-version="[2.1.0,3.0.0)";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.equinox.ds diff --git a/bundles/org.eclipse.equinox.ds/pom.xml b/bundles/org.eclipse.equinox.ds/pom.xml index cb960656b..5bd90a525 100644 --- a/bundles/org.eclipse.equinox.ds/pom.xml +++ b/bundles/org.eclipse.equinox.ds/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.ds</artifactId> - <version>1.5.200-SNAPSHOT</version> + <version>1.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.ds/src/org/apache/felix/scr/Component.java b/bundles/org.eclipse.equinox.ds/src/org/apache/felix/scr/Component.java index f91c6b80f..7e466742f 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/apache/felix/scr/Component.java +++ b/bundles/org.eclipse.equinox.ds/src/org/apache/felix/scr/Component.java @@ -224,7 +224,7 @@ public interface Component { * * @since 1.2 */ - ComponentInstance getComponentInstance(); + <S> ComponentInstance<S> getComponentInstance(); /** * Returns the name of the method to be called when the component is being |