Merge pull request #98 from scottslewis/master

Added bndtools support functionality and removed bndtools support from build
eclipse · Apr 4, 2024 · 81f811a · 81f811a
2 parents 5fb3d40 + 14a0676
commit 81f811a
Show file tree

Hide file tree

Showing 13 changed files with 202 additions and 974 deletions.
diff --git a/pom.xml b/pom.xml
@@ -208,7 +208,7 @@
     <module>tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution.r-osgi</module>
 
     <module>tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde</module>
-    <module>tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools</module>
+<!--    <module>tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools</module>-->
 
     <module>releng/features/org.eclipse.ecf.console.feature</module>
     <module>releng/features/org.eclipse.ecf.core</module>
@@ -244,7 +244,7 @@
     <module>releng/features/org.eclipse.ecf.tests.feature</module>
     <module>releng/features/org.eclipse.ecf.tests.filetransfer.feature</module>
     <module>releng/features/org.eclipse.ecf.xmpp.feature</module>
-    <module>releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature</module>
+<!--    <module>releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature</module>-->
 
     <module>releng/org.eclipse.ecf.releng.target</module>
     <module>releng/org.eclipse.ecf.releng.repository</module>

diff --git a/releng/features/org.eclipse.ecf.core/feature.xml b/releng/features/org.eclipse.ecf.core/feature.xml
@@ -209,11 +209,11 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+<!--   <plugin
          id="org.eclipse.ecf.remoteservices.tooling.bndtools"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+-->
 </feature>
diff --git a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature"
-      label="ECF Bndtools Support"
-      version="1.1.0.qualifier"
+      label="ECF Remote Services Bndtools Support"
+      version="1.2.0.qualifier"
       provider-name="%featureProvider">
 
    <description url="http://www.example.com/description">
@@ -17,6 +17,10 @@
       [Enter License Description here.]
    </license>
 
+   <requires>
+      <import feature="bndtools.main.feature" version="7.1.0" match="compatible"/>
+   </requires>
+
    <plugin
          id="org.eclipse.ecf.remoteservices.tooling.bndtools"
          download-size="0"

diff --git a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservices.tooling.bndtools.feature</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
@@ -129,13 +129,13 @@
    <feature id="org.eclipse.ecf.xmpp.feature.source" version="0.0.0">
       <category name="other"/>
    </feature>
-   <feature id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature">
+<!--   <feature id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature">
       <category name="bndtools"/>
    </feature>
-   <category-def name="sdk" label="ECF SDK for Eclipse"/>
+-->   <category-def name="sdk" label="ECF SDK for Eclipse"/>
    <category-def name="core" label="ECF Core Features"/>
    <category-def name="core sources" label="ECF Core Source Features"/>
    <category-def name="remoteservices" label="ECF Remote Services SDK"/>
    <category-def name="other" label="Other ECF Features"/>
-   <category-def name="bndtools" label="ECF Bndtools Core Support"/>
-</site>
+<!--   <category-def name="bndtools" label="ECF Bndtools Core Support"/>
+--></site>