Skip to content

Commit 52eb9d9

Browse files
committed
start proto library extraction
1 parent a1e5d3c commit 52eb9d9

File tree

5 files changed

+383
-264
lines changed

5 files changed

+383
-264
lines changed

jdbc-driver/pom.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.salesforce.datacloud</groupId>
6+
<artifactId>jdbc-parent</artifactId>
7+
<version>0.23.0-SNAPSHOT</version>
8+
</parent>
9+
10+
<!-- TODO: should we name this jdbc-driver, and have another package that includes jdbc, jdbc-grpc, etc. for ease of use? -->
11+
<artifactId>jdbc-driver</artifactId>
12+
13+
<properties>
14+
<maven.compiler.source>${java.version}</maven.compiler.source>
15+
<maven.compiler.target>${java.version}</maven.compiler.target>
16+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
</properties>
18+
19+
<dependencies>
20+
<dependency>
21+
<groupId>com.salesforce.datacloud</groupId>
22+
<artifactId>jdbc-grpc</artifactId>
23+
<version>0.23.0-SNAPSHOT</version>
24+
<!-- 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 -->
25+
<scope>provided</scope>
26+
</dependency>
27+
</dependencies>
28+
29+
</project>

jdbc-grpc/pom.xml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.salesforce.datacloud</groupId>
6+
<artifactId>jdbc-parent</artifactId>
7+
<version>0.23.0-SNAPSHOT</version>
8+
</parent>
9+
10+
<artifactId>jdbc-grpc</artifactId>
11+
12+
<properties>
13+
<maven.compiler.source>${java.version}</maven.compiler.source>
14+
<maven.compiler.target>${java.version}</maven.compiler.target>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
</properties>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>io.grpc</groupId>
21+
<artifactId>grpc-netty</artifactId>
22+
</dependency>
23+
<dependency>
24+
<groupId>io.grpc</groupId>
25+
<artifactId>grpc-protobuf</artifactId>
26+
</dependency>
27+
<dependency>
28+
<groupId>io.grpc</groupId>
29+
<artifactId>grpc-stub</artifactId>
30+
</dependency>
31+
</dependencies>
32+
33+
<build>
34+
<plugins>
35+
<plugin>
36+
<groupId>org.xolstice.maven.plugins</groupId>
37+
<artifactId>protobuf-maven-plugin</artifactId>
38+
<version>0.6.1</version>
39+
<configuration>
40+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
41+
<pluginId>grpc-java</pluginId>
42+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
43+
<attachProtoSources>false</attachProtoSources>
44+
</configuration>
45+
<executions>
46+
<execution>
47+
<goals>
48+
<goal>compile</goal>
49+
<goal>compile-custom</goal>
50+
</goals>
51+
</execution>
52+
</executions>
53+
</plugin>
54+
</plugins>
55+
</build>
56+
</project>
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)