Skip to content

Commit 78ad237

Browse files
jschneidereitjschneidereit
committed
test packaging and publishing changes
1 parent 4e46fbb commit 78ad237

File tree

7 files changed

+203
-138
lines changed

7 files changed

+203
-138
lines changed

‎.github/workflows/release.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: Release to staging
33
on:
44
release:
55
types: [ "created" ]
6+
push:
7+
branches: [ "jschneidereit/fix-multimodule-deploy" ]
8+
9+
env:
10+
MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always
611

712
jobs:
813
build:
@@ -20,22 +25,25 @@ jobs:
2025
server-password: 'MAVEN_PASSWORD'
2126
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
2227
gpg-passphrase: 'MAVEN_GPG_PASSPHRASE'
23-
- name: Get hyperd version
24-
id: evaluate-property
25-
run: |
26-
echo "HYPER_VERSION=$(mvn help:evaluate -Dexpression=hyperapi.version -q -DforceStdout)" >> $GITHUB_ENV
28+
# - name: Get hyperd version
29+
# id: evaluate-property
30+
# run: |
31+
# echo "HYPER_VERSION=$(mvn help:evaluate -Dexpression=hyperapi.version -q -DforceStdout)" >> $GITHUB_ENV
2732
- name: Cache hyperd
2833
uses: actions/cache@v3
2934
with:
3035
path: |
31-
target/.cache
36+
jdbc-slim/target/.cache
3237
key: ${{ runner.os }}-hyper-${{ env.HYPER_VERSION }}
3338
restore-keys: |
3439
${{ runner.os }}-hyper-${{ env.HYPER_VERSION }}
35-
- name: Set version
36-
run: mvn versions:set --no-transfer-progress -DnewVersion=${{ github.event.release.tag_name }}
40+
env:
41+
HYPER_VERSION: "0.0.21200.re11c8cb9"
42+
# TODO: JIM
43+
# - name: Set version
44+
# run: mvn versions:set --no-transfer-progress -DnewVersion=${{ github.event.release.tag_name }}
3745
- name: Build with Maven
38-
run: mvn --batch-mode --no-transfer-progress clean deploy -P release --file pom.xml
46+
run: mvn $MAVEN_ARGS clean deploy -P release --file pom.xml -DskipTests
3947
env:
4048
MAVEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
4149
MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}

‎jdbc-grpc/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838

3939
<build>
4040
<plugins>
41+
<plugin>
42+
<groupId>org.sonatype.plugins</groupId>
43+
<artifactId>nexus-staging-maven-plugin</artifactId>
44+
</plugin>
4145
<plugin>
4246
<groupId>org.xolstice.maven.plugins</groupId>
4347
<artifactId>protobuf-maven-plugin</artifactId>
@@ -58,6 +62,18 @@
5862
</execution>
5963
</executions>
6064
</plugin>
65+
<plugin>
66+
<groupId>org.apache.maven.plugins</groupId>
67+
<artifactId>maven-javadoc-plugin</artifactId>
68+
<configuration>
69+
<sourcepath>${project.build.directory}/delombok;${project.build.directory}/generated-sources/protobuf</sourcepath>
70+
<source>${java.version}</source>
71+
<quiet>true</quiet>
72+
<excludePackageNames>salesforce.cdp.hyperdb.v1.*</excludePackageNames>
73+
<outputDirectory>${project.build.directory}/apidocs</outputDirectory>
74+
<failOnWarnings>false</failOnWarnings>
75+
</configuration>
76+
</plugin>
6177
</plugins>
6278
</build>
6379
</project>

‎jdbc-parent/pom.xml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,13 @@
2222
<commons-lang3.version>3.17.0</commons-lang3.version>
2323
<grpc.version>1.68.1</grpc.version>
2424
<grpcmock-junit5.version>0.13.0</grpcmock-junit5.version>
25-
<guava.version>33.2.1-jre</guava.version>
25+
<guava.version>33.4.0-jre</guava.version>
2626
<jackson.version>2.18.0</jackson.version>
2727
<jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
2828
<java.version>1.8</java.version>
2929
<jjwt.version>0.12.6</jjwt.version>
3030
<lombok.version>1.18.34</lombok.version>
3131
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
32-
33-
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
34-
3532
<maven.compiler.release>8</maven.compiler.release>
3633
<maven.compiler.source>${java.version}</maven.compiler.source>
3734
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -233,12 +230,14 @@
233230
<showWarnings>true</showWarnings>
234231
</configuration>
235232
</plugin>
236-
<plugin>
237-
<groupId>org.apache.maven.plugins</groupId>
238-
<artifactId>maven-javadoc-plugin</artifactId>
239-
<version>3.11.1</version>
240-
</plugin>
241233
</plugins>
242234
</pluginManagement>
235+
<plugins>
236+
<plugin>
237+
<groupId>org.sonatype.plugins</groupId>
238+
<artifactId>nexus-staging-maven-plugin</artifactId>
239+
<inherited>false</inherited>
240+
</plugin>
241+
</plugins>
243242
</build>
244243
</project>

