Skip to content

Commit 1ef2c40

Browse files
authored
Merge pull request #729 from jooby-project/713
Guava 21 / Cassandra 3.2.0 fix #713 #728
2 parents 11bc32a + 0037081 commit 1ef2c40

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

jooby-thymeleaf/src/test/java/org/jooby/thymeleaf/ThlEngineTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static org.easymock.EasyMock.expect;
44
import static org.junit.Assert.assertEquals;
55

6+
import java.util.HashMap;
67
import java.util.Locale;
78
import java.util.Map;
89

@@ -44,7 +45,7 @@ public void renderer() throws Exception {
4445
.expect(viewName("index"))
4546
.expect(unit -> {
4647
Renderer.Context ctx = unit.get(Renderer.Context.class);
47-
expect(ctx.locals()).andReturn(ImmutableMap.of("_vname", "index"));
48+
expect(ctx.locals()).andReturn(new HashMap<>(ImmutableMap.of("_vname", "index")));
4849
})
4950
.expect(unit -> {
5051
Thlxss xss = unit.constructor(Thlxss.class)

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2938,7 +2938,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
29382938
<slf4j-api.version>1.7.21</slf4j-api.version>
29392939
<logback-classic.version>1.1.7</logback-classic.version>
29402940
<caffeine.version>2.3.3</caffeine.version>
2941-
<guava.version>19.0</guava.version>
2941+
<guava.version>21.0</guava.version>
29422942
<guice.version>4.1.0</guice.version>
29432943
<config.version>1.3.1</config.version>
29442944
<handlebars.version>4.0.5</handlebars.version>
@@ -3024,7 +3024,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
30243024

30253025
<jfiglet.version>0.0.7</jfiglet.version>
30263026
<couchbase-client.version>2.3.1</couchbase-client.version>
3027-
<cassandra.version>3.0.3</cassandra.version>
3027+
<cassandra.version>3.2.0</cassandra.version>
30283028

30293029
<mongo-driver-driver-rx.version>1.2.0</mongo-driver-driver-rx.version>
30303030
<fast-classpath-scanner.version>2.0.7</fast-classpath-scanner.version>

0 commit comments

Comments
 (0)