Skip to content

Commit 4f34c7f

Browse files
KaviarasuSakthivadivelKaviarasuSakthivadivel
committed
Moving the files from src/main to jdbc-driver/main and fixed the build issues.
1 parent 52eb9d9 commit 4f34c7f

File tree

198 files changed

+231
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+231
-76
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ buildNumber.properties
1616
.mvn/wrapper/maven-wrapper.jar
1717
.project
1818
.classpath
19-
src/main/resources/config/config.properties
19+
jdbc-driver/src/main/resources/config/config.properties
2020

2121
*.iml
2222
pom.xml.bak

‎jdbc-driver/pom.xml‎

Lines changed: 178 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,190 @@
1717
</properties>
1818

1919
<dependencies>
20+
<dependency>
21+
<groupId>com.fasterxml.jackson.core</groupId>
22+
<artifactId>jackson-databind</artifactId>
23+
<version>${jackson.version}</version>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.google.guava</groupId>
27+
<artifactId>guava</artifactId>
28+
<version>${guava.version}</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>com.squareup.okhttp3</groupId>
32+
<artifactId>okhttp</artifactId>
33+
<version>${okhttp.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>io.jsonwebtoken</groupId>
37+
<artifactId>jjwt-api</artifactId>
38+
<version>${jjwt.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>javax.annotation</groupId>
42+
<artifactId>javax.annotation-api</artifactId>
43+
<version>1.3.2</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>net.jodah</groupId>
47+
<artifactId>failsafe</artifactId>
48+
<version>2.4.4</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.arrow</groupId>
52+
<artifactId>arrow-vector</artifactId>
53+
<version>${arrow.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.calcite.avatica</groupId>
57+
<artifactId>avatica</artifactId>
58+
<version>${avatica.version}</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.apache.commons</groupId>
62+
<artifactId>commons-lang3</artifactId>
63+
<version>${commons-lang3.version}</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.slf4j</groupId>
67+
<artifactId>slf4j-api</artifactId>
68+
<version>${slf4j.version}</version>
69+
</dependency>
2070
<dependency>
2171
<groupId>com.salesforce.datacloud</groupId>
2272
<artifactId>jdbc-grpc</artifactId>
23-
<version>0.23.0-SNAPSHOT</version>
73+
<version>${project.version}</version>
2474
<!-- TODO: make sure 'provided' doesn't break dbeaver, it allows you to pull in "optional" dependencies, but I don't know if this also means adding provided dependencies at runtime: https://dbeaver.com/docs/dbeaver/How-to-add-additional-artifacts-to-the-driver/#dependency-declaration -->
2575
<scope>provided</scope>
2676
</dependency>
77+
<dependency>
78+
<groupId>org.projectlombok</groupId>
79+
<artifactId>lombok</artifactId>
80+
<version>${lombok.version}</version>
81+
<scope>provided</scope>
82+
</dependency>
83+
<dependency>
84+
<groupId>io.jsonwebtoken</groupId>
85+
<artifactId>jjwt-impl</artifactId>
86+
<version>${jjwt.version}</version>
87+
<scope>runtime</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>io.jsonwebtoken</groupId>
91+
<artifactId>jjwt-jackson</artifactId>
92+
<version>${jjwt.version}</version>
93+
<scope>runtime</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.apache.arrow</groupId>
97+
<artifactId>arrow-memory-netty</artifactId>
98+
<version>${arrow.version}</version>
99+
<scope>runtime</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>com.squareup.okhttp3</groupId>
103+
<artifactId>mockwebserver</artifactId>
104+
<version>${okhttp.version}</version>
105+
<scope>test</scope>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.assertj</groupId>
109+
<artifactId>assertj-core</artifactId>
110+
<version>${assertj.version}</version>
111+
<scope>test</scope>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.grpcmock</groupId>
115+
<artifactId>grpcmock-junit5</artifactId>
116+
<version>${grpcmock-junit5.version}</version>
117+
<scope>test</scope>
118+
</dependency>
119+
<dependency>
120+
<groupId>org.junit.jupiter</groupId>
121+
<artifactId>junit-jupiter-api</artifactId>
122+
<version>${junit-bom.version}</version>
123+
<scope>test</scope>
124+
</dependency>
125+
<dependency>
126+
<groupId>org.junit.jupiter</groupId>
127+
<artifactId>junit-jupiter-engine</artifactId>
128+
<version>${junit-bom.version}</version>
129+
<scope>test</scope>
130+
</dependency>
131+
<dependency>
132+
<groupId>org.junit.jupiter</groupId>
133+
<artifactId>junit-jupiter-params</artifactId>
134+
<version>${junit-bom.version}</version>
135+
<scope>test</scope>
136+
</dependency>
137+
<dependency>
138+
<groupId>org.junit.platform</groupId>
139+
<artifactId>junit-platform-launcher</artifactId>
140+
<version>1.11.4</version>
141+
<scope>test</scope>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.mockito</groupId>
145+
<artifactId>mockito-inline</artifactId>
146+
<version>${mockito-bom.version}</version>
147+
<scope>test</scope>
148+
</dependency>
149+
<dependency>
150+
<groupId>org.mockito</groupId>
151+
<artifactId>mockito-junit-jupiter</artifactId>
152+
<version>${mockito-bom.version}</version>
153+
<scope>test</scope>
154+
</dependency>
155+
<dependency>
156+
<groupId>org.slf4j</groupId>
157+
<artifactId>slf4j-simple</artifactId>
158+
<version>${slf4j.version}</version>
159+
<scope>test</scope>
160+
</dependency>
27161
</dependencies>
28162

163+
<build>
164+
<resources>
165+
<resource>
166+
<filtering>false</filtering>
167+
<directory>src/main/resources</directory>
168+
</resource>
169+
<resource>
170+
<filtering>false</filtering>
171+
<directory>src/test/resources</directory>
172+
</resource>
173+
</resources>
174+
<plugins>
175+
<plugin>
176+
<groupId>org.apache.maven.plugins</groupId>
177+
<artifactId>maven-resources-plugin</artifactId>
178+
<version>3.2.0</version>
179+
<configuration>
180+
<delimiters>
181+
<delimiter>${*}</delimiter>
182+
</delimiters>
183+
</configuration>
184+
</plugin>
185+
<plugin>
186+
<groupId>org.projectlombok</groupId>
187+
<artifactId>lombok-maven-plugin</artifactId>
188+
<version>1.18.20.0</version>
189+
<executions>
190+
<execution>
191+
<id>delombok</id>
192+
<goals>
193+
<goal>delombok</goal>
194+
</goals>
195+
<configuration>
196+
<addOutputDirectory>false</addOutputDirectory>
197+
<sourceDirectory>jdbc-driver/src/main/java</sourceDirectory>
198+
<outputDirectory>${project.build.directory}/delombok</outputDirectory>
199+
</configuration>
200+
</execution>
201+
</executions>
202+
</plugin>
203+
</plugins>
204+
</build>
205+
29206
</project>

src/main/java/com/salesforce/datacloud/jdbc/DataCloudDatasource.java renamed to jdbc-driver/src/main/java/com/salesforce/datacloud/jdbc/DataCloudDatasource.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriver.java renamed to jdbc-driver/src/main/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriver.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettings.java renamed to jdbc-driver/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettings.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategy.java renamed to jdbc-driver/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategy.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudToken.java renamed to jdbc-driver/src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudToken.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessor.java renamed to jdbc-driver/src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessor.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/auth/OAuthToken.java renamed to jdbc-driver/src/main/java/com/salesforce/datacloud/jdbc/auth/OAuthToken.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpers.java renamed to jdbc-driver/src/main/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpers.java

File renamed without changes.

0 commit comments

Comments
 (0)