kemitix/conditional
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30 from kemitix/upgrades-and-java-10-compatible

Browse source 
Upgrade dependencies and make JDK 10 compatible
This commit is contained in:
Paul Campbell 2018-07-18 20:24:16 +01:00 committed by GitHub
commit d985715f7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pom.xml
View file

@ -4,8 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
<java.version>1.8</java.version> <kemitix-checkstyle.version>4.1.1</kemitix-checkstyle.version>
<kemitix-checkstyle.version>4.0.1</kemitix-checkstyle.version>
<kemitix.checkstyle.ruleset.level>5-complexity</kemitix.checkstyle.ruleset.level> <kemitix.checkstyle.ruleset.level>5-complexity</kemitix.checkstyle.ruleset.level>
<jacoco-class-line-covered-ratio>1</jacoco-class-line-covered-ratio> <jacoco-class-line-covered-ratio>1</jacoco-class-line-covered-ratio>
<jacoco-class-instruction-covered-ratio>1</jacoco-class-instruction-covered-ratio> <jacoco-class-instruction-covered-ratio>1</jacoco-class-instruction-covered-ratio>
@ -13,17 +12,17 @@
<pitest.coverage>100</pitest.coverage> <pitest.coverage>100</pitest.coverage>
<pitest.mutation>100</pitest.mutation> <pitest.mutation>100</pitest.mutation>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<assertj.version>3.9.1</assertj.version> <assertj.version>3.10.0</assertj.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version> <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version> <tiles-maven-plugin.version>2.11</tiles-maven-plugin.version>
<kemitix-tiles.version>0.8.1</kemitix-tiles.version> <kemitix-tiles.version>0.9.0</kemitix-tiles.version>
<lombok.version>1.16.20</lombok.version> <lombok.version>1.18.0</lombok.version>
</properties> </properties>
<parent> <parent>
<groupId>net.kemitix</groupId> <groupId>net.kemitix</groupId>
<artifactId>kemitix-parent</artifactId> <artifactId>kemitix-parent</artifactId>
<version>5.1.0</version> <version>5.1.1</version>
<relativePath/> <relativePath/>
</parent> </parent>
<artifactId>conditional</artifactId> <artifactId>conditional</artifactId>

4
src/main/java/net/kemitix/conditional/Value.java
View file

@ -100,7 +100,7 @@ public interface Value {
* *
* @param <T> the type of the value * @param <T> the type of the value
*/ */
interface ValueClause<T> { /* default */ interface ValueClause<T> {
/** /**
* Create a {@link ValueSupplier} with the {@link Supplier} should the {@link ValueClause} be true. * Create a {@link ValueSupplier} with the {@link Supplier} should the {@link ValueClause} be true.
@ -157,7 +157,7 @@ public interface Value {
* *
* @param <T> the type of the value * @param <T> the type of the value
*/ */
interface ValueSupplier<T> { /* default */ interface ValueSupplier<T> {
/** /**
* Determine the value by whether the {@link ValueClause} was true or false. * Determine the value by whether the {@link ValueClause} was true or false.