Merged in #459 and addressed code review suggestions #529
Conversation
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
fixes jbake-org#455 and jbake-org#440
…to manikmagar-fix/issue455
4.9 is the current. Maybe the whole 4.x works but 3.x does not.
refactored Asset class. switching back to Key class with static string properties. make tests green again refactored Renderer, AbstractTemplateEngine and implementations refactored Crawler refactored Parser and MarkupEngines cleanup refactored RenderingTools refactored launcher classes and Oven moved option keys to JBakeConfiguration. fixed test. removed last CompositeConfiguration couplings. refactored Oven. Added tests.
rebased with master. added default type to configuration. rebased on master. Fixed broken tests.
Restore deprecated Asset constructor Restore deprecated Crawler constructor Restore deprecated RenderingTool and implementations and Renderer constructors Restore deprecated Baker, BakeWatcher and Init Restore deprecated MarkupEngine and ParserEngine introduce deprecated DefaultJBakeConfiguration constructor Restored deprecated AbstractTemplateEngine constructor and implementations
determine current sourcepath with user.dir system property
Document minimal Gradle version.
Freemarker cleanup
Upgrade jsoup, micro
Make Logger static
Fix formatting
Upgrade OrientDB to 2.2.36
…ory-leak Lazy evaluation of extractor values for ThymeleafTemplateEngine
Fix XML indentation
…/OndraZizka/jbake into OndraZizka-oz07-stacktraceOnUnexpectedError
…aZizka/jbake into OndraZizka-oz03-refactorMarkdownEngine # Conflicts: # jbake-core/src/main/java/org/jbake/parser/MarkdownEngine.java
https://docs.travis-ci.com/user/languages/java/#using-java-10-and-later unfortunately openjdk11 fails at present in contrast to the documentation
add jdk 10 to travis build matrix
…bake into OndraZizka-oz17-usePlocalForIT # Conflicts: # jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java # jbake-core/src/test/java/org/jbake/app/CrawlerTest.java # jbake-core/src/test/java/org/jbake/app/PaginationTest.java # jbake-core/src/test/java/org/jbake/app/template/AbstractTemplateEngineRenderingTest.java # jbake-core/src/test/java/org/jbake/app/template/GroovyTemplateEngineRenderingTest.java
…bake into OndraZizka-oz17-usePlocalForIT # Conflicts: # jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java # jbake-core/src/test/java/org/jbake/app/CrawlerTest.java # jbake-core/src/test/java/org/jbake/app/PaginationTest.java # jbake-core/src/test/java/org/jbake/app/template/AbstractTemplateEngineRenderingTest.java # jbake-core/src/test/java/org/jbake/app/template/GroovyTemplateEngineRenderingTest.java
…ndraZizka/jbake into OndraZizka-oz11-fixFileNamesEncodingInUri # Conflicts: # jbake-core/src/main/java/org/jbake/app/Crawler.java
|
Anything blocking this? We are pretty much suffering from the img src bug (i.e. not correctly detecting links not starting with "/" as relative links) which is solved with this PR? Can we expect a fixed release 2.6.2 in the next days? |
fixes jbake-org#455 and jbake-org#440
Changed so root path isn't used anymore.
…nikmagar-fix/issue455 # Conflicts: # jbake-core/src/main/java/org/jbake/app/ConfigUtil.java # jbake-core/src/main/java/org/jbake/util/HtmlUtil.java # jbake-core/src/test/java/org/jbake/util/HtmlUtilTest.java
|
Delay has been in rebasing this to reflect recent changes in master. I'm going to cherry pick the changes onto a new PR as this has got messy now. |
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.
See #459