From e80d7307e1ca990f3f5f8e0132d4b2162fb9d25e Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 25 Sep 2018 23:22:54 +0300
Subject: [PATCH] Include org.simantics.jdbc.feature in SDK repository

gitlab #125

Change-Id: I285dbda38ac238002b7edf1c22340c2c96085f32
---
 bundles/pom.xml                                 |  2 ++
 features/org.simantics.jdbc.feature/feature.xml | 15 ++++-----------
 features/org.simantics.sdk.feature/feature.xml  |  4 ++++
 features/pom.xml                                |  1 +
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 04b6311eb..9e409d9df 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -153,6 +153,8 @@
 		<module>org.simantics.issues.ontology</module>
 		<module>org.simantics.issues.ui</module>
 		<module>org.simantics.issues.ui.ontology</module>
+		<module>org.simantics.jdbc</module>
+		<module>org.simantics.jdbc.ontology</module>
 		<module>org.simantics.layer0</module>
 		<module>org.simantics.layer0.utils</module>
 		<module>org.simantics.layer0x.ontology</module>
diff --git a/features/org.simantics.jdbc.feature/feature.xml b/features/org.simantics.jdbc.feature/feature.xml
index 66b53fac8..1665527b2 100644
--- a/features/org.simantics.jdbc.feature/feature.xml
+++ b/features/org.simantics.jdbc.feature/feature.xml
@@ -16,14 +16,7 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="org.simantics.jdbc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
+  <plugin
          id="org.simantics.simulator.toolkit"
          download-size="0"
          install-size="0"
@@ -45,14 +38,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.simantics.jdbc.ontology"
+         id="org.simantics.jdbc"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+ 
    <plugin
-         id="org.simantics.jdbc.simupedia.sharedlibrary"
+         id="org.simantics.jdbc.ontology"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index 00a3b68b0..ff6c75f80 100644
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -224,6 +224,10 @@
          id="org.simantics.logging.ui.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.simantics.jdbc.feature"
+         version="0.0.0"/>
+
    <plugin
          id="org.simantics.fileimport"
          download-size="0"
diff --git a/features/pom.xml b/features/pom.xml
index 4c19ccca4..2503989cf 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -113,6 +113,7 @@
         <module>org.simantics.image.feature</module>
         <module>org.simantics.issues.feature</module>
         <module>org.simantics.issues.ui.feature</module>
+        <module>org.simantics.jdbc.feature</module>
         <module>org.simantics.layer0.feature</module>
         <module>org.simantics.logging.feature</module>
         <module>org.simantics.logging.ui.feature</module>
-- 
2.43.2