-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: maven - exclude test artifacts (#78)
* refactor: change default URL for Exhort Dev Mode to be Exhort backend URL of Staging environment * fix: maven - only add artifact if it's not test scoped * feat: oss-index - add header and mapping from setting/envVar * test: maven - only add artifact if it's not test scoped update tests expected sbom files for component analysis - removing tests artifacts from there --------- Signed-off-by: Zvi Grinberg <zgrinber@redhat.com>
- Loading branch information
1 parent
e69acd9
commit e1048b6
Showing
7 changed files
with
123 additions
and
199 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
231 changes: 109 additions & 122 deletions
231
...anifests/maven/pom_deps_with_no_ignore_common_paths/component_analysis_expected_sbom.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,111 @@ | ||
| { | ||
| "bomFormat": "CycloneDX", | ||
| "specVersion": "1.4", | ||
| "version": 1, | ||
| "metadata": { | ||
| "timestamp": "2023-08-07T00:00:00.000Z", | ||
| "component": { | ||
| "group": "pom-with-deps-no-ignore", | ||
| "name": "pom-with-dependency-not-ignored-common-paths", | ||
| "version": "0.0.1", | ||
| "purl": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1", | ||
| "type": "application", | ||
| "bom-ref": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1" | ||
| } | ||
| }, | ||
| "components": [ | ||
| { | ||
| "group": "pom-with-deps-no-ignore", | ||
| "name": "pom-with-dependency-not-ignored-common-paths", | ||
| "version": "0.0.1", | ||
| "purl": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1", | ||
| "type": "application", | ||
| "bom-ref": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1" | ||
| }, | ||
| { | ||
| "group": "org.springframework.boot", | ||
| "name": "spring-boot-starter", | ||
| "version": "2.3.5.RELEASE", | ||
| "purl": "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE" | ||
| }, | ||
| { | ||
| "group": "org.springframework.boot", | ||
| "name": "spring-boot-starter-test", | ||
| "version": "2.3.5.RELEASE", | ||
| "purl": "pkg:maven/org.springframework.boot/spring-boot-starter-test@2.3.5.RELEASE", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/org.springframework.boot/spring-boot-starter-test@2.3.5.RELEASE" | ||
| }, | ||
| { | ||
| "group": "org.springframework.boot", | ||
| "name": "spring-boot-starter-web", | ||
| "version": "2.3.5.RELEASE", | ||
| "purl": "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE" | ||
| }, | ||
| { | ||
| "group": "io.quarkus", | ||
| "name": "quarkus-resteasy", | ||
| "version": "2.7.7.Final", | ||
| "purl": "pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final" | ||
| }, | ||
| { | ||
| "group": "org.keycloak", | ||
| "name": "keycloak-saml-core", | ||
| "version": "1.8.1.Final", | ||
| "purl": "pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final" | ||
| }, | ||
| { | ||
| "group": "io.quarkus", | ||
| "name": "quarkus-vertx-http", | ||
| "version": "2.13.5.Final", | ||
| "purl": "pkg:maven/io.quarkus/quarkus-vertx-http@2.13.5.Final", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/io.quarkus/quarkus-vertx-http@2.13.5.Final" | ||
| }, | ||
| { | ||
| "group": "io.quarkus", | ||
| "name": "quarkus-jdbc-postgresql", | ||
| "version": "2.13.6.Final", | ||
| "purl": "pkg:maven/io.quarkus/quarkus-jdbc-postgresql@2.13.6.Final", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/io.quarkus/quarkus-jdbc-postgresql@2.13.6.Final" | ||
| } | ||
| ], | ||
| "dependencies": [ | ||
| { | ||
| "ref": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1", | ||
| "dependsOn": [ | ||
| "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE", | ||
| "pkg:maven/org.springframework.boot/spring-boot-starter-test@2.3.5.RELEASE", | ||
| "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE", | ||
| "pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final", | ||
| "pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final", | ||
| "pkg:maven/io.quarkus/quarkus-vertx-http@2.13.5.Final", | ||
| "pkg:maven/io.quarkus/quarkus-jdbc-postgresql@2.13.6.Final" | ||
| ] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/org.springframework.boot/spring-boot-starter-test@2.3.5.RELEASE", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/io.quarkus/quarkus-vertx-http@2.13.5.Final", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/io.quarkus/quarkus-jdbc-postgresql@2.13.6.Final", | ||
| "dependsOn": [] | ||
| } | ||
| ] | ||
| "bomFormat": "CycloneDX", | ||
| "specVersion": "1.4", | ||
| "version": 1, | ||
| "metadata": { | ||
| "timestamp": "2023-08-07T00:00:00.000Z", | ||
| "component": { | ||
| "group": "pom-with-deps-no-ignore", | ||
| "name": "pom-with-dependency-not-ignored-common-paths", | ||
| "version": "0.0.1", | ||
| "purl": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1", | ||
| "type": "application", | ||
| "bom-ref": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1" | ||
| } | ||
| }, | ||
| "components": [ | ||
| { | ||
| "group": "pom-with-deps-no-ignore", | ||
| "name": "pom-with-dependency-not-ignored-common-paths", | ||
| "version": "0.0.1", | ||
| "purl": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1", | ||
| "type": "application", | ||
| "bom-ref": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1" | ||
| }, | ||
| { | ||
| "group": "org.springframework.boot", | ||
| "name": "spring-boot-starter", | ||
| "version": "2.3.5.RELEASE", | ||
| "purl": "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE" | ||
| }, | ||
| { | ||
| "group": "org.springframework.boot", | ||
| "name": "spring-boot-starter-web", | ||
| "version": "2.3.5.RELEASE", | ||
| "purl": "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE" | ||
| }, | ||
| { | ||
| "group": "io.quarkus", | ||
| "name": "quarkus-resteasy", | ||
| "version": "2.7.7.Final", | ||
| "purl": "pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final" | ||
| }, | ||
| { | ||
| "group": "org.keycloak", | ||
| "name": "keycloak-saml-core", | ||
| "version": "1.8.1.Final", | ||
| "purl": "pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final" | ||
| }, | ||
| { | ||
| "group": "io.quarkus", | ||
| "name": "quarkus-vertx-http", | ||
| "version": "2.13.5.Final", | ||
| "purl": "pkg:maven/io.quarkus/quarkus-vertx-http@2.13.5.Final", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/io.quarkus/quarkus-vertx-http@2.13.5.Final" | ||
| }, | ||
| { | ||
| "group": "io.quarkus", | ||
| "name": "quarkus-jdbc-postgresql", | ||
| "version": "2.13.6.Final", | ||
| "purl": "pkg:maven/io.quarkus/quarkus-jdbc-postgresql@2.13.6.Final", | ||
| "type": "library", | ||
| "bom-ref": "pkg:maven/io.quarkus/quarkus-jdbc-postgresql@2.13.6.Final" | ||
| } | ||
| ], | ||
| "dependencies": [ | ||
| { | ||
| "ref": "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1", | ||
| "dependsOn": [ | ||
| "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE", | ||
| "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE", | ||
| "pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final", | ||
| "pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final", | ||
| "pkg:maven/io.quarkus/quarkus-vertx-http@2.13.5.Final", | ||
| "pkg:maven/io.quarkus/quarkus-jdbc-postgresql@2.13.6.Final" | ||
| ] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/io.quarkus/quarkus-vertx-http@2.13.5.Final", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:maven/io.quarkus/quarkus-jdbc-postgresql@2.13.6.Final", | ||
| "dependsOn": [] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.