Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2018-07-12 11:24:43 -0400
committerMat Booth2018-07-12 12:05:45 -0400
commit2fa5b87e1f0764f9abb081904ecba5b340c25893 (patch)
tree7994e36fa3184fb353e407d9492f7289e0d0af91 /framework/bundles/org.eclipse.ecf.identity/build.properties
parent2079b6f728aff28b5313cda5ddde29081e44a013 (diff)
downloadorg.eclipse.ecf-2fa5b87e1f0764f9abb081904ecba5b340c25893.tar.gz
org.eclipse.ecf-2fa5b87e1f0764f9abb081904ecba5b340c25893.tar.xz
org.eclipse.ecf-2fa5b87e1f0764f9abb081904ecba5b340c25893.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=534087
Allow ECF to build against both R6 and R7 implementations of the org.osgi.service.log API. This is accomplished by providing stubs of the new interfaces on the build-time classpath so that we can implement the new R7 methods without having unresolved classes on R6. The stubs are not shipped with the binary distribution of ECF, so in the actual ECF code we can use them as long as we avoid any explicit import statements to avoid runtime linkage errors on R6. Change-Id: Ib29135c030e3dd8a3bf799552a2f3144c26edfe3 Signed-off-by: Mat Booth <mat.booth@redhat.com>
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.identity/build.properties')
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/build.properties3
1 files changed, 3 insertions, 0 deletions
diff --git a/framework/bundles/org.eclipse.ecf.identity/build.properties b/framework/bundles/org.eclipse.ecf.identity/build.properties
index 7debffea9..48b7df20c 100644
--- a/framework/bundles/org.eclipse.ecf.identity/build.properties
+++ b/framework/bundles/org.eclipse.ecf.identity/build.properties
@@ -9,7 +9,9 @@
# Composent Inc. - initial API and implementation
###############################################################################
source.. = src/
+source.r7stubs.jar = src_r7stubs/
output.. = bin/
+jars.compile.order = r7stubs.jar,.
bin.includes = META-INF/,\
.,\
plugin.xml,\
@@ -18,3 +20,4 @@ bin.includes = META-INF/,\
plugin.properties
src.includes = about.html,\
schema/
+jars.extra.classpath=r7stubs.jar

Back to the top