Skip to content

Commit

Permalink
Merge pull request #66 from scottslewis/master
Browse files Browse the repository at this point in the history
Added Bndtools Feature and plugin
  • Loading branch information
scottslewis authored Jul 28, 2023
2 parents 91ce6a8 + 8c0fa7d commit 3423e6b
Show file tree
Hide file tree
Showing 35 changed files with 2,601 additions and 33 deletions.
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,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>releng/features/org.eclipse.ecf.console.feature</module>
<module>releng/features/org.eclipse.ecf.core</module>
Expand Down Expand Up @@ -257,6 +258,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/org.eclipse.ecf.releng.target</module>
<module>releng/org.eclipse.ecf.releng.repository</module>
Expand Down
7 changes: 7 additions & 0 deletions releng/features/org.eclipse.ecf.core/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,11 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.ecf.remoteservices.tooling.bndtools"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ecf.remoteservices.tooling.bndtools.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=ISO-8859-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>

<p>June 25, 2008</p>
<h3>License</h3>

<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
bin.includes = feature.xml,\
about.html,\
feature.properties
src.includes = about.html,\
feature.xml,\
feature.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
############################################################################
# Copyright (c) 2014 Composent Inc., and others.
#
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
############################################################################
feature.name=ECF Bndtools Support
featureProvider=Eclipse.org - ECF

copyright=Copyright (c) 2023 Composent, Inc. and others.\n\
\n\
This program and the accompanying materials are made\n\
available under the terms of the Eclipse Public License 2.0\n\
which is available at https://www.eclipse.org/legal/epl-2.0/\n\
\n\
SPDX-License-Identifier: EPL-2.0\n
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature"
label="ECF Bndtools Support"
version="1.0.0.qualifier"
provider-name="%featureProvider">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
</license>

<plugin
id="org.eclipse.ecf.remoteservices.tooling.bndtools"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>ecf-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.remoteservices.tooling.bndtools.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
26 changes: 23 additions & 3 deletions releng/org.eclipse.ecf.releng.target/ecf-2022-06.target
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
<unit id="org.apache.httpcomponents.core5.httpcore5-h2.source" version="5.1.4.v20221013-1742"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20221112-0806"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20221112-0806"/>
<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
<unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
<unit id="com.sun.jna" version="4.5.1.v20210503-0343"/>
<unit id="com.sun.jna.source" version="4.5.1.v20210503-0343"/>
<unit id="com.sun.jna.source" version="4.5.1.v20210503-0343"/>
<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
<unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
<unit id="com.sun.jna.platform" version="4.5.1.v20221112-0806"/>
<unit id="com.sun.jna.platform.source" version="4.5.1.v20221112-0806"/>
<unit id="com.sun.jna.platform" version="5.8.0.v20221112-0806"/>
Expand All @@ -67,5 +67,25 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
</location>
<location includeDependencyDepth="none" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>bndtools.core</artifactId>
<version>7.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
<version>7.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>
Loading

0 comments on commit 3423e6b

Please sign in to comment.