From ecc070e0ea3e6a8e99589616889bff962538c770 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 12 Jun 2017 15:37:55 +0530
Subject: [PATCH] Removed siddhi gpl geo plugin dependencies

---
 .../org.wso2.gpl.siddhi.extension.geo.feature/pom.xml      | 7 +++----
 .../resources/scripts/gpl-siddhi-geo-extention/pom.xml     | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/org.wso2.gpl.siddhi.extension.geo.feature/pom.xml b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/org.wso2.gpl.siddhi.extension.geo.feature/pom.xml
index a16260115..5a460b388 100644
--- a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/org.wso2.gpl.siddhi.extension.geo.feature/pom.xml
+++ b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/org.wso2.gpl.siddhi.extension.geo.feature/pom.xml
@@ -34,8 +34,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.gpl.siddhi.extensions</groupId>
-            <artifactId>org.wso2.gpl.siddhi.extension.geo.plugin</artifactId>
+            <groupId>org.wso2.extension.siddhi.gpl.execution.geo</groupId>
+            <artifactId>siddhi-gpl-execution-geo-feature</artifactId>
             <version>${org.wso2.gpl.siddhi.extensions.version}</version>
         </dependency>
         <dependency>
@@ -67,8 +67,7 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.wso2.gpl.siddhi.extensions:org.wso2.gpl.siddhi.extension.geo.plugin:${org.wso2.gpl.siddhi.extensions.version}</bundleDef>
-                                <!--<bundleDef>com.google.code.gson:gson</bundleDef>-->
+                                <bundleDef>org.wso2.extension.siddhi.gpl.execution.geo:siddhi-gpl-execution-geo-feature:${org.wso2.gpl.siddhi.extensions.version}</bundleDef>
                                 <bundleDef>org.wso2.orbit.org.geotools:gt-geojson:${gt-geojson.version}</bundleDef>
                             </bundles>
                         </configuration>
diff --git a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/pom.xml b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/pom.xml
index 88079befc..2cec4a717 100644
--- a/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/pom.xml
+++ b/components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/src/main/resources/scripts/gpl-siddhi-geo-extention/pom.xml
@@ -39,7 +39,6 @@
 
     <modules>
         <module>org.wso2.orbit.org.geotools.gt-geojson</module>
-        <module>org.wso2.gpl.siddhi.extension.geo.plugin</module>
         <module>org.wso2.gpl.siddhi.extension.geo.feature</module>
     </modules>
 
@@ -262,7 +261,7 @@
     </build>
 
     <properties>
-        <org.wso2.gpl.siddhi.extensions.version>3.1.0-SNAPSHOT</org.wso2.gpl.siddhi.extensions.version>
+        <org.wso2.gpl.siddhi.extensions.version>3.2.0</org.wso2.gpl.siddhi.extensions.version>
         <gt-geojson.version>13.6.0.wso2v1</gt-geojson.version>
         <siddhi.version>3.1.1</siddhi.version>
         <junit.version>4.10</junit.version>