ref #7079, #7076 Add nebula composite table as update site dependency

 - after removing the filter for the update site (#7079) the nebula
composite table can be added as an update site dependency

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index dde32b9a5669a347ac76c3ca456ba35808b0ffcd..ff197977e6fb172b616fbb3981bcc5286d1ccc19 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.1.jar"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index c51d1e3a965d6e0a3f38b00bea2eab45f7506ef1..0030a681f39f290fcb8445b5083979d84fabc4a9 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -408,7 +408,6 @@ Export-Package: com.google.api,
  org.apache.lucene.util.packed,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
- org.eclipse.nebula.widgets.compositetable,
  org.h2.jdbc,
  org.hamcrest,
  org.hibernate,
@@ -861,6 +860,5 @@ Bundle-ClassPath: .,
  lib/lucene-analyzers-3.6.2.jar,
  lib/lucene-analyzers-common-5.4.1.jar,
  lib/lucene-sandbox-5.4.1.jar,
- lib/lucene-suggest-5.4.1.jar,
- lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar
+ lib/lucene-suggest-5.4.1.jar
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index dd867b4b870b3746396560a28d3d38c13f3d162c..793e3329960875bb2f8130be1a40bed88dacc223 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -220,8 +220,7 @@ bin.includes = META-INF/,\
                lib/lucene-analyzers-3.6.2.jar,\
                lib/lucene-analyzers-common-5.4.1.jar,\
                lib/lucene-sandbox-5.4.1.jar,\
-               lib/lucene-suggest-5.4.1.jar,\
-               lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar
+               lib/lucene-suggest-5.4.1.jar
 
 jars.compile.order = .
 output.. = bin/

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar
deleted file mode 100644 (file)
index e3d917c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 126ce0a22dd50b65dc33ef2091d049bf5fcbd949..e376141f79ffc351d4d037549233e10337ae0539 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -89,7 +89,8 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
  org.eclipse.e4.core.contexts;bundle-version="1.5.1",
  org.eclipse.osgi.services,
- org.eclipse.e4.core.services
+ org.eclipse.e4.core.services,
+ org.eclipse.nebula.widgets.compositetable;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: eu.etaxonomy.taxeditor.webapp,

diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target
index 2b7c76d1b06e732cba5ccebdd9a621e84a365f2d..00d154427f90902337e54106d26224926a62c66a 100644 (file)
--- a/eu.etaxonomy.taxeditor/rcp.target
+++ b/eu.etaxonomy.taxeditor/rcp.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="46">
+<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="47">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>
@@ -69,6 +69,10 @@
 <unit id="org.eclipse.oomph.setup.sdk.feature.group" version="1.7.0.v20170305-1123"/>
 <repository location="http://download.eclipse.org/releases/neon"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201711021145"/>
+<repository location="http://download.eclipse.org/nebula/releases/latest/"/>
+</location>
 </locations>
 <includeBundles>
 <feature id="org.eclipse.core.runtime.feature"/>
@@ -168,6 +172,7 @@
 <feature id="org.eclipse.help.source"/>
 <feature id="org.eclipse.jdt"/>
 <feature id="org.eclipse.jdt.source"/>
+<feature id="org.eclipse.nebula.widgets.compositetable.feature"/>
 <feature id="org.eclipse.nebula.widgets.nattable.core.feature"/>
 <feature id="org.eclipse.nebula.widgets.nattable.core.source.feature"/>
 <feature id="org.eclipse.nebula.widgets.nattable.extension.e4.feature"/>