From 621ff6f7259f51c3d3f13ba0dd01b27e5587e04c Mon Sep 17 00:00:00 2001
From: Mat Booth
Date: Wed, 23 Nov 2016 11:13:48 +0000
Subject: Bug 508039 - [releng] build "com.mycorp.examples.timeservice.async"

Add the bundle to the build so that karaf maven installations work
correctly. Also add the bundle to the examples feature (so it gets
published in the p2 repo) so that karaf http installations work
correctly.

Fix also the incorrect bundle version in the manifest, since
previously this bundle was published with a version of 2.0.0.

Change-Id: Ideb322b3ba52935e307c317a8a1bc311cd5fb669
Signed-off-by: Mat Booth <mat.booth@redhat.com>
---
 .../META-INF/MANIFEST.MF                                  |  2 +-
 .../bundles/com.mycorp.examples.timeservice.async/pom.xml | 15 +++++++++++++++
 pom.xml                                                   |  1 +
 .../feature.xml                                           |  7 +++++++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 examples/bundles/com.mycorp.examples.timeservice.async/pom.xml

diff --git a/examples/bundles/com.mycorp.examples.timeservice.async/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.async/META-INF/MANIFEST.MF
index 41f0c112c..0508ac59c 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.async/META-INF/MANIFEST.MF
+++ b/examples/bundles/com.mycorp.examples.timeservice.async/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECF RS Example Timeservice Async API
 Bundle-SymbolicName: com.mycorp.examples.timeservice.async
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse.org - ECF
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.mycorp.examples.timeservice;version="2.0.0"
diff --git a/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml
new file mode 100644
index 000000000..3bd3322d7
--- /dev/null
+++ b/examples/bundles/com.mycorp.examples.timeservice.async/pom.xml
@@ -0,0 +1,15 @@
+<?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>
+  <groupId>org.eclipse.ecf</groupId>
+  <artifactId>com.mycorp.examples.timeservice.async</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/pom.xml b/pom.xml
index 709da3ebf..cebabd5c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
     <module>doc/bundles/org.eclipse.ecf.doc</module>
 
     <module>examples/bundles/com.mycorp.examples.timeservice</module>
+    <module>examples/bundles/com.mycorp.examples.timeservice.async</module>
     <module>examples/bundles/com.mycorp.examples.timeservice.consumer</module>
     <module>examples/bundles/com.mycorp.examples.timeservice.consumer.ds</module>
     <module>examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery</module>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
index ff7dce72f..b976456c5 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
@@ -131,6 +131,13 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.mycorp.examples.timeservice.async"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.mycorp.examples.timeservice.provider.rest.consumer"
          download-size="0"
-- 
cgit v1.2.3