first pass at disentangling maven plugins

Author: jschneidereit

jdbc-grpc/pom.xml

@@ -34,13 +34,6 @@
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.salesforce.datacloud</groupId>
-            <artifactId>jdbc-proto</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
@@ -54,7 +47,7 @@
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                     <attachProtoSources>false</attachProtoSources>
-                    <protoSourceRoot>${project.parent.basedir}/jdbc-proto/src/main/proto</protoSourceRoot>
+                    <protoSourceRoot>${project.basedir}/../jdbc-proto/src/main/proto</protoSourceRoot>
                 </configuration>
                 <executions>
                     <execution>

jdbc-parent/pom.xml

@@ -28,12 +28,13 @@
         <java.version>1.8</java.version>
         <jjwt.version>0.12.6</jjwt.version>
         <lombok.version>1.18.34</lombok.version>
+        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
 
-        <maven.compiler.release>${java.version}</maven.compiler.release>
+        <maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
+
+        <maven.compiler.release>8</maven.compiler.release>
         <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.source>{java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven.compiler.target>{java.version}</maven.compiler.target>
         <mockito-bom.version>4.11.0</mockito-bom.version>
         <okhttp.version>4.12.0</okhttp.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -215,19 +216,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <dependencies>
-        <!--        <dependency>-->
-        <!--            <groupId>com.salesforce.datacloud</groupId>-->
-        <!--            <artifactId>jdbc-grpc</artifactId>-->
-        <!--            <version>${project.version}</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.salesforce.datacloud</groupId>-->
-        <!--            <artifactId>jdbc-slim</artifactId>-->
-        <!--            <version>${project.version}</version>-->
-        <!--        </dependency>-->
-    </dependencies>
-
     <build>
         <pluginManagement>
             <plugins>
@@ -236,6 +224,20 @@
                     <artifactId>jacoco-maven-plugin</artifactId>
                     <version>${jacoco.maven.plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                    <configuration>
+                        <showDeprecation>true</showDeprecation>
+                        <showWarnings>true</showWarnings>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.11.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

jdbc-proto/pom.xml

@@ -10,8 +10,20 @@
 
     <artifactId>jdbc-proto</artifactId>
 
+    <description>Salesforce Data Cloud Query API proto files</description>
+
     <properties>
         <rootDirectory>${project.basedir}/../</rootDirectory>
     </properties>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/proto</directory>
+                <includes>
+                    <include>**/*.proto</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
 </project>

jdbc-slim/pom.xml

@@ -14,6 +14,18 @@
         <rootDirectory>${project.basedir}/../</rootDirectory>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.salesforce.datacloud</groupId>
+                <artifactId>jdbc-grpc</artifactId>
+                <version>${project.version}</version>
+                <scope>provided</scope>
+                <optional>true</optional>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -68,8 +80,8 @@
         <dependency>
             <groupId>com.salesforce.datacloud</groupId>
             <artifactId>jdbc-grpc</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

jdbc/pom.xml

@@ -5,7 +5,7 @@
         <groupId>com.salesforce.datacloud</groupId>
         <artifactId>jdbc-parent</artifactId>
         <version>0.24.1-SNAPSHOT</version>
-        <!-- <relativePath>jdbc-parent</relativePath> -->
+         <relativePath>../jdbc-parent</relativePath>
     </parent>
 
     <artifactId>jdbc</artifactId>
@@ -14,7 +14,7 @@
     <description>Salesforce Data Cloud JDBC Driver</description>
 
     <properties>
-        <!-- <rootDirectory>${project.basedir}/../</rootDirectory> -->
+         <rootDirectory>${project.basedir}/../</rootDirectory>
     </properties>
 
     <dependencies>
@@ -45,12 +45,8 @@
                         <phase>package</phase>
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <!-- TODO: can we use the maven-shade-plugin to produce a jar com.salesforce.datacloud:jdbc that handles the provided/runtime issue with jdbc-grpc? -->
                             <shadedArtifactId>jdbc</shadedArtifactId>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <!--                            <extraArtifacts>-->
-                            <!--                                <artifact>com.salesforce.datacloud:jdbc-grpc:0.23.0-SNAPSHOT</artifact>-->
-                            <!--                            </extraArtifacts>-->
                             <relocations>
                                 <relocation>
                                     <pattern>com.salesforce.datacloud</pattern>

pom.xml

@@ -126,14 +126,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>