Apache Solr open-source search software
Revert "SOLR-16796: Add Maven SBOMs via cyclonedx (#1203)"
Houston Putman1f584ae712ba
diff --git a/build.gradle b/build.gradleindex c9193bd7b6b..9da30ad4bf7 100644--- a/build.gradle+++ b/build.gradle@@ -28,7 +28,6 @@ plugins {id 'net.ltgt.errorprone' version '3.1.0' apply falseid 'com.diffplug.spotless' version '6.5.2' apply falseid 'com.github.node-gradle.node' version '7.0.1' apply false- id 'org.cyclonedx.bom' version '1.8.2' apply false}// Declare default Java versions for the entire project and for SolrJ separately@@ -135,7 +134,6 @@ apply from: file('gradle/testing/alternative-jdk-support.gradle')apply from: file('gradle/java/jar-manifest.gradle')// Publishing and releasing-apply from: file('gradle/maven/cyclonedx-bom.gradle')apply from: file('gradle/maven/defaults-maven.gradle')// IDE support, settings and specials.diff --git a/gradle/maven/cyclonedx-bom.gradle b/gradle/maven/cyclonedx-bom.gradledeleted file mode 100644index 6daa502b30c..00000000000--- a/gradle/maven/cyclonedx-bom.gradle+++ /dev/null@@ -1,61 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--// This adds CycloneDX BOM (SBOM) generation for all Solr Maven artifacts--allprojects { prj ->- plugins.withType(JavaPlugin) {- prj.apply plugin: 'org.cyclonedx.bom'-- ext {- sbomDir = layout.buildDirectory.dir("sbom")- }-- configurations {- sbom- }-- def baseName = prj.archivesBaseName + "-" + version + "-cyclonedx"-- cyclonedxBom {- includeConfigs = ["runtimeClasspath"]- skipConfigs = ["compileClasspath", "testCompileClasspath"]- projectType = "library"- destination = sbomDir.map(Directory::getAsFile)- outputName = baseName- outputFormat = "all"- includeBomSerialNumber = true- componentVersion = version- }- assemble.dependsOn cyclonedxBom-- ext {- sbomXmlArtifact = artifacts.add('sbom', sbomDir.map(d -> d.file(baseName + ".xml"))) {- type 'cyclonedx'- extension = 'xml'- classifier = 'cyclonedx'- builtBy cyclonedxBom- }- sbomJsonArtifact = artifacts.add('sbom', sbomDir.map(d -> d.file(baseName + ".json"))) {- type 'cyclonedx'- extension = 'json'- classifier = 'cyclonedx'- builtBy cyclonedxBom- }- }- }-}\ No newline at end of filediff --git a/gradle/maven/defaults-maven.gradle b/gradle/maven/defaults-maven.gradleindex 14860a688c5..96e82dcc1c4 100644--- a/gradle/maven/defaults-maven.gradle+++ b/gradle/maven/defaults-maven.gradle@@ -149,10 +149,6 @@ configure(subprojects.findAll { it.path in rootProject.published }) { prj ->artifact sourcesJarartifact javadocJar- // Include SBOM artifacts- artifact(sbomXmlArtifact)- artifact(sbomJsonArtifact)-pom(configurePom)pom({diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 6126565f4d4..be2cba6139f 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -176,8 +176,6 @@ Other Changes* SOLR-16503: Use Jetty HTTP2 for SyncStrategy and PeerSyncWithLeader for "recovery" operations (Sanjay Dutt, David Smiley)-* SOLR-16796: Include cyclonedx SBOMs with maven artifacts (Arnout Engelen, Houston Putman, Kevin Risden)-================== 9.6.1 ==================Bug Fixes---------------------