Merge pull request #157 from scottslewis/master

Add bndtools plugin and feature

pom.xml

@@ -181,7 +181,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>
@@ -211,7 +211,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>

releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.properties

@@ -7,8 +7,8 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 ############################################################################
-feature.name=ECF Bndtools Support
-featureProvider=Eclipse.org - ECF
+featureName=ECF Bndtools Support
+providerName=Eclipse.org - ECF
 
 copyright=Copyright (c) 2024 Composent, Inc. and others.\n\
 \n\

releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml

@@ -2,11 +2,13 @@
 <feature
       id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature"
       label="ECF Remote Services Bndtools Support"
-      version="1.2.0.qualifier"
-      provider-name="Eclipse.org - ECF">
+      version="1.3.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
 
    <description url="http://www.eclipse.org/ecf">
-      This feature provides the ECF Remote Services Bndtools Support bundle.  This bundle provides ECF Remote Services support and UI for Bndtools 7.1+.
+      This feature provides the ECF Remote Services Bndtools 7.1+ Support bundle.
    </description>
 
    <copyright>
@@ -23,9 +25,6 @@
 
    <plugin
          id="org.eclipse.ecf.remoteservices.tooling.bndtools"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>

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.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

releng/org.eclipse.ecf.releng.target/ecf-2024-06.target

@@ -69,6 +69,10 @@
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
       <repository location="https://download.eclipse.org/eclipse/updates/4.32/R-4.32-202406010610"/>
     </location>
+	  <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		  <repository location="https://bndtools.org/bndtools.p2.repo/7.1.0/"/>
+		  <unit id="bndtools.main.feature.feature.group" version="7.1.0.REL-202411251545-g47e504d"/>
+	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
 		  <dependencies>
 			  <dependency>
@@ -79,5 +83,15 @@
 			  </dependency>
 		  </dependencies>
 	  </location>
+	  <location includeDependencyDepth="none" includeSource="true" missingManifest="generate" type="Maven">
+		  <dependencies>
+			  <dependency>
+				  <groupId>org.eclipse.jgit</groupId>
+				  <artifactId>org.eclipse.jgit</artifactId>
+				  <version>7.0.0.202409031743-r</version>
+				  <type>jar</type>
+			  </dependency>
+		  </dependencies>
+	  </location>
   </locations>
 </target>

tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/.classpath

@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF

@@ -2,18 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.remoteservices.tooling.bndtools;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
 Import-Package: org.eclipse.core.resources,
  org.eclipse.jface.resource,
  org.osgi.service.component.annotations;version="1.3.0";resolution:=optional
-Bundle-Activator: org.eclipse.ecf.remoteservices.tooling.bndtools.Activator
 Bundle-Vendor: %plugin.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.workbench,
- org.eclipse.swt,
- bndtools.core;bundle-version="7.1.0"
+ org.eclipse.swt
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.ecf.remoteservices.tooling.bndtools
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Service-Component: OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml

tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties

@@ -2,9 +2,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/,\
                plugin.properties,\
-               about.html,\
                plugin.xml
 src.includes = ECF Remote Service Bndtools Tooling.launch,\
                about.html

tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml

@@ -5,10 +5,10 @@
   <parent>
     <groupId>org.eclipse.ecf</groupId>
     <artifactId>ecf-parent</artifactId>
-    <version>1.0.100-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservices.tooling.bndtools</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>