diff --git a/.gitignore b/.gitignore index 709919f..5a2eac3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,28 +10,6 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -# User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml -.idea/dictionaries -.idea/vcs.xml -.idea/jsLibraryMappings.xml - -# Sensitive or high-churn files: -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml - -# Gradle: -.idea/gradle.xml -.idea/libraries - -# Mongo Explorer plugin: -.idea/mongoSettings.xml - ## File-based project format: *.iws @@ -101,3 +79,6 @@ Icon Network Trash Folder Temporary Items .apdisk + +# New items under idea. Just has to remove the whole folder +/.idea/ diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..295289e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,23 @@ +language: java +install: true + +script: +- mvn checkstyle:check +- mvn checkstyle:checkstyle +- mvn checkstyle:checkstyle-aggregate +- mvn jacoco:report +- mvn jacoco:report-aggregate +- mvn verify +- mvn compile +- mvn test +- mvn validate +- mvn jar:jar +- mvn jar:test-jar +- mvn source:jar +- mvn source:test-jar +- mvn spotbugs:check +- mvn surefire:test +- mvn clean package +- mvn clean install +jdk: + - oraclejdk8 diff --git a/config/checkstyle.xml b/config/checkstyle.xml new file mode 100644 index 0000000..b0bae94 --- /dev/null +++ b/config/checkstyle.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/license-header.txt b/config/license-header.txt new file mode 100644 index 0000000..eec06d2 --- /dev/null +++ b/config/license-header.txt @@ -0,0 +1,6 @@ + + iNamik Text Tables for Java + + Copyright (C) 2016 David Farrell (DavidPFarrell@yahoo.com) + + Licensed under The MIT License (MIT), see LICENSE.txt diff --git a/pom.xml b/pom.xml index 6ba2b15..0385184 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,43 @@ inamik-text-tables 0.8 + + + 1.6 + 1.6 + 1.6 + 3.2.5 + false + UTF-8 + + + + 2.2.1 + 2.9.1 + 3.1 + 2.9.1 + 2.4 + 1.6 + 2.5.3 + 3.1.0-RC6 + 0.7.9 + 2.5.2 + 3.0.1 + 2.6 + 3.0.0-M1 + 2.9 + + + false + ${project.basedir}/config/checkstyle.xml + ${project.basedir}/config/license-header.txt + true + 41 + true + true + true + + The MIT License (MIT) @@ -49,23 +86,21 @@ jar - junit junit 4.11 test - - ${basedir} README.md + CHANGELOG.md LICENSE.txt @@ -76,13 +111,14 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + ${maven.source.plugin.version} attach-sources jar-no-fork + package @@ -90,13 +126,14 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${maven.javadoc.plugin.version} attach-javadocs jar + package @@ -104,27 +141,27 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven.compiler.plugin.version} - 1.6 - 1.6 + ${maven.compiler.source.version} + ${maven.compiler.target.version} org.apache.maven.plugins maven-jar-plugin - 2.4 + ${maven.jar.plugin.version} org.apache.maven.plugins maven-gpg-plugin - 1.6 + ${maven.gpg.plugin.version} sign-artifacts - verify + install sign @@ -135,10 +172,162 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + ${maven.release.plugin.version} + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} + + + + checkstyle-aggregate + + + + + ${checkStyle.config.includeTestSourceDirectory} + + ${checkStyle.config.configLocation} + ${checkStyle.config.consoleOutput} + ${checkStyle.config.maxAllowedViolations} + ${checkStyle.config.enableFilesSummary} + ${checkStyle.config.enableRulesSummary} + ${checkStyle.config.enableSeveritySummary} + ${checkStyle.config.headerLocation} + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.plugin.version} + + + enforce-maven + + enforce + + + + + ${required.maven.version} + + + ${required.java.version} + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs.maven.plugin.version} + + + com.github.spotbugs + spotbugs + 3.1.0 + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} + + ${checkStyle.config.configLocation} + ${checkStyle.config.enableRulesSummary} + ${checkStyle.config.headerLocation} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + + true + + http://download.oracle.com/javase/1.8.0/docs/api/ + http://download.oracle.com/javaee/1.8/api/ + http://commons.apache.org/digester/apidocs/ + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven.project.info.reports.plugin.version} + + false + + + + org.codehaus.mojo + cobertura-maven-plugin + ${cobertura.maven.plugin.version} + + true + + html + xml + + + + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs.maven.plugin.version} + + Normal + Default + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven.pmd.plugin.version} + + ${maven.compiler.target.version} + + + + + diff --git a/src/main/java/com/inamik/text/tables/Cell.java b/src/main/java/com/inamik/text/tables/Cell.java index 57478eb..274176e 100644 --- a/src/main/java/com/inamik/text/tables/Cell.java +++ b/src/main/java/com/inamik/text/tables/Cell.java @@ -37,7 +37,7 @@ public final class Cell { - public static final Collection EMPTY = Collections.emptyList(); + public static final Collection EMPTY = Collections.emptyList(); public static Collection of() { return EMPTY; }