You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by ab...@apache.org on 2023/03/03 10:09:29 UTC
[druid] branch master updated: Bump CycloneDX module to address POM errors (#13878)
This is an automated email from the ASF dual-hosted git repository.
abhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new d93fdb2632 Bump CycloneDX module to address POM errors (#13878)
d93fdb2632 is described below
commit d93fdb2632bb9b870c2637915120153baae41771
Author: Elliott Freis <10...@users.noreply.github.com>
AuthorDate: Fri Mar 3 02:09:15 2023 -0800
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 <el...@Elliott-Freis.earth.dynamic.blacklight.net>
---
.github/workflows/standard-its.yml | 4 +---
it.sh | 4 +---
pom.xml | 2 +-
web-console/script/druid | 4 +---
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/standard-its.yml b/.github/workflows/standard-its.yml
index 8f2d236152..9909ce012f 100644
--- a/.github/workflows/standard-its.yml
+++ b/.github/workflows/standard-its.yml
@@ -106,9 +106,7 @@ jobs:
runs-on: ubuntu-22.04
env:
MVN: mvn --no-snapshot-updates
- # Added -Dcyclonedx.skip=true to avoid ISO-8859-1 [ERROR]s
- # May be fixed in the future
- MAVEN_SKIP: -P skip-static-checks -Dweb.console.skip=true -Dmaven.javadoc.skip=true -Dcyclonedx.skip=true
+ MAVEN_SKIP: -P skip-static-checks -Dweb.console.skip=true -Dmaven.javadoc.skip=true
CONFIG_FILE: k8s_run_config_file.json
IT_TEST: -Dit.test=ITNestedQueryPushDownTest
POD_NAME: int-test
diff --git a/it.sh b/it.sh
index f38dec3f12..b03b7acb57 100755
--- a/it.sh
+++ b/it.sh
@@ -193,9 +193,7 @@ fi
CMD=$1
shift
-# Added -Dcyclonedx.skip=true to avoid ISO-8859-1 [ERROR]s
-# May be fixed in the future
-MAVEN_IGNORE="-P skip-static-checks,skip-tests -Dmaven.javadoc.skip=true -Dcyclonedx.skip=true"
+MAVEN_IGNORE="-P skip-static-checks,skip-tests -Dmaven.javadoc.skip=true"
case $CMD in
"help" )
diff --git a/pom.xml b/pom.xml
index 99e29e2493..ea6fe89494 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1536,7 +1536,7 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.7.3</version>
+ <version>2.7.5</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/web-console/script/druid b/web-console/script/druid
index b5f8feb199..7ffbeeee2a 100755
--- a/web-console/script/druid
+++ b/web-console/script/druid
@@ -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.
- # 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)" \
- && 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 \
&& tar xzf "apache-druid-$(_get_druid_version)-bin.tar.gz" \
&& cd apache-druid-$(_get_druid_version) \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org