Skip to content

Added inlinedConfScript property #2797 #9590

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

Closed
wants to merge 2 commits into from

Conversation

JustinKSU
Copy link
Contributor

Added inlinedConfScript which can reference a file path or a File
object. This property can be used to add additional commands (e.g.
setting JAVA_OPTS) to the default launcher script.

Utilizes FileCopyUtils now. Added missing JavaDoc.

Feature requested in #2797

values.

Added inlinedConfScript which can reference a file path or a File
object.  This property can be used to add additional commands (e.g.
setting JAVA_OPTS) to the default launcher script.

Utilizes FileCopyUtils now.  Added missing JavaDoc.
@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Jun 24, 2017
@snicoll snicoll added priority: normal type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged labels Jun 25, 2017
@JustinKSU
Copy link
Contributor Author

Need to fix the unit test. inlinedConfScriptCanBeReplaced() can be removed because it's covered by inlinedConfScriptFileLoad

 inlinedConfScriptFileLoad covers unit test.  inlinedConfScriptCanBeReplaced wont' pass because assertThatPlaceholderCanBeReplaced has a default value that's not a reference to a file.
@JustinKSU
Copy link
Contributor Author

Latest error is unrelated to changes in this pull request:
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project spring-boot-autoconfigure: Compilation failure
[ERROR] /home/travis/build/spring-projects/spring-boot/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java:[67,24] constructor AnnotationRepositoryConfigurationSource in class org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource cannot be applied to given types;

@wilkinsona
Copy link
Member

@JustinKSU Yep, don't worry about that. It should have been fixed by 5a4ef50.

@wilkinsona wilkinsona added this to the 2.0.0.M4 milestone Jul 21, 2017
@wilkinsona wilkinsona self-assigned this Jul 21, 2017
@wilkinsona wilkinsona modified the milestones: 2.0.0.M5, 2.0.0.M4 Jul 28, 2017
wilkinsona added a commit that referenced this pull request Sep 26, 2017
* gh-9590:
  Polish "Support inlining a conf script into the default launch script"
  Support inlining a conf script into the default launch script
@wilkinsona
Copy link
Member

Thanks for the PR. I've merged the changes into master. I polished things a little bit, most notably reverting the move to FileCopyUtils. While not necessarily a bad thing to do, I'd prefer to keep the changes focussed on adding the inlined conf script support.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: enhancement A general enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants