From 6e3d404610f22f808acc415069e52cd73f99cfd3 Mon Sep 17 00:00:00 2001
From: "balazs.zsoldos" <balazs.zsoldos@everit.biz>
Date: Thu, 19 Jun 2014 12:20:26 +0200
Subject: [PATCH 1/4] Clean out querydsl-sql dependencies

 - make querydsl-spatial optional (in my opinion sql-spatial should be a
   separate module)
 - remove com.vividsolutions:jts dependency: I do not know why it is
   there. All tests run well and compilation ok if I remove it
 - replace javax.validation to a version that contains OSGi manifest
   headers
 - replace javax.inject to the servicemix bundle as it contains OSGi
   headers
 - make javax.inject optional
 - make postgresql dependency optional
 - make postgis dependency optional
 - make oracle dependencies optiona
---
 querydsl-sql/pom.xml | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 2c8dd3404..572f3eeee 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_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>
 
@@ -29,13 +29,7 @@
       <groupId>com.mysema.querydsl</groupId>
       <artifactId>querydsl-spatial</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.vividsolutions</groupId>
-      <artifactId>jts</artifactId>
-      <version>1.10</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>joda-time</groupId>
@@ -45,7 +39,7 @@
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
-      <version>1.0.0.GA</version>
+      <version>1.1.0.Final</version>
     </dependency>
        
     <dependency>
@@ -55,13 +49,14 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-        <scope>provided</scope>      
+      <scope>provided</scope>      
     </dependency>    
     
     <dependency>  
-      <groupId>javax.inject</groupId>  
-      <artifactId>javax.inject</artifactId>  
-      <version>1</version>  
+      <groupId>org.apache.servicemix.bundles</groupId>  
+      <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>  
+      <version>1_2</version>
+      <optional>true</optional>
     </dependency>    
 
     <!-- test -->
@@ -88,25 +83,25 @@
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <version>${postgresql.version}</version>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.postgis</groupId>
       <artifactId>postgis-jdbc</artifactId>
       <version>1.3.3</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.oracle</groupId>
       <artifactId>ojdbc6</artifactId>
       <version>${oracle.version}</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>oracle</groupId>
       <artifactId>sdoapi</artifactId>
       <version>11.2.0</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.jtds</groupId>
@@ -314,4 +309,4 @@
     </repository>
   </repositories>
   
-</project>
+</project>

From 1cff534dc24839fdc0b0a9e667d5caa841034f9c Mon Sep 17 00:00:00 2001
From: "balazs.zsoldos" <balazs.zsoldos@everit.biz>
Date: Thu, 19 Jun 2014 15:54:11 +0200
Subject: [PATCH 2/4] Putting back vividsolutions dependency with provided
 scope

---
 querydsl-sql/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 572f3eeee..6ab9a4cd3 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -31,6 +31,12 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.vividsolutions</groupId>
+      <artifactId>jts</artifactId>
+      <version>1.10</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>

From f6c19e5f9b3fa9f706f08d628a64d545ecc514e2 Mon Sep 17 00:00:00 2001
From: "balazs.zsoldos" <balazs.zsoldos@everit.biz>
Date: Thu, 19 Jun 2014 21:56:19 +0200
Subject: [PATCH 3/4] Putting javax.inject back in its original form

---
 querydsl-sql/pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 6ab9a4cd3..f447b89f4 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -59,10 +59,9 @@
     </dependency>    
     
     <dependency>  
-      <groupId>org.apache.servicemix.bundles</groupId>  
-      <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>  
-      <version>1_2</version>
-      <optional>true</optional>
+      <groupId>javax.inject</groupId>  
+      <artifactId>javax.inject</artifactId>  
+      <version>1</version> 
     </dependency>    
 
     <!-- test -->

From 28f76e8331ab7d52ba03897b66a1d08e6926f86a Mon Sep 17 00:00:00 2001
From: "balazs.zsoldos" <balazs.zsoldos@everit.biz>
Date: Thu, 19 Jun 2014 22:38:19 +0200
Subject: [PATCH 4/4] Changed back javax.inject dependency to servicemix bundle

---
 querydsl-sql/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index f447b89f4..edcc1f6ed 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -59,9 +59,9 @@
     </dependency>    
     
     <dependency>  
-      <groupId>javax.inject</groupId>  
-      <artifactId>javax.inject</artifactId>  
-      <version>1</version> 
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>
+      <version>1_2</version>
     </dependency>    
 
     <!-- test -->