Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1082 where assembly.inline is removed when external properties are enabled #1434

Merged

Conversation

caitlinelfring
Copy link
Contributor

@caitlinelfring caitlinelfring commented Feb 6, 2021

Fixes #1082 and fixes #1356

This is based on the solution provided in #1082. I also added a test to show that the solution fixes the issue.

@caitlinelfring caitlinelfring changed the title Fix issue where assembly.inline is removed when external properties are enabled Fix #1082 where assembly.inline is removed when external properties are enabled Feb 6, 2021
@caitlinelfring
Copy link
Contributor Author

I'm not sure why CI build isn't running? I see it's worked on other PRs opened recently.

@rohanKanojia
Copy link
Member

I've rebased your PR against master. Seems like CI checks are running now...

@codecov
Copy link

codecov bot commented Mar 6, 2021

Codecov Report

Merging #1434 (a324a4d) into master (1732502) will increase coverage by 0.14%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master    #1434      +/-   ##
============================================
+ Coverage     58.08%   58.23%   +0.14%     
- Complexity     1939     1955      +16     
============================================
  Files           162      162              
  Lines          9013     9014       +1     
  Branches       1361     1362       +1     
============================================
+ Hits           5235     5249      +14     
+ Misses         3300     3295       -5     
+ Partials        478      470       -8     
Impacted Files Coverage Δ Complexity Δ
...config/handler/property/PropertyConfigHandler.java 80.83% <100.00%> (+4.26%) 135.00 <0.00> (+11.00)
...ic8/maven/docker/config/AssemblyConfiguration.java 80.00% <0.00%> (+4.61%) 19.00% <0.00%> (+5.00%)

Add test to show `assembly.inline` is removed when external properties are enabled

Signed-off-by: Caitlin Elfring <celfring@gmail.com>
@rohanKanojia rohanKanojia force-pushed the assembly-inline-properties-fix branch from 31a16eb to a324a4d Compare March 6, 2021 15:48
Copy link
Member

@rohanKanojia rohanKanojia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, Thanks a lot 👍

@rohanKanojia rohanKanojia merged commit 2481170 into fabric8io:master Mar 6, 2021
@rohanKanojia rohanKanojia added this to the 0.35.0 milestone Mar 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants