Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increment top-level features #85

Merged
merged 2 commits into from
Dec 2, 2023
Merged

Increment top-level features #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db72b26
Merge branch 'master' of https://github.com/scottslewis/ecf.git
scottslewis Dec 2, 2023
f07fc72
Merge branch 'eclipse:master' into master
scottslewis Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/bundles/org.eclipse.ecf.doc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<additionalArgument>-Xdoclint:none</additionalArgument>
<additionalArgument>-splitindex</additionalArgument>
<additionalArgument>-use</additionalArgument>
<additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.14.40 API"</additionalArgument>
<additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.40 API"</additionalArgument>
<additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.14.41 API"</additionalArgument>
<additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.41 API"</additionalArgument>
<additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
<additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
<additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.core/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.core"
label="ECF SDK for Eclipse"
version="3.14.40.qualifier"
version="3.14.41.qualifier"
provider-name="%providerName"
plugin="org.eclipse.ecf"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.core</artifactId>
<version>3.14.40-SNAPSHOT</version>
<version>3.14.41-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.remoteservice.sdk.feature"
label="ECF Remote Services SDK"
version="3.14.40.qualifier"
version="3.14.41.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId>
<version>3.14.40-SNAPSHOT</version>
<version>3.14.41-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.sdk/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.sdk"
label="%featureName"
version="3.14.40.qualifier"
version="3.14.41.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
76 changes: 38 additions & 38 deletions releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
name="ecf-remoteservices-sdk-3.14.40">
<feature name="ecf-rs-dependencies" version="3.14.40"
description="ECF 3.14.40 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
name="ecf-remoteservices-sdk-3.14.41">
<feature name="ecf-rs-dependencies" version="3.14.41"
description="ECF 3.14.41 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
<bundle>
mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0
</bundle>
Expand All @@ -16,9 +16,9 @@
<feature>eventadmin</feature>
</feature>

