Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2016-02-24 04:29:37 -0500
committerMat Booth2016-04-12 11:33:31 -0400
commitafa22c30f719b4c92e15be04fce17b040c7afe7f (patch)
tree92be1e81ef7cab380ac226dfd56a530afe460056
parentf0edac53e363d9552bcdf57c7f28f473afbbe4b9 (diff)
downloadorg.eclipse.ecf-afa22c30f719b4c92e15be04fce17b040c7afe7f.tar.gz
org.eclipse.ecf-afa22c30f719b4c92e15be04fce17b040c7afe7f.tar.xz
org.eclipse.ecf-afa22c30f719b4c92e15be04fce17b040c7afe7f.zip
Bug 491516 - "jre.compilation.profile" is lower than BREE in some projects
This change also fixes a compilation error in the example bundle "ecf.examples.rs.hello.host" due to the generified BundleContext API This was discovered when attempting to build it with a BREE of J2SE-1.5 Change-Id: Ief2740612449d2a1a5c58d6284d8b87c89262f8a Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF1
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties2
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF3
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties3
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java3
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/build.properties2
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/build.properties2
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/build.properties2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/build.properties2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/build.properties1
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/build.properties1
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.remoteservice/build.properties2
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/build.properties2
13 files changed, 2 insertions, 24 deletions
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF
index 2ff8655aa..b16d3a215 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 3.0.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.consumer.Activator
Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- J2SE-1.4,
CDC-1.1/Foundation-1.1
Import-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.identity;version="3.0.0",
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
index 83fd982e4..3ea0bbe63 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
@@ -9,5 +9,3 @@ bin.includes = META-INF/,\
src.includes = about.html,\
bundle.properties,\
products/
-jre.compilation.profile = J2SE-1.4
-javacTarget=jsr14
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF
index ed142c040..25f58e68b 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF
@@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.host;singleto
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.host.Activator
Bundle-Vendor: %bundleProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,
- J2SE-1.5,
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
CDC-1.1/Foundation-1.1
Import-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.identity;version="3.0.0",
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties
index 5bd94f200..3ea0bbe63 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties
@@ -9,6 +9,3 @@ bin.includes = META-INF/,\
src.includes = about.html,\
bundle.properties,\
products/
-jre.compilation.profile = J2SE-1.4
-javacTarget=jsr14
-javacSource=1.5
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java
index 0fe44903d..a8250b92c 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java
@@ -12,7 +12,6 @@ package org.eclipse.ecf.internal.examples.remoteservices.hello.host;
import java.util.Dictionary;
import java.util.Hashtable;
-import java.util.Properties;
import org.eclipse.ecf.examples.remoteservices.hello.IHello;
import org.eclipse.ecf.examples.remoteservices.hello.IHelloAsync;
@@ -61,7 +60,7 @@ public class HelloHostApplication implements IApplication,
// Setup properties for remote service distribution, as per OSGi 4.2
// remote services
// specification (chap 13 in compendium spec)
- Properties props = new Properties();
+ Dictionary props = new Hashtable();
// add OSGi service property indicated export of all interfaces exposed
// by service (wildcard)
props.put(IDistributionConstants.SERVICE_EXPORTED_INTERFACES,
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/build.properties
index ecda4d0c9..dd6a5dc60 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/build.properties
@@ -6,5 +6,3 @@ bin.includes = META-INF/,\
bundle.properties
src.includes = about.html,\
bundle.properties
-jre.compilation.profile = J2SE-1.4
-javacTarget=jsr14
diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/build.properties b/framework/bundles/org.eclipse.ecf.filetransfer/build.properties
index dd45fdd32..09a545d97 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/build.properties
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/build.properties
@@ -9,5 +9,3 @@ src.includes = about.html,\
schema/
jars.compile.order = .
source.. = src/
-jre.compilation.profile = J2SE-1.4
-javacWarnings.. = -assertIdentifier,-enumIdentifier
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/build.properties b/framework/bundles/org.eclipse.ecf.presence.ui/build.properties
index a80a9cb33..54160189e 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/build.properties
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/build.properties
@@ -9,5 +9,3 @@ bin.includes = META-INF/,\
schema/
src.includes = about.html,\
schema/
-jre.compilation.profile = J2SE-1.4
-javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/framework/bundles/org.eclipse.ecf.provider/build.properties b/framework/bundles/org.eclipse.ecf.provider/build.properties
index 7a0fd6349..af15676f5 100644
--- a/framework/bundles/org.eclipse.ecf.provider/build.properties
+++ b/framework/bundles/org.eclipse.ecf.provider/build.properties
@@ -17,5 +17,3 @@ src.includes = about.html
jars.compile.order = .
source.. = src/
output.. = bin/
-jre.compilation.profile = J2SE-1.4
-javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/build.properties b/providers/bundles/org.eclipse.ecf.provider.discovery/build.properties
index a496c6d87..a9d099b88 100644
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.discovery/build.properties
@@ -7,4 +7,3 @@ bin.includes = META-INF/,\
.options,\
about.html
src.includes = about.html
-jre.compilation.profile = J2SE-1.4
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/build.properties b/providers/bundles/org.eclipse.ecf.provider.filetransfer/build.properties
index a6081772c..0eae59e63 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/build.properties
@@ -9,4 +9,3 @@ src.includes = about.html,\
schema/
jars.compile.order = .
source.. = src/
-jre.compilation.profile = J2SE-1.4
diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/build.properties b/providers/bundles/org.eclipse.ecf.provider.remoteservice/build.properties
index 00411cbde..f67a5b601 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/build.properties
@@ -7,5 +7,3 @@ bin.includes = .,\
src.includes = about.html
jars.compile.order = .
source.. = src/
-jre.compilation.profile = J2SE-1.4
-javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/build.properties
index 7ef3e9fc2..f2f3df517 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/build.properties
@@ -2,5 +2,3 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,plugin.properties,\
.
-jre.compilation.profile = J2SE-1.4
-javacErrors.. = -assertIdentifier,-enumIdentifier

Back to the top