From 73c935cf9588d855848fb716f13c5dc006606922 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 26 Sep 2024 13:25:49 +0200 Subject: [PATCH] [gradle] Commit gradle.properties with XML parser workaround --- .github/workflows/ci.yml | 11 ----------- .gitignore | 1 - gradle.properties | 5 +++++ 3 files changed, 5 insertions(+), 12 deletions(-) create mode 100644 gradle.properties diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9e8795af..f021e6a01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,17 +58,6 @@ jobs: run: | sdkmanager "platforms;android-21" - # Workaround - - name: Create gradle.properties - run: | - cat <<-EOF > gradle.properties - # Workaround for https://github.com/CycloneDX/cyclonedx-gradle-plugin/issues/349 - # suggested at https://docs.gradle.org/current/userguide/upgrading_version_8.html#xml_parsing_now_requires_recent_parsers - systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl - systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl - systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl - EOF - # Testing - name: Gradle Check run: ./gradlew check --stacktrace diff --git a/.gitignore b/.gitignore index 7bd5f61be..ec8037f60 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ .project .settings .gradle -gradle.properties build/ core/build/ diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..671a138d8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +# Workaround for https://github.com/CycloneDX/cyclonedx-gradle-plugin/issues/349 +# suggested at https://docs.gradle.org/current/userguide/upgrading_version_8.html#xml_parsing_now_requires_recent_parsers +systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl +systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl +systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl