From b7c246426cc3e9cf03f9d1a837ca787fcb4ff4d8 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 17 Nov 2020 18:08:39 -0600 Subject: [PATCH] centralize log4j2 and slf4j stub config --- driver-dsegraph-shaded/pom.xml | 6 - mvn-defaults/pom.xml | 1503 ++++++++++++++++---------------- nb-api/pom.xml | 159 ++-- virtdata-lang/pom.xml | 9 - 4 files changed, 832 insertions(+), 845 deletions(-) diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 4b34c86fd..da730fc19 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -97,12 +97,6 @@ - - org.slf4j - slf4j-api - 1.7.25 - - diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 454fc0bd0..97a3d13c5 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -1,770 +1,779 @@ - - 4.0.0 + + 4.0.0 - io.nosqlbench - mvn-defaults - 3.12.156-SNAPSHOT - pom + io.nosqlbench + mvn-defaults + 3.12.156-SNAPSHOT + pom - - UTF-8 - UTF-8 - nosqlbench + + UTF-8 + UTF-8 + nosqlbench - 11 + 11 - - 4.8 - 1.2.0 - 1.14 - 1.20 - 1.8 - 3.9 - 3.6.1 - 1.8 - 3.2.1 - 1.9.0 - 0.61.6 - 3.0.0-RC1 - 2.1.10 - 2.9.8 - 1.11.1 - 1.1.1 - 2.1 - 2.4.0-b180830.0359 - 2.3.0.1 - 2.4.0-b180830.0438 - 2.29 - 2.27 - 9.4.25.v20191220 - 1.22 - 2.9.9 - 5.3.2 + + 4.8 + 1.2.0 + 1.14 + 1.20 + 1.8 + 3.9 + 3.6.1 + 1.8 + 3.2.1 + 1.9.0 + 0.61.6 + 3.0.0-RC1 + 2.1.10 + 2.9.8 + 1.11.1 + 1.1.1 + 2.1 + 2.4.0-b180830.0359 + 2.3.0.1 + 2.4.0-b180830.0438 + 2.29 + 2.27 + 9.4.25.v20191220 + 1.22 + 2.9.9 + 5.3.2 - 1.4.1 - 1.1.0 - 4.0.7 - 2.4.10.Final - - 4.1.47.Final - - 1.0.0 - - 1.23 - 1.1.2.6 + 1.4.1 + 1.1.0 + 4.0.7 + 2.4.10.Final + + 4.1.47.Final + + 1.0.0 + + 1.23 + 1.1.2.6 - - 3.1.0 - 3.8.1 - 3.0.0-M1 - 3.0.0-M3 - 1.6.0 - 3.0.0-M4 - 1.6 - 3.0.0-M1 - 3.1.1 - 3.1.1 - 1.6.8 - 2.5.3 - 3.1.0 - 3.0.1 - 3.0.0-M4 - 20.1.0 - + + 3.1.0 + 3.8.1 + 3.0.0-M1 + 3.0.0-M3 + 1.6.0 + 3.0.0-M4 + 1.6 + 3.0.0-M1 + 3.1.1 + 3.1.1 + 1.6.8 + 2.5.3 + 3.1.0 + 3.0.1 + 3.0.0-M4 + 20.1.0 + - ${project.artifactId} - http://nosqlbench.io/ - - nosqlbench is the core of a programmable workload simulation runtime. - This module acts as the parent pom for nosqlbench Maven modules. - + ${project.artifactId} + http://nosqlbench.io/ + + nosqlbench is the core of a programmable workload simulation runtime. + This module acts as the parent pom for nosqlbench Maven modules. + - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + - - GitHub - https://github.com/nosqlbench/nosqlbench/issues - + + GitHub + https://github.com/nosqlbench/nosqlbench/issues + - - scm:git:https://github.com/nosqlbench/nosqlbench.git - - HEAD - - - - - - - org.junit.jupiter - 5.6.2 - junit-jupiter - test - - - - org.apache.logging.log4j - log4j-api - 2.13.3 - - - - org.apache.logging.log4j - log4j-core - 2.13.3 - - - - javax.activation - activation - ${javax.activation.version} - - - - org.mpierce.metrics.reservoir - hdrhistogram-metrics-reservoir - ${metrics.reservoir.version} - - - - org.hdrhistogram - HdrHistogram - ${hdrhistogram.version} - - - - io.dropwizard.metrics - metrics-graphite - ${metrics.version} - - - - io.dropwizard.metrics - metrics-core - ${metrics.version} - - - - org.apache.commons - commons-text - ${commons.text.version} - - - - - - - - - - org.openjdk.jmh - jmh-core - ${jmh.version} - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - - - - org.yaml - snakeyaml - ${snakeyaml.version} - - - com.mitchtalmadge - ascii-data - ${ascii.data.version} - - - - com.datastax.dse - dse-java-driver-core - ${dse.driver.version} - - - com.datastax.dse - dse-java-driver-extras - ${dse.driver.version} - - - com.datastax.dse - dse-java-driver-mapping - ${dse.driver.version} - - - - - org.lz4 - lz4-java - ${lz4.version} - - - - - org.xerial.snappy - snappy-java - ${snappy.version} - - - - io.netty - netty-handler - ${netty.version} - - - - io.netty - netty-transport-native-epoll - ${netty.version} - linux-x86_64 - - - - io.netty - netty-transport-native-kqueue - 4.1.47.Final - linux-x86_64 - - - - com.github.docker-java - docker-java-api - ${docker.java.version} - - - - com.github.docker-java - docker-java-core - ${docker.java.version} - - - - com.github.docker-java - docker-java-transport-okhttp - ${docker.java.version} - - - - com.github.docker-java - docker-java - ${docker.java.version} - - - - com.github.oshi - oshi-core - 5.2.2 - - - - com.vladsch.flexmark - flexmark-ext-yaml-front-matter - ${flexmark.version} - - - com.vladsch.flexmark - flexmark-html2md-converter - ${flexmark.version} - - - - com.google.code.gson - gson - 2.8.5 - - - - com.elega9t - number-to-words - ${number.to.words.version} - - - - org.greenrobot - essentials - ${greenrobot.version} - - - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - - - com.squareup - javapoet - ${javapoet.version} - - - - joda-time - joda-time - ${joda.time.version} - - - - org.apache.commons - commons-math3 - ${commons.math3.version} - - - - org.apache.commons - commons-csv - ${commons.csv.version} - - - commons-codec - commons-codec - ${commons.codec.version} - - - org.mvel - mvel2 - ${mvel2.version} - - - - org.antlr - antlr4-runtime - ${antlr4.version} - - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - org.eclipse.jetty - jetty-rewrite - ${jetty.version} - - - org.glassfish.jersey.core - jersey-server - ${jersey.version} - - - org.glassfish.jersey.core - jersey-common - ${jersey.version} - - - org.glassfish.jersey.containers - jersey-container-jetty-servlet - ${jersey.version} - - - org.glassfish.jersey.inject - jersey-hk2 - ${jersey.version} - - - - org.apache.commons - commons-compress - ${commons.compress.version} - - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} - - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.media.version} - - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.jaxrs.version} - - - - javax.xml.bind - jaxb-api - ${jaxb.api.version} - - - - com.sun.xml.bind - jaxb-core - ${jaxb.core.version} - - - - com.sun.xml.bind - jaxb-impl - ${jaxb.impl.version} - - - - - org.graalvm.sdk - graal-sdk - ${graalvm.version} - - - org.graalvm.js - js - ${graalvm.version} - runtime - - - org.graalvm.js - js-scriptengine - ${graalvm.version} - - - org.graalvm.tools - profiler - ${graalvm.version} - runtime - - - org.graalvm.tools - chromeinspector - ${graalvm.version} - runtime - - - - + + scm:git:https://github.com/nosqlbench/nosqlbench.git + + HEAD + + - - org.assertj - assertj-core - 3.15.0 - test - + + org.junit.jupiter + 5.6.2 + junit-jupiter + test + - - org.junit.platform - junit-platform-launcher - 1.6.2 - test - - - org.junit.jupiter - junit-jupiter - 5.6.2 - - - org.junit.jupiter - junit-jupiter-engine - 5.6.2 - test - - - org.junit.vintage - junit-vintage-engine - 5.6.2 - test - + + + javax.activation + activation + ${javax.activation.version} + + + + org.mpierce.metrics.reservoir + hdrhistogram-metrics-reservoir + ${metrics.reservoir.version} + + + + org.hdrhistogram + HdrHistogram + ${hdrhistogram.version} + + + + io.dropwizard.metrics + metrics-graphite + ${metrics.version} + + + + io.dropwizard.metrics + metrics-core + ${metrics.version} + + + + org.apache.commons + commons-text + ${commons.text.version} + + + + + + + + + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + com.mitchtalmadge + ascii-data + ${ascii.data.version} + + + + com.datastax.dse + dse-java-driver-core + ${dse.driver.version} + + + com.datastax.dse + dse-java-driver-extras + ${dse.driver.version} + + + com.datastax.dse + dse-java-driver-mapping + ${dse.driver.version} + + + + + org.lz4 + lz4-java + ${lz4.version} + + + + + org.xerial.snappy + snappy-java + ${snappy.version} + + + + io.netty + netty-handler + ${netty.version} + + + + io.netty + netty-transport-native-epoll + ${netty.version} + linux-x86_64 + + + + io.netty + netty-transport-native-kqueue + 4.1.47.Final + linux-x86_64 + + + + com.github.docker-java + docker-java-api + ${docker.java.version} + + + + com.github.docker-java + docker-java-core + ${docker.java.version} + + + + com.github.docker-java + docker-java-transport-okhttp + ${docker.java.version} + + + + com.github.docker-java + docker-java + ${docker.java.version} + + + + com.github.oshi + oshi-core + 5.2.2 + + + + com.vladsch.flexmark + flexmark-ext-yaml-front-matter + ${flexmark.version} + + + com.vladsch.flexmark + flexmark-html2md-converter + ${flexmark.version} + + + + com.google.code.gson + gson + 2.8.5 + + + + com.elega9t + number-to-words + ${number.to.words.version} + + + + org.greenrobot + essentials + ${greenrobot.version} + + + + org.apache.commons + commons-lang3 + ${commons.lang.version} + + + + com.squareup + javapoet + ${javapoet.version} + + + + joda-time + joda-time + ${joda.time.version} + + + + org.apache.commons + commons-math3 + ${commons.math3.version} + + + + org.apache.commons + commons-csv + ${commons.csv.version} + + + commons-codec + commons-codec + ${commons.codec.version} + + + org.mvel + mvel2 + ${mvel2.version} + + + + org.antlr + antlr4-runtime + ${antlr4.version} + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty + jetty-rewrite + ${jetty.version} + + + org.glassfish.jersey.core + jersey-server + ${jersey.version} + + + org.glassfish.jersey.core + jersey-common + ${jersey.version} + + + org.glassfish.jersey.containers + jersey-container-jetty-servlet + ${jersey.version} + + + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} + + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs.version} + + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.media.version} + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.jaxrs.version} + + + + javax.xml.bind + jaxb-api + ${jaxb.api.version} + + + + com.sun.xml.bind + jaxb-core + ${jaxb.core.version} + + + + com.sun.xml.bind + jaxb-impl + ${jaxb.impl.version} + + + + + org.graalvm.sdk + graal-sdk + ${graalvm.version} + + + org.graalvm.js + js + ${graalvm.version} + runtime + + + org.graalvm.js + js-scriptengine + ${graalvm.version} + + + org.graalvm.tools + profiler + ${graalvm.version} + runtime + + + org.graalvm.tools + chromeinspector + ${graalvm.version} + runtime + + - + + + + org.apache.logging.log4j + log4j-api + 2.14.0 + + + + org.apache.logging.log4j + log4j-core + 2.14.0 + + + + org.apache.logging.log4j + log4j-slf4j-impl + 2.14.0 + + + + org.assertj + assertj-core + 3.15.0 + test + + + + org.junit.platform + junit-platform-launcher + 1.6.2 + test + + + org.junit.jupiter + junit-jupiter + 5.6.2 + + + org.junit.jupiter + junit-jupiter-engine + 5.6.2 + test + + + org.junit.vintage + junit-vintage-engine + 5.6.2 + test + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + + 11 + 11 + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + **/*Integrated*Test*.java + **/*IntegrationTest.java + **/*IntegrationTests.java + + + **/*Test*.java + + false + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-tests + integration-test + + integration-test + verify + + + + + + always + + **/*Integrated*Test*.java + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${javadoc.name} + ${javadoc.name} + false + false + false + false + + -Xdoclint:none + -Xdoclint:none + none + + + + attach-javadoc + + jar + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar-no-fork + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + + + + org.apache.maven.plugins + maven-release-plugin + ${release.plugin.version} + + + org.apache.maven.plugins + maven-gpg-plugin + ${gpg.plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${failsafe.plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.plugin.version} + + + org.apache.maven.plugins + maven-source-plugin + ${source.plugin.version} + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.plugin.version} + + + org.antlr + antlr4-maven-plugin + 4.8 + + + org.codehaus.mojo + exec-maven-plugin + ${exec.plugin.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${enforcer.plugin.version} + + + org.apache.maven.plugins + maven-clean-plugin + ${clean.plugin.version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${resources.plugin.version} + + + org.apache.maven.plugins + maven-jar-plugin + ${jar.plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${install.plugin.version} + + + org.apache.maven.plugins + maven-deploy-plugin + ${deploy.plugin.version} + + + + + + + + + + Jonathan Shook + jshook@gmail.com + nosqlbench.io + http://nosqlbench.io/ + + + Sebastián Estévez + estevezsebastian@gmail.com + nosqlbench.io + http://nosqlbench.io/ + + + + + + ossrh-snapshot + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + + + + + release + - - org.apache.maven.plugins - maven-compiler-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + - true - - 11 - 11 - - - - - + + --pinentry-mode + loopback + - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - **/*Integrated*Test*.java - **/*IntegrationTest.java - **/*IntegrationTests.java - - - **/*Test*.java - - false - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - run-tests - integration-test - - integration-test - verify - - - - - - always - - **/*Integrated*Test*.java - **/*IntegrationTest.java - **/*IntegrationTests.java - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - ${javadoc.name} - ${javadoc.name} - false - false - false - false - - -Xdoclint:none - -Xdoclint:none - none - - - - attach-javadoc - - jar - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar-no-fork - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - true - - - - - org.apache.maven.plugins - maven-gpg-plugin - + + + + + - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - - org.apache.maven.plugins - maven-release-plugin - ${release.plugin.version} - - - org.apache.maven.plugins - maven-gpg-plugin - ${gpg.plugin.version} - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.plugin.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${failsafe.plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc.plugin.version} - - - org.apache.maven.plugins - maven-source-plugin - ${source.plugin.version} - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.plugin.version} - - - org.antlr - antlr4-maven-plugin - 4.8 - - - org.codehaus.mojo - exec-maven-plugin - ${exec.plugin.version} - - - org.apache.maven.plugins - maven-enforcer-plugin - ${enforcer.plugin.version} - - - org.apache.maven.plugins - maven-clean-plugin - ${clean.plugin.version} - - - - org.apache.maven.plugins - maven-resources-plugin - ${resources.plugin.version} - - - org.apache.maven.plugins - maven-jar-plugin - ${jar.plugin.version} - - - org.apache.maven.plugins - maven-install-plugin - ${install.plugin.version} - - - org.apache.maven.plugins - maven-deploy-plugin - ${deploy.plugin.version} - - - - - - - - - - Jonathan Shook - jshook@gmail.com - nosqlbench.io - http://nosqlbench.io/ - - - Sebastián Estévez - estevezsebastian@gmail.com - nosqlbench.io - http://nosqlbench.io/ - - - - - - ossrh-snapshot - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - - - - - release - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - - - - + diff --git a/nb-api/pom.xml b/nb-api/pom.xml index a606f48b1..b1ff56ebb 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -1,100 +1,93 @@ - - 4.0.0 + + 4.0.0 - - mvn-defaults - io.nosqlbench - 3.12.156-SNAPSHOT - ../mvn-defaults - + + mvn-defaults + io.nosqlbench + 3.12.156-SNAPSHOT + ../mvn-defaults + - nb-api - jar - ${project.artifactId} - - The top level API module for NoSQLBench. This module should have no internal - module dependencies other than the mvn-default module. - All modules within NoSQLBench can safely depend on this module with circular - dependencies. This module provides cross-cutting code infrastracture, such as - path utilities and ways of describing services used between modules. - It is also the transitive aggregation point for system-wide library dependencies - for logging and testing or similar needs. - + nb-api + jar + ${project.artifactId} + + The top level API module for NoSQLBench. This module should have no internal + module dependencies other than the mvn-default module. + All modules within NoSQLBench can safely depend on this module with circular + dependencies. This module provides cross-cutting code infrastracture, such as + path utilities and ways of describing services used between modules. + It is also the transitive aggregation point for system-wide library dependencies + for logging and testing or similar needs. + - + - - + + - - - io.nosqlbench - nb-annotations - 3.12.156-SNAPSHOT - + + + io.nosqlbench + nb-annotations + 3.12.156-SNAPSHOT + - - com.vladsch.flexmark - flexmark-ext-yaml-front-matter - - - com.vladsch.flexmark - flexmark-html2md-converter - + + com.vladsch.flexmark + flexmark-ext-yaml-front-matter + - - org.apache.logging.log4j - log4j-api - + + com.vladsch.flexmark + flexmark-html2md-converter + - - org.apache.logging.log4j - log4j-core - + + net.sf.jopt-simple + jopt-simple + 5.0.3 + - - net.sf.jopt-simple - jopt-simple - 5.0.3 - + + com.google.code.gson + gson + - - com.google.code.gson - gson - + - + + org.openjdk.jmh + jmh-core + + + org.openjdk.jmh + jmh-generator-annprocess + - - org.openjdk.jmh - jmh-core - - - org.openjdk.jmh - jmh-generator-annprocess - + + + org.apache.commons + commons-csv + - - - org.apache.commons - commons-csv - + - - - - - - src/main/resources - - docs-for-testing-only/** - - - ** - - - - + + + + src/main/resources + + docs-for-testing-only/** + + + ** + + + + diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index d883e3ac0..f397d8bda 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -20,15 +20,6 @@ antlr4-runtime - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - -