Skip to content

Commit eea148e

Browse files
authored
GEOMESA-3541 Fix Avro classpath in gs-plugins (#3453)
* Fix dash CI logic
1 parent 33e7838 commit eea148e

File tree

2 files changed

+20
-1
lines changed
  • .github/workflows
  • geomesa-archetypes/geomesa-archetypes-gs-plugin

2 files changed

+20
-1
lines changed

.github/workflows/dash.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ jobs:
3232
- name: Check for dependency changes
3333
id: dependency_changes
3434
run: |
35-
changed="false"
35+
changed=""
3636
if [[ "${{ github.event_name }}" == 'pull_request' ]]; then
37+
echo "Checking for dependency changes"
3738
# get the changed files
3839
git fetch --depth=1 origin ${{ github.base_ref }}
3940
IFS=$'\n' read -r -d '' -a changedFiles < <( git diff --name-only origin/${{ github.base_ref }} && printf '\0' )
@@ -43,20 +44,24 @@ jobs:
4344
if [[ -z "$changed" ]] && [[ $file =~ .*pom.xml ]]; then
4445
changed="pom"
4546
elif [[ "$file" == "build/dependencies.txt" ]]; then
47+
echo "Detected dependency change"
4648
changed="true"
4749
fi
4850
done
4951
if [[ "$changed" == "pom" ]]; then
52+
echo "Detected pom change, double-checking dependencies"
5053
mvn $MAVEN_COMPILE_NO_OP_ARGS $MAVEN_CLI_OPTS
5154
./build/scripts/calculate-cqs.sh
5255
git diff --exit-code --quiet || {
5356
echo 'Detected dependency changes - please run `./build/scripts/calculate-cqs.sh` and commit the results'
5457
exit 1
5558
}
59+
echo "Dependencies are ok, skipping dash check"
5660
changed="false"
5761
fi
5862
else
5963
# weekly or dispatch requests
64+
echo "Always running dash check for scheduled jobs"
6065
changed="true"
6166
fi
6267
echo "changed=$changed" >> "$GITHUB_OUTPUT"

geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,20 @@
258258
</exclusion>
259259
</exclusions>
260260
</dependency>
261+
<dependency>
262+
<groupId>org.locationtech.geomesa</groupId>
263+
<artifactId>geomesa-feature-avro_${scala.binary.version}</artifactId>
264+
<exclusions>
265+
<exclusion>
266+
<groupId>org.geotools</groupId>
267+
<artifactId>*</artifactId>
268+
</exclusion>
269+
<exclusion>
270+
<groupId>org.locationtech.jts</groupId>
271+
<artifactId>*</artifactId>
272+
</exclusion>
273+
</exclusions>
274+
</dependency>
261275
</dependencies>
262276

263277
<build>

0 commit comments

Comments
 (0)