Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump CycloneDX module to address POM errors (#13878) 

* Bump CycloneDX module to address POM errors

* Including web-console in the PR

---------

Co-authored-by: Elliott Freis <elliottfreis@Elliott-Freis.earth.dynamic.blacklight.net>
This commit is contained in:
Elliott Freis 2023-03-03 02:09:15 -08:00 committed by GitHub
parent 81356f7667
commit d93fdb2632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/standard-its.yml vendored
View File

@ -106,9 +106,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
env: env:
MVN: mvn --no-snapshot-updates MVN: mvn --no-snapshot-updates
# Added -Dcyclonedx.skip=true to avoid ISO-8859-1 [ERROR]s MAVEN_SKIP: -P skip-static-checks -Dweb.console.skip=true -Dmaven.javadoc.skip=true
# May be fixed in the future
MAVEN_SKIP: -P skip-static-checks -Dweb.console.skip=true -Dmaven.javadoc.skip=true -Dcyclonedx.skip=true
CONFIG_FILE: k8s_run_config_file.json CONFIG_FILE: k8s_run_config_file.json
IT_TEST: -Dit.test=ITNestedQueryPushDownTest IT_TEST: -Dit.test=ITNestedQueryPushDownTest
POD_NAME: int-test POD_NAME: int-test

4
it.sh
View File

@ -193,9 +193,7 @@ fi
CMD=$1 CMD=$1
shift shift
# Added -Dcyclonedx.skip=true to avoid ISO-8859-1 [ERROR]s MAVEN_IGNORE="-P skip-static-checks,skip-tests -Dmaven.javadoc.skip=true"
# May be fixed in the future
MAVEN_IGNORE="-P skip-static-checks,skip-tests -Dmaven.javadoc.skip=true -Dcyclonedx.skip=true"
case $CMD in case $CMD in
"help" ) "help" )

2
pom.xml
View File

@ -1536,7 +1536,7 @@
<plugin> <plugin>
<groupId>org.cyclonedx</groupId> <groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId> <artifactId>cyclonedx-maven-plugin</artifactId>
<version>2.7.3</version> <version>2.7.5</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

4
web-console/script/druid
View File

@ -55,10 +55,8 @@ function _build_distribution() {
( (
# Add HEAD as an allowed HTTP method since this is how we check when the Druid service is ready. # Add HEAD as an allowed HTTP method since this is how we check when the Druid service is ready.
# Added -Dcyclonedx.skip=true to avoid ISO-8859-1 [ERROR]s
# May be fixed in the future. See https://github.com/apache/druid/pull/13867
cd "$(_get_code_root)" \ cd "$(_get_code_root)" \
&& mvn -Pdist,skip-static-checks,skip-tests -Dmaven.javadoc.skip=true -Dcyclonedx.skip=true -q -T1C install \ && mvn -Pdist,skip-static-checks,skip-tests -Dmaven.javadoc.skip=true -q -T1C install \
&& cd distribution/target \ && cd distribution/target \
&& tar xzf "apache-druid-$(_get_druid_version)-bin.tar.gz" \ && tar xzf "apache-druid-$(_get_druid_version)-bin.tar.gz" \
&& cd apache-druid-$(_get_druid_version) \ && cd apache-druid-$(_get_druid_version) \