<feature name="ecf-rs-core" version="3.14.40"
<feature name="ecf-rs-core" version="3.14.41"
description="ECF Core">
<feature version="3.14.40">ecf-rs-dependencies</feature>
<feature version="3.14.41">ecf-rs-dependencies</feature>
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.identity</bundle>
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf</bundle>
<bundle>
Expand All @@ -34,16 +34,16 @@
mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
</bundle>
</feature>
<feature name="ecf-rs-console" version="3.14.40"
<feature name="ecf-rs-console" version="3.14.41"
description="ECF Console">
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.console</bundle>
<bundle>
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin.console
</bundle>
</feature>
<feature name="ecf-rs-rsa-impl" version="3.14.40"
<feature name="ecf-rs-rsa-impl" version="3.14.41"
description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
<feature version="3.14.40">ecf-rs-core</feature>
<feature version="3.14.41">ecf-rs-core</feature>
<bundle>
mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
</bundle>
Expand All @@ -54,28 +54,28 @@
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
</bundle>
</feature>
<feature name="ecf-rs-rsa-topology-manager" version="3.14.40"
<feature name="ecf-rs-rsa-topology-manager" version="3.14.41"
description="ECF RemoteServices OSGi R7 Default Topology Manager (promiscuous). See https://wiki.eclipse.org/Remote_Services_Admin">
<bundle>
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.distribution
</bundle>
</feature>
<feature name="ecf-rs-rsa" version="3.14.40"
description="ECF 3.14.40 Remote Service Admin">
<feature version="3.14.40">ecf-rs-rsa-impl</feature>
<feature version="3.14.40">ecf-rs-rsa-topology-manager</feature>
<feature name="ecf-rs-rsa" version="3.14.41"
description="ECF 3.14.41 Remote Service Admin">
<feature version="3.14.41">ecf-rs-rsa-impl</feature>
<feature version="3.14.41">ecf-rs-rsa-topology-manager</feature>
</feature>
<feature name="ecf-rs-distribution-generic" version="3.14.40"
<feature name="ecf-rs-distribution-generic" version="3.14.41"
description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
<feature version="3.14.40">ecf-rs-rsa</feature>
<feature version="3.14.41">ecf-rs-rsa</feature>
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.provider</bundle>
<bundle>
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.remoteservice
</bundle>
</feature>
<feature name="ecf-rs-distribution-rosgi" version="3.14.40"
<feature name="ecf-rs-distribution-rosgi" version="3.14.41"
description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
<feature version="3.14.40">ecf-rs-rsa</feature>
<feature version="3.14.41">ecf-rs-rsa</feature>
<bundle>mvn:org.eclipse.ecf/org.objectweb.asm</bundle>
<bundle>
mvn:org.eclipse.ecf/ch.ethz.iks.r_osgi.remote
Expand All @@ -85,56 +85,56 @@
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
</bundle>
</feature>
<feature name="ecf-rs-discovery-jmdns" version="3.14.40"
<feature name="ecf-rs-discovery-jmdns" version="3.14.41"
description="ECF RemoteServices JMDNS Discovery Provider">
<feature version="3.14.40">ecf-rs-rsa</feature>
<feature version="3.14.41">ecf-rs-rsa</feature>
<bundle>
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
</bundle>
</feature>
<feature name="ecf-rs-eventadmin" version="3.14.40"
description="ECF 3.14.40 RemoteServices SDK Distributed EventAdmin">
<feature version="3.14.40">ecf-rs-rsa</feature>
<feature name="ecf-rs-eventadmin" version="3.14.41"
description="ECF 3.14.41 RemoteServices SDK Distributed EventAdmin">
<feature version="3.14.41">ecf-rs-rsa</feature>
<bundle>
mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice.eventadmin
</bundle>
</feature>
<feature name="ecf-rs-examples-timeservice-api"
version="3.14.40"
version="3.14.41"
description="ECF RemoteService TimeService Example API. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
<bundle>
https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.async_2.1.100.v20200611-1508.jar
</bundle>
</feature>
<feature name="ecf-rs-examples-timeservice-host"
version="3.14.40"
version="3.14.41"
description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
<feature version="3.14.40">ecf-rs-examples-timeservice-api</feature>
<feature version="3.14.41">ecf-rs-examples-timeservice-api</feature>
<bundle>
https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.host_1.1.300.v20200611-1508.jar
</bundle>
</feature>
<feature name="ecf-rs-examples-timeservice-consumer-async"
version="3.14.40"
version="3.14.41"
description="ECF RemoteService TimeService Async Example Consumer. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
<feature version="3.14.40">ecf-rs-examples-timeservice-api</feature>
<feature version="3.14.41">ecf-rs-examples-timeservice-api</feature>
<bundle>
https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.consumer.ds.async_1.0.200.v20200611-1508.jar
</bundle>
</feature>
<feature name="ecf-rs-sdk" version="3.14.40"
description="ECF 3.14.40 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
<feature version="3.14.40">ecf-rs-distribution-generic</feature>
<feature version="3.14.40">ecf-rs-discovery-jmdns</feature>
<feature version="3.14.40">ecf-rs-console</feature>
<feature name="ecf-rs-sdk" version="3.14.41"
description="ECF 3.14.41 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
<feature version="3.14.41">ecf-rs-distribution-generic</feature>
<feature version="3.14.41">ecf-rs-discovery-jmdns</feature>
<feature version="3.14.41">ecf-rs-console</feature>
</feature>
<feature name="ecf-rs-sdk-examples-timeservicehost"
version="3.14.40"
description="ECF 3.14.40 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
<feature version="3.14.40">ecf-rs-distribution-generic</feature>
<feature version="3.14.40">ecf-rs-discovery-jmdns</feature>
<feature version="3.14.40">ecf-rs-console</feature>
<feature version="3.14.40">ecf-rs-examples-timeservice-host</feature>
version="3.14.41"
description="ECF 3.14.41 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
<feature version="3.14.41">ecf-rs-distribution-generic</feature>
<feature version="3.14.41">ecf-rs-discovery-jmdns</feature>
<feature version="3.14.41">ecf-rs-console</feature>
<feature version="3.14.41">ecf-rs-examples-timeservice-host</feature>
</feature>
<!-- Include etcd discovery provider -->
<repository>https://raw.githubusercontent.com/ECF/etcd-provider/master/build/karaf-features.xml</repository>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.ecf.releng.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.releng.repository</artifactId>
<version>3.14.40-SNAPSHOT</version>
<version>3.14.41-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<name>ECF p2 Repository</name>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.ecf.releng.target/ecf-2022-06.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<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">
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.bndtools</groupId>
Expand Down
Loading