fix multimodule deploy (forcedotcom#22)

Author: jschneidereit

.github/workflows/build.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ "main" ]
 
+env:
+  MAVEN_ARGS: --batch-mode --no-transfer-progress -V -e -Dstyle.color=always
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -22,7 +25,8 @@ jobs:
       - name: Get hyperd version
         id: evaluate-property
         run: |
-          echo "HYPER_VERSION=$(mvn help:evaluate -Dexpression=hyperapi.version -q -DforceStdout)" >> $GITHUB_ENV
+          HYPER_VERSION=$(grep "<hyperapi.version>" pom.xml | sed -n 's/.*<hyperapi.version>\(.*\)<\/hyperapi.version>.*/\1/p')
+          echo "HYPER_VERSION=$HYPER_VERSION" >> $GITHUB_ENV
       - name: Cache hyperd
         uses: actions/cache@v3
         with:
@@ -32,4 +36,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-hyper-${{ env.HYPER_VERSION }}
       - name: Maven package
-        run: mvn --batch-mode --no-transfer-progress clean package --file pom.xml
+        run: mvn $MAVEN_ARGS clean package --file pom.xml

.github/workflows/release.yml

@@ -4,10 +4,12 @@ on:
   release:
     types: [ "created" ]
 
+env:
+  MAVEN_ARGS: --batch-mode --no-transfer-progress -V -e -Dstyle.color=always
+
 jobs:
-  build:
+  release:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 8
@@ -23,7 +25,8 @@ jobs:
       - name: Get hyperd version
         id: evaluate-property
         run: |
-          echo "HYPER_VERSION=$(mvn help:evaluate -Dexpression=hyperapi.version -q -DforceStdout)" >> $GITHUB_ENV
+          HYPER_VERSION=$(grep "<hyperapi.version>" pom.xml | sed -n 's/.*<hyperapi.version>\(.*\)<\/hyperapi.version>.*/\1/p')
+          echo "HYPER_VERSION=$HYPER_VERSION" >> $GITHUB_ENV
       - name: Cache hyperd
         uses: actions/cache@v3
         with:
@@ -33,9 +36,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-hyper-${{ env.HYPER_VERSION }}
       - name: Set version
-        run: mvn versions:set --no-transfer-progress -DnewVersion=${{ github.event.release.tag_name }}
-      - name: Build with Maven
-        run: mvn --batch-mode --no-transfer-progress clean deploy -P release --file pom.xml
+        run: mvn $MAVEN_ARGS versions:set -DnewVersion=${{ github.event.release.tag_name }}
+      - name: Deploy with Maven
+        run: mvn $MAVEN_ARGS clean deploy -Prelease --file pom.xml
         env:
           MAVEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}

.gitignore

@@ -21,4 +21,6 @@ jdbc-driver/src/main/resources/config/config.properties
 
 *.iml
 pom.xml.bak
-.codegenie
+.codegenie
+
+.vscode

jdbc-grpc/pom.xml

@@ -4,23 +4,18 @@
     <parent>
         <groupId>com.salesforce.datacloud</groupId>
         <artifactId>jdbc-parent</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
+        <relativePath>../jdbc-parent</relativePath>
     </parent>
 
     <artifactId>jdbc-grpc</artifactId>
 
     <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>false</maven.deploy.skip>
+        <rootDirectory>${project.basedir}/../</rootDirectory>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.salesforce.datacloud</groupId>
-            <artifactId>jdbc-proto</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
@@ -40,17 +35,37 @@
     </dependencies>
 
     <build>
+        <sourceDirectory>${project.build.directory}/generated-sources/protobuf</sourceDirectory>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${build-helper-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-sources/protobuf/grpc-java</source>
+                                <source>${project.build.directory}/generated-sources/protobuf/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.6.1</version>
+                <version>${protobuf-maven-plugin.version}</version>
                 <configuration>
                     <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
                     <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>
@@ -61,6 +76,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <doclint>none</doclint>
+                    <additionalJOption>-Xdoclint:none</additionalJOption>
+                    <sourcepath>${project.build.directory}/generated-sources/protobuf/java;${project.build.directory}/generated-sources/protobuf/grpc-java;</sourcepath>
+                    <source>${java.version}</source>
+                    <quiet>true</quiet>
+                    <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
+                    <failOnWarnings>false</failOnWarnings>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>