Merge fb8e503 into 6e3a428

TNG · Jun 18, 2018 · b48a8b3 · b48a8b3
2 parents 6e3a428 + fb8e503
commit b48a8b3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -67,8 +67,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -101,7 +101,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.9</version>
+                <version>0.8.1</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>
@@ -115,6 +115,14 @@
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
                 <version>4.3.0</version>
+                <dependencies>
+                    <dependency>
+                        <!-- this fixes https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.2.3</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
@@ -152,7 +160,7 @@
         <dependency>
             <groupId>com.tngtech.java</groupId>
             <artifactId>property-loader</artifactId>
-            <version>1.3.1</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/...om/tngtech/configbuilder/annotation/typetransformer/CollectionToArrayListTransformer.java b/...om/tngtech/configbuilder/annotation/typetransformer/CollectionToArrayListTransformer.java
@@ -7,12 +7,12 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-public class CollectionToArrayListTransformer extends TypeTransformer<Collection,ArrayList> {
+public class CollectionToArrayListTransformer extends TypeTransformer<Collection, ArrayList> {
 
     @Override
     public ArrayList transform(Collection argument) {
         ArrayList result = Lists.newArrayList();
-        for(Object value : argument) {
+        for (Object value : argument) {
             result.add(fieldValueTransformer.performNecessaryTransformations(value, ((ParameterizedType) targetType).getActualTypeArguments()[0]));
         }
         return result;

diff --git a/.../com/tngtech/configbuilder/annotation/typetransformer/CollectionToHashSetTransformer.java b/.../com/tngtech/configbuilder/annotation/typetransformer/CollectionToHashSetTransformer.java
@@ -6,12 +6,12 @@
 import java.util.Collection;
 import java.util.HashSet;
 
-public class CollectionToHashSetTransformer extends TypeTransformer<Collection,HashSet> {
+public class CollectionToHashSetTransformer extends TypeTransformer<Collection, HashSet> {
 
     @Override
     public HashSet transform(Collection argument) {
         HashSet result = Sets.newHashSet();
-        for(Object value : argument) {
+        for (Object value : argument) {
             result.add(fieldValueTransformer.performNecessaryTransformations(value, ((ParameterizedType) targetType).getActualTypeArguments()[0]));
         }
         return result;

diff --git a/...builder/annotation/typetransformer/StringCollectionToCommaSeparatedStringTransformer.java b/...builder/annotation/typetransformer/StringCollectionToCommaSeparatedStringTransformer.java
@@ -5,10 +5,10 @@
 import java.util.Collection;
 
 public class StringCollectionToCommaSeparatedStringTransformer extends TypeTransformer<Collection<String>, String> {
-    
+
     @Override
     public String transform(Collection<String> argument) {
-        Joiner joiner = Joiner.on((String)additionalOptions[0]);
+        Joiner joiner = Joiner.on((String) additionalOptions[0]);
         return joiner.join(argument);
     }
 }