0.135.x Branch PR #190
Open
0.135.x Branch PR #190
Conversation
This file contains hidden or 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
# Conflicts: # inventory/pom.xml # libraries/ae-common-kernel/pom.xml # libraries/ae-container-control/pom.xml # libraries/ae-inspect-reader/pom.xml # libraries/ae-inventory-processor/pom.xml # libraries/ae-maven-kernel/pom.xml # libraries/ae-security/pom.xml # libraries/ae-system-analysis-scripts/pom.xml # libraries/ae-test-common/pom.xml # libraries/pom.xml # modules/ae-commons-annotation/pom.xml # modules/pom.xml # plugins/ae-api-compile-maven-plugin/pom.xml # plugins/ae-api-publish-maven-plugin/pom.xml # plugins/ae-artifact-publish-maven-plugin/pom.xml # plugins/ae-dependency-analysis-plugin/pom.xml # plugins/ae-inventory-maven-plugin/pom.xml # plugins/ae-inventory-maven-plugin/src/it/TestPomReport/pom.xml # plugins/ae-jira-maven-plugin/pom.xml # plugins/ae-shell-script-assembler-plugin/pom.xml # plugins/ae-version-maven-plugin/pom.xml # plugins/pom.xml # pom.xml # poms/ae-core-dependency-management-pom/ae-core-modules-dependency-management-pom/pom.xml # poms/ae-core-dependency-management-pom/ae-core-plugin-dependency-management-pom/pom.xml # poms/ae-core-dependency-management-pom/pom.xml # poms/ae-core-plugin-management-pom/pom.xml # poms/pom.xml # tests/ae-aggregate-sources-module/pom.xml # tests/ae-attach-asset-metadata-test/pom.xml # tests/ae-container-validation/pom.xml # tests/ae-example-module/pom.xml # tests/ae-inventory-container-itest/pom.xml # tests/ae-inventory-subjects-itest/pom.xml # tests/ae-merge-inventory-test/pom.xml # tests/extractor-tests/ae-alpine-container-test/pom.xml # tests/extractor-tests/ae-arch-container-test/pom.xml # tests/extractor-tests/ae-centos-container-test/pom.xml # tests/extractor-tests/ae-debian-container-test/pom.xml # tests/extractor-tests/ae-suse-container-test/pom.xml # tests/extractor-tests/ae-ubuntu-container-test/pom.xml # tests/extractor-tests/pom.xml # tests/npm-extractor-tests/ae-simple-npm-extractor/pom.xml # tests/npm-extractor-tests/pom.xml # tests/pom.xml # tools/ae-configuration/pom.xml # tools/pom.xml
merging: Postscan excludes with adjustments
(cherry picked from commit c73e5ac)
AE-582: Enabling Open CoDE for LD/SDA in German version
Signed-off-by: ywittmann <[email protected]>
…ck asset group name and combine groups when each contains a single asset Signed-off-by: Yan Wittmann <[email protected]>
…rt in-place modification, while still creating the parent directory Signed-off-by: Yan Wittmann <[email protected]>
Signed-off-by: Yan Wittmann <[email protected]>
…changes Asset inventory processor NPE fix for target inventory not being set
…ups-grouping AE-1014: Group asset Groups into one if only one-element Groups exist
- ComponentPatternValidator - DirectoryScanAggregatorConfiguration - FilePatternQualifierMapper - PythonModuleComponentPatternContributor - ArchiveUtils - FileUtils
…ores from the asset keys Signed-off-by: Yan Wittmann <[email protected]>
Signed-off-by: Yan Wittmann <[email protected]>
…et-metadata-underscore-handling GenericAssetInventoryProcessor will now properly unescape all underscores from the asset keys
…d into the written inventory Signed-off-by: Yan Wittmann <[email protected]>
Signed-off-by: Yan Wittmann <[email protected]>
…ication Fixed split column header duplication
…solidation Fix license exception consolidation
…nto fix-license-exception-consolidation
…solidation Fix license exception consolidation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is only intended to trigger our CI environment. This PR must not be merged.