‎jdbc-proto/pom.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,31 @@
2525
</includes>
2626
</resource>
2727
</resources>
28+
<plugins>
29+
<plugin>
30+
<groupId>org.sonatype.plugins</groupId>
31+
<artifactId>nexus-staging-maven-plugin</artifactId>
32+
</plugin>
33+
<plugin>
34+
<groupId>org.apache.maven.plugins</groupId>
35+
<artifactId>maven-javadoc-plugin</artifactId>
36+
</plugin>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-jar-plugin</artifactId>
40+
<executions>
41+
<execution>
42+
<goals>
43+
<goal>jar</goal>
44+
</goals>
45+
<phase>package</phase>
46+
<configuration>
47+
<classifier>javadoc</classifier>
48+
<classesDirectory>${project.basedir}/src/main/javadoc</classesDirectory>
49+
</configuration>
50+
</execution>
51+
</executions>
52+
</plugin>
53+
</plugins>
2854
</build>
2955
</project>

‎jdbc-slim/pom.xml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@
181181
</resource>
182182
</resources>
183183
<plugins>
184+
<plugin>
185+
<groupId>org.sonatype.plugins</groupId>
186+
<artifactId>nexus-staging-maven-plugin</artifactId>
187+
</plugin>
184188
<plugin>
185189
<groupId>org.jacoco</groupId>
186190
<artifactId>jacoco-maven-plugin</artifactId>
@@ -241,6 +245,98 @@
241245
</execution>
242246
</executions>
243247
</plugin>
248+
<plugin>
249+
<groupId>org.apache.maven.plugins</groupId>
250+
<artifactId>maven-javadoc-plugin</artifactId>
251+
<configuration>
252+
<sourcepath>${project.build.directory}/delombok;${project.build.directory}/generated-sources/protobuf</sourcepath>
253+
<source>${java.version}</source>
254+
<quiet>true</quiet>
255+
<excludePackageNames>salesforce.cdp.hyperdb.v1.*</excludePackageNames>
256+
<outputDirectory>${project.build.directory}/apidocs</outputDirectory>
257+
<failOnWarnings>false</failOnWarnings>
258+
</configuration>
259+
</plugin>
260+
<plugin>
261+
<groupId>com.googlecode.maven-download-plugin</groupId>
262+
<artifactId>download-maven-plugin</artifactId>
263+
<version>1.11.3</version>
264+
<executions>
265+
<execution>
266+
<id>download-hyper-cpp</id>
267+
<goals>
268+
<goal>wget</goal>
269+
</goals>
270+
<phase>process-test-resources</phase>
271+
<configuration>
272+
<url>${hyper-download-url}.${hyperapi.version}.zip</url>
273+
<unpack>true</unpack>
274+
<outputDirectory>${download.cache.directory}/hyper-unzipped</outputDirectory>
275+
</configuration>
276+
</execution>
277+
</executions>
278+
</plugin>
279+
<plugin>
280+
<groupId>org.apache.maven.plugins</groupId>
281+
<artifactId>maven-antrun-plugin</artifactId>
282+
<version>3.1.0</version>
283+
<executions>
284+
<execution>
285+
<id>flatten-hyperd</id>
286+
<goals>
287+
<goal>run</goal>
288+
</goals>
289+
<phase>process-test-resources</phase>
290+
<configuration>
291+
<target>
292+
<copy overwrite="false" todir="${hyperd.directory}">
293+
<fileset dir="${download.cache.directory}/hyper-unzipped">
294+
<include name="**/lib/hyper/hyperd"/>
295+
<include name="**/lib/hyper/hyperd.exe"/>
296+
<include name="**/lib/**/*.dylib"/>
297+
<include name="**/lib/**/*.dll"/>
298+
<include name="**/lib/**/*.so"/>
299+
</fileset>
300+
<flattenmapper/>
301+
</copy>
302+
</target>
303+
</configuration>
304+
</execution>
305+
<execution>
306+
<id>chmod-hyperd</id>
307+
<goals>
308+
<goal>run</goal>
309+
</goals>
310+
<phase>process-test-resources</phase>
311+
<configuration>
312+
<target>
313+
<chmod perm="700">
314+
<fileset dir="${hyperd.directory}">
315+
<include name="**/hyperd"/>
316+
</fileset>
317+
</chmod>
318+
</target>
319+
</configuration>
320+
</execution>
321+
</executions>
322+
</plugin>
323+
<plugin>
324+
<groupId>org.assertj</groupId>
325+
<artifactId>assertj-assertions-generator-maven-plugin</artifactId>
326+
<version>2.2.0</version>
327+
<configuration>
328+
<classes>
329+
<class>com.salesforce.datacloud.jdbc.core.accessor.QueryJDBCAccessor</class>
330+
</classes>
331+
<hierarchical>false</hierarchical>
332+
<targetDir>src/test/java</targetDir>
333+
<cleanTargetDir>false</cleanTargetDir>
334+
<generateAssertions>true</generateAssertions>
335+
<generateJUnitSoftAssertions>false</generateJUnitSoftAssertions>
336+
<generateBddAssertions>false</generateBddAssertions>
337+
<generateSoftAssertions>true</generateSoftAssertions>
338+
</configuration>
339+
</plugin>
244340
</plugins>
245341
</build>
246342

‎jdbc/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232

3333
<build>
3434
<plugins>
35+
<plugin>
36+
<groupId>org.sonatype.plugins</groupId>
37+
<artifactId>nexus-staging-maven-plugin</artifactId>
38+
</plugin>
3539
<plugin>
3640
<groupId>org.apache.maven.plugins</groupId>
3741
<artifactId>maven-shade-plugin</artifactId>

0 commit comments

Comments
 (0)