diff --git a/cryptography/pom.xml b/cryptography/pom.xml index 5529f7dca..45e9f190f 100644 --- a/cryptography/pom.xml +++ b/cryptography/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 @@ -14,6 +14,10 @@ Digests, Signatures, Bloomfilters and cryptographic abstractions + + org.slf4j + slf4j-api + com.salesforce.apollo grpc diff --git a/grpc/pom.xml b/grpc/pom.xml index 163c27a19..627417801 100644 --- a/grpc/pom.xml +++ b/grpc/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.salesforce.apollo @@ -10,6 +11,14 @@ Module that defines and generates all proto/grpc for Apollo + + com.google.guava + guava + + + com.google.protobuf + protobuf-java + org.apache.tomcat @@ -18,6 +27,16 @@ io.grpc grpc-protobuf + + + com.google.protobuf + protobuf-java + + + com.google.guava + guava + + io.grpc @@ -36,4 +55,4 @@ - \ No newline at end of file + diff --git a/memberships/pom.xml b/memberships/pom.xml index 73b7d5f29..c417f866b 100644 --- a/memberships/pom.xml +++ b/memberships/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 com.salesforce.apollo @@ -11,6 +11,10 @@ Memberships Fundamental Membership and BFT Group Communication Ring Overlay + + org.slf4j + slf4j-api + com.salesforce.apollo protocols @@ -62,4 +66,4 @@ test - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 398b499d1..2aa3896d3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 com.salesforce.apollo @@ -51,89 +51,6 @@ - - com.fasterxml.jackson - jackson-base - ${jackson.version} - pom - import - - - com.google.guava - guava - 31.1-jre - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - io.grpc - grpc-core - ${grpc.version} - - - io.grpc - grpc-api - ${grpc.version} - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - io.grpc - protoc-gen-grpc-java - ${grpc.version} - pom - - - io.grpc - grpc-netty-shaded - ${grpc.version} - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-services - ${grpc.version} - - - io.grpc - grpc-servlet - ${grpc.version} - - - io.grpc - grpc-util - ${grpc.version} - - - io.grpc - grpc-inprocess - ${grpc.version} - com.salesforce.apollo fireflies @@ -204,16 +121,6 @@ thoth ${project.version} - - com.salesforce.apollo - pal-d - ${project.version} - - - com.salesforce.apollo - pal - ${project.version} - com.salesforce.apollo domain-epoll @@ -271,6 +178,156 @@ ${project.version} native + + com.google.errorprone + error_prone_annotations + 2.20.0 + + + org.checkerframework + checker-qual + 3.26.0 + + + com.fasterxml.jackson + jackson-base + ${jackson.version} + pom + import + + + com.google.guava + guava + 31.1-jre + + + org.checkerframework + checker-qual + + + com.google.errorprone + error_prone_annotations + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + io.grpc + grpc-core + ${grpc.version} + + + com.google.guava + guava + + + + + io.grpc + grpc-api + ${grpc.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + com.google.guava + guava + + + + + io.grpc + grpc-stub + ${grpc.version} + + + com.google.guava + guava + + + + + io.grpc + protoc-gen-grpc-java + ${grpc.version} + pom + + + io.grpc + grpc-netty-shaded + ${grpc.version} + + + io.grpc + grpc-netty + ${grpc.version} + + + com.google.guava + guava + + + + + io.grpc + grpc-services + ${grpc.version} + + + io.grpc + grpc-servlet + ${grpc.version} + + + com.google.guava + guava + + + + + io.grpc + grpc-util + ${grpc.version} + + + com.google.guava + guava + + + + + io.grpc + grpc-inprocess + ${grpc.version} + + + com.google.guava + guava + + + + + org.checkerframework + checker-qual + 3.26.0 + io.micrometer micrometer-core @@ -280,6 +337,12 @@ org.scijava native-lib-loader 2.4.0 + + + org.slf4j + slf4j-api + + org.jboss.logging @@ -420,6 +483,16 @@ com.github.ben-manes.caffeine caffeine 3.1.1 + + + org.checkerframework + checker-qual + + + com.google.errorprone + error_prone_annotations + + io.netty @@ -431,6 +504,23 @@ graal-sdk ${graal.vm.version} + + com.github.oshi + oshi-core + 6.2.2 + + + io.yupiik.logging + yupiik-logging-jul + 1.0.6 + + + org.graalvm.nativeimage + svm + ${graal.vm.version} + provided + + org.apiguardian @@ -465,27 +555,11 @@ 2.2 test - - com.github.oshi - oshi-core - 6.2.2 - - - io.yupiik.logging - yupiik-logging-jul - 1.0.6 - org.slf4j slf4j-jdk14 2.0.6 - - org.graalvm.nativeimage - svm - ${graal.vm.version} - provided - @@ -631,7 +705,7 @@ - [19,) + [21,) diff --git a/protocols/pom.xml b/protocols/pom.xml index db29ffde9..815c0403d 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.salesforce.apollo @@ -10,6 +11,14 @@ Apollo base GRPC communications and rate limiting + + org.checkerframework + checker-qual + + + org.slf4j + slf4j-api + com.salesforce.apollo cryptography @@ -36,6 +45,18 @@ io.dropwizard dropwizard-metrics + + org.slf4j + slf4j-api + + + io.dropwizard + dropwizard-jackson + + + io.dropwizard + dropwizard-validation + io.dropwizard dropwizard-lifecycle @@ -58,7 +79,7 @@ org.junit.jupiter - junit-jupiter + junit-jupiter test diff --git a/stereotomy/pom.xml b/stereotomy/pom.xml index 5b7c20e4a..ff874279b 100644 --- a/stereotomy/pom.xml +++ b/stereotomy/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.salesforce.apollo @@ -14,6 +15,10 @@ + + org.checkerframework + checker-qual + com.salesforce.apollo schemas @@ -184,70 +189,70 @@ - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-antrun-plugin - - - [1.3,) - - - run - - - - - - - - - - org.apache.maven.plugins - - - maven-clean-plugin - - - [2.5,) - - - clean - - - - - - - - - org.liquibase - - liquibase-maven-plugin - - - [4.8.0,) - - - update - - - - - - - - - + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + + [1.3,) + + + run + + + + + + + + + + org.apache.maven.plugins + + + maven-clean-plugin + + + [2.5,) + + + clean + + + + + + + + + org.liquibase + + liquibase-maven-plugin + + + [4.8.0,) + + + update + + + + + + + + +