Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bindings/java/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,4 @@ docker container run --rm --user "${codegen_run_user:?}" -v $self_dir:/local "${
bash $root_dir/scripts/fix-java-duplicate-imports.sh

# Dependabot updates release/pom.xml. Replace the generated pom with it.
awk -v version="$package_version" \
'!done && sub(/<version>[^<]*<\/version>/, "<version>" version "</version>") { done = 1 } 1' \
"$self_dir/release/pom.xml" > "$src_dir/pom.xml"
write_release_pom "$src_dir/pom.xml"
1 change: 0 additions & 1 deletion bindings/java/release/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
Expand Down
9 changes: 8 additions & 1 deletion bindings/java/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@ root_dir=$(readlink -f "$self_dir/../..")
src_dir="$self_dir/src"

cd $src_dir
mvn test

# Build with release/pom.xml, because the next generation ships it. Run the
# package phase too, which builds the jars that deploy.sh uploads.
release_pom=".release-pom.xml"
write_release_pom "$src_dir/$release_pom"
trap 'rm -f "$src_dir/$release_pom"' EXIT
mvn -f "$release_pom" test
mvn -f "$release_pom" -DskipTests package
8 changes: 8 additions & 0 deletions scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ function cloudsmith_version_published {
[ "${count:-0}" -gt 0 ]
}

# Dependabot updates bindings/java/release/pom.xml. Write it with the package
# version, as the pom that the Java binding ships.
function write_release_pom {
awk -v version="$package_version" \
'!done && sub(/<version>[^<]*<\/version>/, "<version>" version "</version>") { done = 1 } 1' \
"$root_dir/bindings/java/release/pom.xml" > "$1"
}

function die {
echo "$@"
exit 1
Expand Down
Loading