Redshift driver downgrade (#1943)

* redshift driver was downgraded to 1.2.10.1009 (#1939) Co-authored-by: Sergey Suvorov <[email protected]> (cherry picked from commit 5454d85)
OHDSI · Nov 8, 2021 · 6dd91a8 · 6dd91a8
1 parent 5a689cb
commit 6dd91a8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 44 deletions.
diff --git a/pom.xml b/pom.xml
@@ -520,8 +520,8 @@
       </dependency>
       <dependency>
         <groupId>com.amazon.redshift</groupId>
-        <artifactId>redshift-jdbc42</artifactId>
-        <version>2.0.0.7</version>
+        <artifactId>redshift-jdbc42-no-awssdk</artifactId>
+        <version>1.2.10.1009</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -903,48 +903,7 @@
     </dependency>
     <dependency>
       <groupId>com.amazon.redshift</groupId>
-      <artifactId>redshift-jdbc42</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-core</artifactId>
-      <version>1.12.48</version>
-      <exclusions>
-        <exclusion>
-          <groupId>software.amazon.ion</groupId>
-          <artifactId>ion-java</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.amazonaws</groupId>
-          <artifactId>jmespath-java</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-redshift</artifactId>
-      <version>1.12.48</version>
-      <exclusions>
-        <exclusion>
-          <groupId>software.amazon.ion</groupId>
-          <artifactId>ion-java</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.amazonaws</groupId>
-          <artifactId>jmespath-java</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-sts</artifactId>
-      <version>1.12.48</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.amazonaws</groupId>
-          <artifactId>jmespath-java</artifactId>
-        </exclusion>
-      </exclusions>
+      <artifactId>redshift-jdbc42-no-awssdk</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
@@ -1664,6 +1623,38 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>webapi-redshift</id>
+      <properties>
+        <!-- Redshift driver path -->
+        <redshift.classpath>...path/to/redshift/jdbc/drivers...</redshift.classpath>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-java-sdk-core</artifactId>
+          <version>1.11.118</version>
+        </dependency>
+
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-java-sdk-redshift</artifactId>
+          <version>1.11.118</version>
+        </dependency>
+
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-java-sdk-sts</artifactId>
+          <version>1.11.118</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-runtime</artifactId>
+          <version>4.8-1</version>
+        </dependency>
+      </dependencies>
+    </profile>
     <profile>
       <id>webapi-gis</id>
       <properties>

diff --git a/src/main/java/org/ohdsi/webapi/DataAccessConfig.java b/src/main/java/org/ohdsi/webapi/DataAccessConfig.java
@@ -92,6 +92,7 @@ public DataSource primaryDataSource() {
         // Redshift driver can be loaded first because it is mentioned in manifest file -
         // put the redshift driver at the end so that it doesn't
         // conflict with postgres queries
+        // Change redshift driver to aws sdk version
         java.util.Enumeration<Driver> drivers =  DriverManager.getDrivers();
         while (drivers.hasMoreElements()) {
             Driver d = drivers.nextElement();