diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index f568835..6285643 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -56,7 +56,7 @@ jobs: - name: Sonar analysis if: ${{ env.SONAR_TOKEN != null && startsWith(matrix.scala-version, 'scala2.13') }} run: | - mvn --batch-mode scoverage:report org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ + mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -DtrimStackTrace=false \ -P${{ matrix.scala-version }} \ diff --git a/dependencies.md b/dependencies.md index aefc607..d6b869a 100644 --- a/dependencies.md +++ b/dependencies.md @@ -16,37 +16,37 @@ ## Test Dependencies -| Dependency | License | -| --------------------------- | ----------------------------------------- | -| [scalatest][15] | [the Apache License, ASL Version 2.0][16] | -| [scalatestplus-mockito][17] | [Apache-2.0][16] | -| [mockito-core][18] | [The MIT License][19] | +| Dependency | License | +| ----------------------------------------- | ----------------------------------------- | +| [scalatest][15] | [the Apache License, ASL Version 2.0][16] | +| [scalatestplus-mockito][17] | [Apache-2.0][16] | +| [mockito-core][18] | [The MIT License][19] | +| [EqualsVerifier | release normal jar][20] | [Apache License, Version 2.0][7] | ## Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | --------------------------------------------- | -| [SonarQube Scanner for Maven][20] | [GNU LGPL 3][21] | -| [Apache Maven Compiler Plugin][22] | [Apache License, Version 2.0][7] | -| [Apache Maven Enforcer Plugin][23] | [Apache License, Version 2.0][7] | -| [Maven Flatten Plugin][24] | [Apache Software Licenese][9] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][25] | [ASL2][9] | -| [Reproducible Build Maven Plugin][26] | [Apache 2.0][9] | -| [scala-maven-plugin][27] | [Public domain (Unlicense)][28] | -| [Maven Surefire Plugin][29] | [Apache License, Version 2.0][7] | -| [Versions Maven Plugin][30] | [Apache License, Version 2.0][7] | -| [Apache Maven Deploy Plugin][31] | [Apache License, Version 2.0][7] | -| [Apache Maven GPG Plugin][32] | [Apache License, Version 2.0][7] | -| [Apache Maven Source Plugin][33] | [Apache License, Version 2.0][7] | -| [Apache Maven Javadoc Plugin][34] | [Apache License, Version 2.0][7] | -| [Nexus Staging Maven Plugin][35] | [Eclipse Public License][36] | -| [JaCoCo :: Maven Plugin][37] | [Eclipse Public License 2.0][38] | -| [error-code-crawler-maven-plugin][39] | [MIT][5] | -| [ScalaTest Maven Plugin][40] | [the Apache License, ASL Version 2.0][16] | -| [Apache Maven Assembly Plugin][41] | [Apache License, Version 2.0][7] | -| [OpenFastTrace Maven Plugin][42] | [GNU General Public License v3.0][43] | -| [Project keeper maven plugin][44] | [The MIT License][45] | -| [SCoverage Maven Plugin][46] | [The Apache Software License, Version 2.0][9] | +| [SonarQube Scanner for Maven][21] | [GNU LGPL 3][22] | +| [Apache Maven Compiler Plugin][23] | [Apache License, Version 2.0][7] | +| [Apache Maven Enforcer Plugin][24] | [Apache License, Version 2.0][7] | +| [Maven Flatten Plugin][25] | [Apache Software Licenese][9] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][26] | [ASL2][9] | +| [Reproducible Build Maven Plugin][27] | [Apache 2.0][9] | +| [scala-maven-plugin][28] | [Public domain (Unlicense)][29] | +| [Maven Surefire Plugin][30] | [Apache License, Version 2.0][7] | +| [Versions Maven Plugin][31] | [Apache License, Version 2.0][7] | +| [Apache Maven Deploy Plugin][32] | [Apache License, Version 2.0][7] | +| [Apache Maven GPG Plugin][33] | [Apache License, Version 2.0][7] | +| [Apache Maven Source Plugin][34] | [Apache License, Version 2.0][7] | +| [Apache Maven Javadoc Plugin][35] | [Apache License, Version 2.0][7] | +| [Nexus Staging Maven Plugin][36] | [Eclipse Public License][37] | +| [JaCoCo :: Maven Plugin][38] | [Eclipse Public License 2.0][39] | +| [error-code-crawler-maven-plugin][40] | [MIT][5] | +| [ScalaTest Maven Plugin][41] | [the Apache License, ASL Version 2.0][16] | +| [Apache Maven Assembly Plugin][42] | [Apache License, Version 2.0][7] | +| [OpenFastTrace Maven Plugin][43] | [GNU General Public License v3.0][44] | +| [Project keeper maven plugin][45] | [The MIT License][46] | | [Scalastyle Maven Plugin][47] | [Apache 2.0][14] | | [spotless-maven-plugin][48] | [The Apache Software License, Version 2.0][7] | | [scalafix-maven-plugin][49] | [BSD-3-Clause][50] | @@ -76,33 +76,33 @@ [17]: https://github.com/scalatest/scalatestplus-mockito [18]: https://github.com/mockito/mockito [19]: https://github.com/mockito/mockito/blob/main/LICENSE -[20]: http://sonarsource.github.io/sonar-scanner-maven/ -[21]: http://www.gnu.org/licenses/lgpl.txt -[22]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[23]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ -[24]: https://www.mojohaus.org/flatten-maven-plugin/ -[25]: https://sonatype.github.io/ossindex-maven/maven-plugin/ -[26]: http://zlika.github.io/reproducible-build-maven-plugin -[27]: http://github.com/davidB/scala-maven-plugin -[28]: http://unlicense.org/ -[29]: https://maven.apache.org/surefire/maven-surefire-plugin/ -[30]: http://www.mojohaus.org/versions-maven-plugin/ -[31]: https://maven.apache.org/plugins/maven-deploy-plugin/ -[32]: https://maven.apache.org/plugins/maven-gpg-plugin/ -[33]: https://maven.apache.org/plugins/maven-source-plugin/ -[34]: https://maven.apache.org/plugins/maven-javadoc-plugin/ -[35]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ -[36]: http://www.eclipse.org/legal/epl-v10.html -[37]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[38]: https://www.eclipse.org/legal/epl-2.0/ -[39]: https://github.com/exasol/error-code-crawler-maven-plugin -[40]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin -[41]: https://maven.apache.org/plugins/maven-assembly-plugin/ -[42]: https://github.com/itsallcode/openfasttrace-maven-plugin -[43]: https://www.gnu.org/licenses/gpl-3.0.html -[44]: https://github.com/exasol/project-keeper/ -[45]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[46]: https://scoverage.github.io/scoverage-maven-plugin/1.4.11/ +[20]: https://www.jqno.nl/equalsverifier +[21]: http://sonarsource.github.io/sonar-scanner-maven/ +[22]: http://www.gnu.org/licenses/lgpl.txt +[23]: https://maven.apache.org/plugins/maven-compiler-plugin/ +[24]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ +[25]: https://www.mojohaus.org/flatten-maven-plugin/ +[26]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[27]: http://zlika.github.io/reproducible-build-maven-plugin +[28]: http://github.com/davidB/scala-maven-plugin +[29]: http://unlicense.org/ +[30]: https://maven.apache.org/surefire/maven-surefire-plugin/ +[31]: http://www.mojohaus.org/versions-maven-plugin/ +[32]: https://maven.apache.org/plugins/maven-deploy-plugin/ +[33]: https://maven.apache.org/plugins/maven-gpg-plugin/ +[34]: https://maven.apache.org/plugins/maven-source-plugin/ +[35]: https://maven.apache.org/plugins/maven-javadoc-plugin/ +[36]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ +[37]: http://www.eclipse.org/legal/epl-v10.html +[38]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[39]: https://www.eclipse.org/legal/epl-2.0/ +[40]: https://github.com/exasol/error-code-crawler-maven-plugin +[41]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin +[42]: https://maven.apache.org/plugins/maven-assembly-plugin/ +[43]: https://github.com/itsallcode/openfasttrace-maven-plugin +[44]: https://www.gnu.org/licenses/gpl-3.0.html +[45]: https://github.com/exasol/project-keeper/ +[46]: https://github.com/exasol/project-keeper/blob/main/LICENSE [47]: http://www.scalastyle.org [48]: https://github.com/diffplug/spotless [49]: https://github.com/evis/scalafix-maven-plugin diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 1b70e29..810afae 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [0.4.3](changes_0.4.3.md) * [0.4.2](changes_0.4.2.md) * [0.4.1](changes_0.4.1.md) * [0.4.0](changes_0.4.0.md) diff --git a/doc/changes/changes_0.4.3.md b/doc/changes/changes_0.4.3.md new file mode 100644 index 0000000..90859ac --- /dev/null +++ b/doc/changes/changes_0.4.3.md @@ -0,0 +1,19 @@ +# Import Export UDF Common Scala 0.4.3, released 2022-??-?? + +Code name: + +## Summary + +## Refactoring + +* #29: Changed to Jacoco coverage plugin and fixed Sonar coverage badge + +## Dependency Updates + +### Test Dependency Updates + +* Added `nl.jqno.equalsverifier:equalsverifier:3.10.1` + +### Plugin Dependency Updates + +* Removed `org.scoverage:scoverage-maven-plugin:1.4.11` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 6b2214d..f6e0138 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol import-export-udf-common-scala-generated-parent - 0.4.2 + 0.4.3 pom UTF-8 diff --git a/pom.xml b/pom.xml index ae77b9a..59f5e97 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,16 @@ 4.0.0 com.exasol import-export-udf-common-scala - 0.4.2 + 0.4.3 Import Export UDF Common Scala Common import export libraries used in Exasol user defined functions https://github.com/exasol/import-export-udf-common-scala/ + + import-export-udf-common-scala-generated-parent + com.exasol + 0.4.3 + pk_generated_parent.pom + 6.1.7 @@ -20,6 +26,8 @@ 3.2.13 1.0.0-M2 4.6.1 + . + src/main/** @@ -139,6 +147,12 @@ ${mockito.version} test + + nl.jqno.equalsverifier + equalsverifier + 3.10.1 + test + ${project.artifactId}_${scala.compat.version}-${project.version} @@ -217,9 +231,12 @@ org.apache.maven.plugins maven-surefire-plugin - - true - + + + default-test + none + + org.scalatest @@ -227,9 +244,7 @@ 2.0.2 . - TestSuite.txt - -Djava.util.logging.config.file=src/test/resources/logging.properties - ${project.build.directory}/surefire-reports + -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} @@ -237,6 +252,10 @@ test + + TestSuite.txt + ${project.build.directory}/surefire-reports + @@ -295,16 +314,6 @@ - - org.scoverage - scoverage-maven-plugin - 1.4.11 - - ${scala.version} - true - true - - org.scalastyle scalastyle-maven-plugin @@ -395,10 +404,4 @@ - - import-export-udf-common-scala-generated-parent - com.exasol - 0.4.2 - pk_generated_parent.pom - diff --git a/src/test/scala/com/exasol/common/PropertiesParserTest.scala b/src/test/scala/com/exasol/common/PropertiesParserTest.scala index d4fe56e..140df3e 100644 --- a/src/test/scala/com/exasol/common/PropertiesParserTest.scala +++ b/src/test/scala/com/exasol/common/PropertiesParserTest.scala @@ -1,5 +1,6 @@ package com.exasol.common +import nl.jqno.equalsverifier.EqualsVerifier import org.scalatest.funsuite.AnyFunSuite class PropertiesParserTest extends AnyFunSuite { @@ -28,4 +29,8 @@ class PropertiesParserTest extends AnyFunSuite { assert(parser.mapToString(Map.empty[String, String]) === "") } + test("verify contract") { + EqualsVerifier.forClass(classOf[PropertiesParser]).verify() + } + }