diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..090490f --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,58 @@ +# Java Maven CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-java/ for more details +# +version: 2 +jobs: + build: + docker: + # specify the version you desire here + - image: circleci/openjdk:8-jdk + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/postgres:9.4 + + working_directory: ~/repo + + environment: + # Customize the JVM maximum heap limit + MAVEN_OPTS: -Xmx3200m + + steps: + - checkout + + # run tests! + - run: mvn --batch-mode test jacoco:report + + - run: bash <(curl -s https://codecov.io/bash) + deployment: + docker: + # specify the version you desire here + - image: circleci/openjdk:8-jdk + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/postgres:9.4 + + working_directory: ~/repo + + environment: + # Customize the JVM maximum heap limit + MAVEN_OPTS: -Xmx3200m + + steps: + - checkout + + # run deployment! + - run: mvn --batch-mode deploy -Dmaven.test.skip -DcreateDocs=true -s settings.xml +workflows: + version: 2 + build_deploy: + jobs: + - build + - deployment: + requires: + - build diff --git a/.gitignore b/.gitignore index aaf2f97..55a2163 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ hs_err_pid* /.project /.idea/ nb-configuration.xml +/jackson/ diff --git a/assertj/pom.xml b/assertj/pom.xml index e77f3a1..b713291 100644 --- a/assertj/pom.xml +++ b/assertj/pom.xml @@ -4,15 +4,15 @@ tec.uom.lib uom-lib - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT uom-lib-assertj - 0.2-SNAPSHOT + 1.0 org.assertj assertj-core - 2.5.0 + 2.9.1 javax.measure @@ -30,7 +30,56 @@ Units of Measurement AssertJ Library + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + true + true + true + false + ${maven.compile.sourceLevel} + true + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + tec.uom.lib.* + + + + + + java8 diff --git a/assertj/src/main/java/tec/uom/lib/assertj/assertions/DimensionAssert.java b/assertj/src/main/java/tec/uom/lib/assertj/assertions/DimensionAssert.java index 732d1e5..429e193 100644 --- a/assertj/src/main/java/tec/uom/lib/assertj/assertions/DimensionAssert.java +++ b/assertj/src/main/java/tec/uom/lib/assertj/assertions/DimensionAssert.java @@ -1,3 +1,32 @@ +/* + * Units of Measurement AssertJ Library for Java + * Copyright (c) 2015-2018, Werner Keil and others + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions + * and the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JSR-363, Units of Measurement nor the names of their contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package tec.uom.lib.assertj.assertions; import javax.measure.Dimension; diff --git a/assertj/src/main/java/tec/uom/lib/assertj/assertions/QuantityAssert.java b/assertj/src/main/java/tec/uom/lib/assertj/assertions/QuantityAssert.java index 580d3a8..88e9d92 100644 --- a/assertj/src/main/java/tec/uom/lib/assertj/assertions/QuantityAssert.java +++ b/assertj/src/main/java/tec/uom/lib/assertj/assertions/QuantityAssert.java @@ -1,3 +1,32 @@ +/* + * Units of Measurement AssertJ Library for Java + * Copyright (c) 2015-2018, Werner Keil and others + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions + * and the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JSR-363, Units of Measurement nor the names of their contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package tec.uom.lib.assertj.assertions; import javax.measure.Quantity; diff --git a/assertj/src/main/java/tec/uom/lib/assertj/assertions/UnitAssert.java b/assertj/src/main/java/tec/uom/lib/assertj/assertions/UnitAssert.java index 48012c6..54cdce7 100644 --- a/assertj/src/main/java/tec/uom/lib/assertj/assertions/UnitAssert.java +++ b/assertj/src/main/java/tec/uom/lib/assertj/assertions/UnitAssert.java @@ -1,3 +1,32 @@ +/* + * Units of Measurement AssertJ Library for Java + * Copyright (c) 2015-2018, Werner Keil and others + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions + * and the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JSR-363, Units of Measurement nor the names of their contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package tec.uom.lib.assertj.assertions; import javax.measure.Dimension; diff --git a/assertj/src/test/java/tec/uom/lib/assertj/AssertionsTest.java b/assertj/src/test/java/tec/uom/lib/assertj/AssertionsTest.java index e50a7fd..02fc8e0 100644 --- a/assertj/src/test/java/tec/uom/lib/assertj/AssertionsTest.java +++ b/assertj/src/test/java/tec/uom/lib/assertj/AssertionsTest.java @@ -1,6 +1,34 @@ +/* + * Units of Measurement AssertJ Library for Java + * Copyright (c) 2015-2018, Werner Keil and others + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions + * and the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JSR-363, Units of Measurement nor the names of their contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package tec.uom.lib.assertj; -import static org.junit.Assert.*; import static tec.uom.lib.assertj.Assertions.*; import javax.measure.Unit; diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 6749226..0000000 --- a/circle.yml +++ /dev/null @@ -1,6 +0,0 @@ -general: - artifacts: - - "target" # files, relative to the build directory -machine: - java: - version: oraclejdk8 diff --git a/common/pom.xml b/common/pom.xml index 41d83e5..7b52b98 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ tec.uom.lib uom-lib - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT uom-lib-common Units of Measurement Common Library @@ -21,7 +21,6 @@ junit junit - ${junit.version} test @@ -72,7 +71,6 @@ - diff --git a/pom.xml b/pom.xml index 3b451f8..ebc2750 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uom-lib tec.uom.lib - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT tec.uom uom-parent @@ -136,9 +136,9 @@ - jcenter - JCenter - http://jcenter.bintray.com + jcenter + JCenter + http://jcenter.bintray.com