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

Merge works of all other forks #19

Open
wants to merge 101 commits into
base: master
Choose a base branch
from
Open

Merge works of all other forks #19

wants to merge 101 commits into from

Conversation

jycr
Copy link

@jycr jycr commented Oct 26, 2016

No description provided.

Xing Liu and others added 30 commits May 16, 2016 14:12
…ution on Windows.

Newer version of Thymeleaf (3.0.0)
New version of Chunk Templates (3.2.3)
It was present in the graph but not listed with the other template engines. This will improve SEO.
# Conflicts:
#	pom.xml
#	results.csv
#	results.png
#	src/main/resources/templates/stocks.thymeleaf.html
# Conflicts:
#	pom.xml
#	results.csv
#	src/test/java/com/mitchellbosecke/benchmark/ExpectedOutputTest.java
# Conflicts:
#	pom.xml
#	results.csv
#	results.png
# Conflicts:
#	pom.xml
#	src/test/java/com/mitchellbosecke/benchmark/ExpectedOutputTest.java
# Conflicts:
#	pom.xml
#	src/main/java/com/mitchellbosecke/benchmark/Rythm.java
#	src/test/java/com/mitchellbosecke/benchmark/ExpectedOutputTest.java
# Conflicts:
#	pom.xml
#	src/test/java/com/mitchellbosecke/benchmark/ExpectedOutputTest.java
- temporarily remove Twirl (because issue in compilation chain with model object)
- remove JsonHandlebars (Jackson2 dependency conflicts with Thymeleaf)
# Conflicts:
#	pom.xml
#	results.csv
#	results.png
# Conflicts:
#	pom.xml
#	src/main/java/com/mitchellbosecke/benchmark/MoustacheBenchmark.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet