Skip to content

Commit 7e69449

Browse files
committed
Jdk 8 build #625
1 parent b9d0c23 commit 7e69449

File tree

3 files changed

+13
-30
lines changed

3 files changed

+13
-30
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ sudo: false
22
language: java
33
jdk:
44
- oraclejdk8
5-
- openjdk7
65
after_success:
76
- mvn clean cobertura:cobertura coveralls:cobertura

handlebars/src/main/java/com/github/jknack/handlebars/helper/LogHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public Object apply(final Object context, final Options options)
6868
if (tagType.inline()) {
6969
sb.append(context);
7070
for (int i = 0; i < options.params.length; i++) {
71-
sb.append(" ").append(options.param(i));
71+
sb.append(" ").append((Object) options.param(i));
7272
}
7373
} else {
7474
sb.append(options.fn());

pom.xml

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -195,23 +195,23 @@
195195
<!-- We're on 1.7 -->
196196
<plugin>
197197
<artifactId>maven-compiler-plugin</artifactId>
198-
<version>3.1</version>
198+
<version>3.7.0</version>
199199
<configuration>
200-
<source>1.7</source>
201-
<target>1.7</target>
200+
<source>1.8</source>
201+
<target>1.8</target>
202202
</configuration>
203203
</plugin>
204204

205205
<plugin>
206206
<artifactId>maven-jar-plugin</artifactId>
207-
<version>2.4</version>
207+
<version>3.1.0</version>
208208
</plugin>
209209

210210
<!-- sure-fire -->
211211
<plugin>
212212
<groupId>org.apache.maven.plugins</groupId>
213213
<artifactId>maven-surefire-plugin</artifactId>
214-
<version>2.16</version>
214+
<version>2.21.0</version>
215215
<configuration>
216216
<!-- set default locale of the test JVM to en_US because some tests expect e.g. the dollar sign as currency symbol -->
217217
<argLine>-Duser.language=en -Duser.country=US</argLine>
@@ -262,7 +262,7 @@
262262
<plugin>
263263
<groupId>org.codehaus.mojo</groupId>
264264
<artifactId>cobertura-maven-plugin</artifactId>
265-
<version>2.6</version>
265+
<version>2.7</version>
266266
<configuration>
267267
<format>xml</format>
268268
<maxmem>256m</maxmem>
@@ -282,7 +282,7 @@
282282
<plugin>
283283
<groupId>org.eluder.coveralls</groupId>
284284
<artifactId>coveralls-maven-plugin</artifactId>
285-
<version>2.1.0</version>
285+
<version>4.3.0</version>
286286
</plugin>
287287

288288
<plugin>
@@ -311,7 +311,7 @@
311311
<plugin>
312312
<groupId>org.sonatype.plugins</groupId>
313313
<artifactId>nexus-staging-maven-plugin</artifactId>
314-
<version>1.6.3</version>
314+
<version>1.6.8</version>
315315
<extensions>true</extensions>
316316
<configuration>
317317
<serverId>ossrh</serverId>
@@ -356,7 +356,7 @@
356356
<plugin>
357357
<groupId>org.apache.maven.plugins</groupId>
358358
<artifactId>maven-surefire-plugin</artifactId>
359-
<version>2.12.3</version>
359+
<version>2.21.0</version>
360360
<inherited>false</inherited>
361361
<configuration>
362362
<includes>
@@ -412,7 +412,7 @@
412412
<plugin>
413413
<groupId>org.apache.maven.plugins</groupId>
414414
<artifactId>maven-source-plugin</artifactId>
415-
<version>2.2.1</version>
415+
<version>3.0.1</version>
416416
<executions>
417417
<execution>
418418
<id>attach-sources</id>
@@ -427,7 +427,7 @@
427427
<plugin>
428428
<groupId>org.apache.maven.plugins</groupId>
429429
<artifactId>maven-javadoc-plugin</artifactId>
430-
<version>2.9.1</version>
430+
<version>3.0.1</version>
431431
<executions>
432432
<execution>
433433
<id>attach-javadocs</id>
@@ -442,7 +442,7 @@
442442
<plugin>
443443
<groupId>org.apache.maven.plugins</groupId>
444444
<artifactId>maven-gpg-plugin</artifactId>
445-
<version>1.4</version>
445+
<version>1.6</version>
446446
<executions>
447447
<execution>
448448
<id>sign-artifacts</id>
@@ -453,22 +453,6 @@
453453
</execution>
454454
</executions>
455455
</plugin>
456-
457-
<!-- Release plugin -->
458-
<plugin>
459-
<groupId>org.apache.maven.plugins</groupId>
460-
<artifactId>maven-release-plugin</artifactId>
461-
<version>2.4.2</version>
462-
<configuration>
463-
<mavenExecutorId>forked-path</mavenExecutorId>
464-
<useReleaseProfile>false</useReleaseProfile>
465-
<arguments>-Psonatype-oss-release</arguments>
466-
<autoVersionSubmodules>true</autoVersionSubmodules>
467-
<tagNameFormat>v@{project.version}</tagNameFormat>
468-
<scmCommentPrefix>release</scmCommentPrefix>
469-
<goals>deploy</goals>
470-
</configuration>
471-
</plugin>
472456
</plugins>
473457
</build>
474458
</profile>

0 commit comments

Comments
 (0)