This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch LicenseSwap in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git
commit 9aa8cbdd624fb07d838e92471c69614f395ba113 Author: Lee Rhodes <[email protected]> AuthorDate: Thu Jun 13 18:44:23 2019 -0700 Update pom with cobertura / coveralls --- .travis.yml | 26 +++- pom.xml | 467 +++++++++++++++++++++++++----------------------------------- 2 files changed, 215 insertions(+), 278 deletions(-) diff --git a/.travis.yml b/.travis.yml index 223e6d7..eef8783 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,41 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # http://docs.travis-ci.com/user/customizing-the-build/ +# Execute Maven to create Cobertura report and submit Coveralls data: +#. mvn cobertura:cobertura coveralls:report + language: java +sudo: false # faster builds + jdk: - oraclejdk8 - #TODO-JDK9: - oraclejdk9 install: - mvn install -Dmaven.javadoc.skip=true -Dsource.skip=true -DskipTests=true -Dgpg.skip=true - #TODO-JDK9: - mvn install -Dmaven.compiler.fork=true -Dmaven.javadoc.skip=true -Dsource.skip=true -DskipTests=true -Dgpg.skip=true -Pstrict before_script: - _JAVA_OPTIONS="-Xmx4g -Xms1g" script: - mvn clean compile test -Dgpg.skip=true - #TODO-JDK9: - mvn clean compile test -Dgpg.skip=true -Pstrict -Dmaven.compiler.fork=true after_success: - - mvn clean test jacoco:report coveralls:report -DrepoToken=$coveralls_token - #TODO-JDK9: - mvn clean test jacoco:report coveralls:report -DrepoToken=$coveralls_token -Pstrict -Dmaven.compiler.fork=true + - mvn clean cobertura:cobertura coveralls:report notifications: email: false diff --git a/pom.xml b/pom.xml index cad31a5..cf32091 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ <groupId>org.apache.datasketches</groupId> <artifactId>datasketches-memory</artifactId> + <packaging>jar</packaging> <!-- jar is the default --> <version>0.12.3-incubating-SNAPSHOT</version> <!-- Project Information --> @@ -41,15 +42,26 @@ <developers> <developer> <name>Apache DataSketches Committers</name> - <url>https://druid.apache.org/community/#committers</url> + <url>https://datasketches.apache.org/community/#committers</url> </developer> </developers> - <contributors> - <contributor> - <url>https://github.com/DataSketches/memory/graphs/contributors</url> - </contributor> - </contributors> + <mailingLists> + <mailingList> + <name>Apache DataSketches (incubating) developers list</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>https://mail-archives.apache.org/mod_mbox/datasketches-dev</archive> + </mailingList> + <mailingList> + <name>sketches-user</name> + <archive>https://groups.google.com/forum/#!forum/sketches-user</archive> + <subscribe>mailto:sketches-user%[email protected]</subscribe> + <unsubscribe>mailto:sketches-user%[email protected]</unsubscribe> + <post>mailto:[email protected]</post> + </mailingList> + </mailingLists> <!-- End Project Information --> <properties> @@ -59,16 +71,15 @@ <project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding> <project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding> <project.reporting.outputEncoding>${charset.encoding}</project.reporting.outputEncoding> - <java.version>1.8</java.version> <!-- TODO-JDK9: 1.9 --> + <java.version>1.8</java.version> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <!-- Dependencies --> <testng.version>6.14.3</testng.version> - <protobuf-java.version>3.6.0</protobuf-java.version> - <findbugs.version>3.0.1</findbugs.version> + <protobuf-java.version>3.6.0</protobuf-java.version> <!-- Used for UTF8 testing --> <slf4j-api.version>1.7.25</slf4j-api.version> - + <!-- Maven Plugins --> <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version> <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version> @@ -79,7 +90,7 @@ <maven-help-plugin.version>3.1.0</maven-help-plugin.version> <maven-install-plugin.version>2.5.2</maven-install-plugin.version> <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version> - <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version> + <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version> <maven-release-plugin.version>2.5.3</maven-release-plugin.version> <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version> <maven-site-plugin.version>3.5.1</maven-site-plugin.version> @@ -87,13 +98,11 @@ <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version> <!-- Codehaus.org Maven Plugins --> + <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version> <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version> - <license-maven-plugin.version>1.16</license-maven-plugin.version> + <license-maven-plugin.version>1.19</license-maven-plugin.version> <plexus-compiler-javac-errorprone.version>2.8.5</plexus-compiler-javac-errorprone.version> - <!-- Jacoco.org Maven Plugins --> - <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version> - <!-- Sonatype.org Maven Plugins --> <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version> @@ -109,26 +118,9 @@ <ciManagement> <system>travis</system> - <url>https://travis-ci.org/DataSketches/memory</url> + <url>https://travis-ci.org/apache/incubator-datasketches-memory</url> </ciManagement> - <mailingLists> - <mailingList> - <name>Apache DataSketches (incubating) developers list</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - <archive>https://mail-archives.apache.org/mod_mbox/datasketches-dev</archive> - </mailingList> - <mailingList> - <name>sketches-user</name> - <archive>https://groups.google.com/forum/#!forum/sketches-user</archive> - <subscribe>mailto:sketches-user%[email protected]</subscribe> - <unsubscribe>mailto:sketches-user%[email protected]</unsubscribe> - <post>mailto:[email protected]</post> - </mailingList> - </mailingLists> - <scm> <connection>scm:git:ssh://[email protected]/apache/incubator-datasketches-memory.git</connection> <developerConnection>scm:git:ssh://[email protected]/apache/incubator-datasketches-memory.git</developerConnection> @@ -155,54 +147,14 @@ </repository> </distributionManagement> - <!-- This is optional --> - <profiles> - <profile> - <id>strict</id> - <build> - <pluginManagement> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <compilerId>javac-with-errorprone</compilerId> <!-- TODO-JDK9: remove? --> - <forceJavacCompilerUse>true</forceJavacCompilerUse> <!-- TODO-JDK9: remove? --> - <!-- TODO-JDK9: add, convert -x- to two dashes: - <compilerArgument>-Xlint:deprecation</compilerArgument> - <encoding>UTF-8</encoding> - <compilerArgs> - <arg> -x-add-exports</arg><arg>java.base/jdk.internal.ref=ALL-UNNAMED</arg> - <arg> -x-add-exports</arg><arg>java.base/sun.nio.ch=ALL-UNNAMED</arg> - </compilerArgs> - --> - </configuration> - <dependencies> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compiler-javac-errorprone</artifactId> - <version>${plexus-compiler-javac-errorprone.version}</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> - <!-- End of Environment Settings --> - <dependencies> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j-api.version}</version> </dependency> - <!-- Compile, Test Scope --> + + <!-- Test Scope --> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> @@ -217,12 +169,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>${findbugs.version}</version> - <scope>test</scope> - </dependency> - <dependency> <!-- Used for xxHash testing --> <groupId>net.openhft</groupId> <artifactId>zero-allocation-hashing</artifactId> @@ -273,93 +219,30 @@ <artifactId>nexus-staging-maven-plugin</artifactId> <extensions>true</extensions> <configuration> - <serverId>sonatype-nexus-staging</serverId> + <serverId>sonatype-nexus-staging</serverId> <!-- from ~/.m2/settings.xml --> <nexusUrl>https://oss.sonatype.org/</nexusUrl> <autoReleaseAfterClose>false</autoReleaseAfterClose> </configuration> </plugin> - <!-- Code coverage plugin, generates coverage report to target/site/jacoco/ - To skip coverage generation add -Djacoco.skip=true --> + <!-- Generates code coverage report from website. --> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <executions> - <!-- Prepares the property pointing to the JaCoCo runtime agent which - is passed as VM argument when Maven the Surefire plugin is executed. --> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <destFile>${jacoco.ut.execution.data.file}</destFile> - </configuration> - </execution> - <!-- Ensures that the code coverage report for unit tests is created after - unit tests have been run. --> - <execution> - <id>post-unit-test</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <dataFile>${jacoco.ut.execution.data.file}</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - <execution> - <id>default-check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <rules> - <!-- implementation is needed only for Maven 2 --> - <rule implementation="org.jacoco.maven.RuleConfiguration"> - <element>BUNDLE</element> - <limits> - <!-- implementation is needed only for Maven 2 --> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>INSTRUCTION</counter> - <value>COVEREDRATIO</value> - <minimum>0.89</minimum> - </limit> - </limits> - </rule> - </rules> - </configuration> - </execution> - </executions> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> </plugin> - <!-- Coveralls is a online code coverage reporting tool that leverages JaCoCo --> + <!-- Submit code coverage report to Coveralls.io. --> <plugin> <groupId>org.eluder.coveralls</groupId> <artifactId>coveralls-maven-plugin</artifactId> <configuration> - <repoToken /> + <!-- Since we use Travis CI we do not have to put a Coveralls token here. --> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <enableAssertions>true</enableAssertions> - <!-- TODO-JDK9 add, convert -x- to two dashes: - <argLine> - -x-add-exports java.base/jdk.internal.ref=ALL-UNNAMED - -x-add-exports java.base/jdk.internal.misc=ALL-UNNAMED - -x-add-opens=java.base/sun.nio.ch=ALL-UNNAMED - -x-add-opens=java.base/java.nio=ALL-UNNAMED - </argLine> - --> - </configuration> </plugin> <plugin> @@ -375,134 +258,172 @@ </execution> </executions> </plugin> - </plugins> <pluginManagement> <plugins> - <!-- ORG.APACHE.MAVEN --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>${maven-clean-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>${maven-deploy-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>${maven-gpg-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-help-plugin</artifactId> - <version>${maven-help-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>${maven-install-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven-javadoc-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>${maven-release-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${maven-resources-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>${maven-site-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>${maven-source-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - </plugin> - - <!-- OTHER --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>${exec-maven-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>${license-maven-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.eluder.coveralls</groupId> - <artifactId>coveralls-maven-plugin</artifactId> - <version>${coveralls-maven-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco-maven-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>${nexus-staging-maven-plugin.version}</version> - </plugin> + <!-- ORG.APACHE.MAVEN --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>${maven-clean-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>${maven-deploy-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>${maven-gpg-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-help-plugin</artifactId> + <version>${maven-help-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>${maven-install-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${maven-javadoc-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>${maven-release-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${maven-resources-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>${maven-site-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${maven-source-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + </plugin> + + <!-- OTHER --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>${exec-maven-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>${license-maven-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>${cobertura-maven-plugin.version}</version> + <configuration> + <format>xml</format> + <!-- aggregated reports for multi-module projects, for when we use modules --> + <aggregate>true</aggregate> + </configuration> + </plugin> + + <plugin> + <groupId>org.eluder.coveralls</groupId> + <artifactId>coveralls-maven-plugin</artifactId> + <version>${coveralls-maven-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>${nexus-staging-maven-plugin.version}</version> + </plugin> </plugins> </pluginManagement> </build> -</project> \ No newline at end of file + + <reporting /> + + <!-- This is optional --> + <profiles> + <profile> + <id>strict</id> + <build> + <pluginManagement> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + <compilerId>javac-with-errorprone</compilerId> + <forceJavacCompilerUse>true</forceJavacCompilerUse> + </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compiler-javac-errorprone</artifactId> + <version>${plexus-compiler-javac-errorprone.version}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> +</project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
