3634497be3
Bumps the minor-java-dependencies group with 3 updates: software.amazon.awssdk:bom, [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) and [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java). Updates `software.amazon.awssdk:bom` from 2.42.4 to 2.42.25 Updates `org.testcontainers:testcontainers-bom` from 2.0.3 to 2.0.4 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.3...2.0.4) Updates `com.azure:azure-cosmos` from 4.78.0 to 4.79.0 - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/com.azure+azure-cosmos_4.78.0...com.azure+azure-cosmos_4.79.0) --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-version: 2.42.25 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-java-dependencies - dependency-name: org.testcontainers:testcontainers-bom dependency-version: 2.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-java-dependencies - dependency-name: com.azure:azure-cosmos dependency-version: 4.79.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-java-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
537 lines
18 KiB
XML
537 lines
18 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<groupId>org.signal.cdsi</groupId>
|
|
<artifactId>cdsi</artifactId>
|
|
<version>JGITVER</version>
|
|
<packaging>${packaging}</packaging>
|
|
|
|
<parent>
|
|
<groupId>io.micronaut.platform</groupId>
|
|
<artifactId>micronaut-parent</artifactId>
|
|
|
|
<!-- 4.8.3 is the latest version to still use Netty 4.1; until Cosmos supports Netty 4.2, we'll need to stay here -->
|
|
<version>4.8.3</version>
|
|
</parent>
|
|
|
|
<properties>
|
|
<packaging>jar</packaging>
|
|
<jdk.version>25</jdk.version>
|
|
<release.version>25</release.version>
|
|
<micronaut.runtime>netty</micronaut.runtime>
|
|
<exec.mainClass>org.signal.cdsi.Application</exec.mainClass>
|
|
|
|
<aws.sdk.version>2.42.25</aws.sdk.version>
|
|
<commons.codec.version>1.21.0</commons.codec.version>
|
|
<guava.version>33.5.0-jre</guava.version>
|
|
<httpcomponents.httpcore.version>4.4.16</httpcomponents.httpcore.version>
|
|
<hdrhistogram.version>2.2.2</hdrhistogram.version>
|
|
<testcontainers.version>2.0.4</testcontainers.version>
|
|
|
|
<make.docker.prefix>docker_</make.docker.prefix>
|
|
|
|
<dynamodb.image>amazon/dynamodb-local:3.1.0@sha256:7ef4a2c45b58c2901e70a4f28e0953a422c2c631baaaf5e2c15e0805740c7752</dynamodb.image>
|
|
<redis-cluster.image>docker.io/bitnamilegacy/redis-cluster:7.4.3@sha256:a53d023fdfaf8a8d7ddc58da040d3494e4cb45772644618ffa44c42dcd32b9af</redis-cluster.image>
|
|
</properties>
|
|
|
|
<repositories>
|
|
<repository>
|
|
<id>central</id>
|
|
<url>https://repo.maven.apache.org/maven2</url>
|
|
</repository>
|
|
</repositories>
|
|
|
|
<dependencyManagement>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>software.amazon.awssdk</groupId>
|
|
<artifactId>bom</artifactId>
|
|
<version>${aws.sdk.version}</version>
|
|
<type>pom</type>
|
|
<scope>import</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.testcontainers</groupId>
|
|
<artifactId>testcontainers-bom</artifactId>
|
|
<version>${testcontainers.version}</version>
|
|
<type>pom</type>
|
|
<scope>import</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
</dependencyManagement>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>ch.qos.logback</groupId>
|
|
<artifactId>logback-classic</artifactId>
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.azure</groupId>
|
|
<artifactId>azure-cosmos</artifactId>
|
|
<version>4.79.0</version>
|
|
<exclusions>
|
|
<!-- com.azure:azure-cosmos directly and transitively depends on different versions of the hdrhistogram package.
|
|
Excluding the package here and making it a direct dependency to resolve that internal conflict. -->
|
|
<exclusion>
|
|
<groupId>org.hdrhistogram</groupId>
|
|
<artifactId>HdrHistogram</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<!-- com.azure:azure-cosmos recommends adding this dependency for optimal Jackson performance -->
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.module</groupId>
|
|
<artifactId>jackson-module-blackbird</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.hdrhistogram</groupId>
|
|
<artifactId>HdrHistogram</artifactId>
|
|
<version>${hdrhistogram.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.google.protobuf</groupId>
|
|
<artifactId>protobuf-java</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>commons-codec</groupId>
|
|
<artifactId>commons-codec</artifactId>
|
|
<version>${commons.codec.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.lettuce</groupId>
|
|
<artifactId>lettuce-core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-http-server-netty</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-inject</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-jackson-databind</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-management</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut.micrometer</groupId>
|
|
<artifactId>micronaut-micrometer-core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut.micrometer</groupId>
|
|
<artifactId>micronaut-micrometer-registry-otlp</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-runtime</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut.security</groupId>
|
|
<artifactId>micronaut-security</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut.validation</groupId>
|
|
<artifactId>micronaut-validation</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.projectreactor</groupId>
|
|
<artifactId>reactor-core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>jakarta.annotation</groupId>
|
|
<artifactId>jakarta.annotation-api</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<!-- resolve dependency convergence among several dependencies -->
|
|
<groupId>com.google.guava</groupId>
|
|
<artifactId>guava</artifactId>
|
|
<version>${guava.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.signal</groupId>
|
|
<artifactId>libsignal-server</artifactId>
|
|
<version>0.86.5</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>software.amazon.awssdk</groupId>
|
|
<artifactId>dynamodb</artifactId>
|
|
<exclusions>
|
|
<exclusion>
|
|
<!-- We depend on commons-codec directly; avoid convergence issues by excluding it here -->
|
|
<groupId>commons-codec</groupId>
|
|
<artifactId>commons-codec</artifactId>
|
|
</exclusion>
|
|
<!-- software.amazon.awssdk:dynamodb depends on software.amazon.awssdk:apache-client,
|
|
which directly and transitively depends on different versions of the httpcore package.
|
|
Excluding the package here and making it a direct dependency to resolve that conflict. -->
|
|
<exclusion>
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
<artifactId>httpcore</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>software.amazon.awssdk</groupId>
|
|
<artifactId>sts</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
<artifactId>httpcore</artifactId>
|
|
<version>${httpcomponents.httpcore.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>software.amazon.awssdk</groupId>
|
|
<artifactId>kinesis</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<!-- for import javax.annotation.Nullable -->
|
|
<groupId>com.github.spotbugs</groupId>
|
|
<artifactId>spotbugs-annotations</artifactId>
|
|
<version>4.9.8</version>
|
|
</dependency>
|
|
|
|
<!-- Test dependencies -->
|
|
<dependency>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-http-client</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut.test</groupId>
|
|
<artifactId>micronaut-test-core</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.micronaut.test</groupId>
|
|
<artifactId>micronaut-test-junit5</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.junit.jupiter</groupId>
|
|
<artifactId>junit-jupiter-api</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.junit.jupiter</groupId>
|
|
<artifactId>junit-jupiter-engine</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.junit.jupiter</groupId>
|
|
<artifactId>junit-jupiter-params</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.mockito</groupId>
|
|
<artifactId>mockito-core</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.signal.forks</groupId>
|
|
<artifactId>noise-java</artifactId>
|
|
<version>0.1.1</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.testcontainers</groupId>
|
|
<artifactId>azure</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.testcontainers</groupId>
|
|
<artifactId>junit-jupiter</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<!-- required for YAML configuration files in Micronaut 4 -->
|
|
<dependency>
|
|
<groupId>org.yaml</groupId>
|
|
<artifactId>snakeyaml</artifactId>
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
|
|
<!-- required for websocket support in Micronaut 4 -->
|
|
<dependency>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-websocket</artifactId>
|
|
</dependency>
|
|
|
|
<!-- required for Reactor support in Micronaut 4 -->
|
|
<dependency>
|
|
<groupId>io.micronaut.reactor</groupId>
|
|
<artifactId>micronaut-reactor</artifactId>
|
|
</dependency>
|
|
|
|
<!-- required for retry support in Micronaut 4 -->
|
|
<dependency>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-retry</artifactId>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
<extensions>
|
|
<extension>
|
|
<groupId>kr.motd.maven</groupId>
|
|
<artifactId>os-maven-plugin</artifactId>
|
|
<version>1.7.1</version>
|
|
</extension>
|
|
</extensions>
|
|
|
|
<pluginManagement>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<version>3.15.0</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
<version>3.10.0</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-enforcer-plugin</artifactId>
|
|
<version>3.6.2</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<version>3.5.5</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>exec-maven-plugin</artifactId>
|
|
<version>3.6.3</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>templating-maven-plugin</artifactId>
|
|
<version>3.1.0</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.xolstice.maven.plugins</groupId>
|
|
<artifactId>protobuf-maven-plugin</artifactId>
|
|
<version>0.6.1</version>
|
|
</plugin>
|
|
</plugins>
|
|
</pluginManagement>
|
|
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>io.micronaut.maven</groupId>
|
|
<artifactId>micronaut-maven-plugin</artifactId>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
|
|
<executions>
|
|
<execution>
|
|
<id>copy</id>
|
|
<phase>test-compile</phase>
|
|
<goals>
|
|
<goal>copy-dependencies</goal>
|
|
</goals>
|
|
<configuration>
|
|
<includeScope>test</includeScope>
|
|
<includeTypes>so,dll,dylib</includeTypes>
|
|
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
|
|
<configuration>
|
|
<!-- Uncomment to enable incremental compilation -->
|
|
<!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
|
|
|
|
<annotationProcessorPaths combine.children="append">
|
|
<path>
|
|
<groupId>io.micronaut.validation</groupId>
|
|
<artifactId>micronaut-validation-processor</artifactId>
|
|
</path>
|
|
<path>
|
|
<groupId>io.micronaut</groupId>
|
|
<artifactId>micronaut-http-validation</artifactId>
|
|
<version>${micronaut.core.version}</version>
|
|
</path>
|
|
<path>
|
|
<groupId>io.micronaut.security</groupId>
|
|
<artifactId>micronaut-security-annotations</artifactId>
|
|
<version>${micronaut.security.version}</version>
|
|
</path>
|
|
<path>
|
|
<groupId>io.micronaut.micrometer</groupId>
|
|
<artifactId>micronaut-micrometer-annotation</artifactId>
|
|
<version>${micronaut.micrometer.version}</version>
|
|
</path>
|
|
</annotationProcessorPaths>
|
|
<compilerArgs>
|
|
<arg>-Amicronaut.processing.group=org.signal.cdsi</arg>
|
|
<arg>-Amicronaut.processing.module=cdsi</arg>
|
|
<arg>-h</arg>
|
|
<arg>target/headers</arg>
|
|
</compilerArgs>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.xolstice.maven.plugins</groupId>
|
|
<artifactId>protobuf-maven-plugin</artifactId>
|
|
|
|
<configuration>
|
|
<checkStaleness>true</checkStaleness>
|
|
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
<goals>
|
|
<goal>compile</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
|
|
<configuration>
|
|
<systemProperties>
|
|
<property>
|
|
<name>sqlite4java.library.path</name>
|
|
<value>${project.build.directory}/lib</value>
|
|
</property>
|
|
</systemProperties>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>exec-maven-plugin</artifactId>
|
|
|
|
<executions>
|
|
<execution>
|
|
<id>enclave-release</id>
|
|
<phase>none</phase>
|
|
<goals>
|
|
<goal>exec</goal>
|
|
</goals>
|
|
<configuration>
|
|
<executable>make</executable>
|
|
<!-- Cleans first to ensure build is reproducible -->
|
|
<commandlineArgs>RESOURCES_DIR=${basedir}/src/main/resources/org/signal/cdsi/enclave -C c clean ${make.docker.prefix}install</commandlineArgs>
|
|
</configuration>
|
|
</execution>
|
|
|
|
<execution>
|
|
<id>build-test-enclave</id>
|
|
<phase>generate-test-resources</phase>
|
|
<goals>
|
|
<goal>exec</goal>
|
|
</goals>
|
|
<configuration>
|
|
<executable>make</executable>
|
|
<!-- Our Java-side Noise client library doesn't support HFS+Kyber1024,
|
|
so we have to pass in -DNO_NOISE_HFS. -->
|
|
<commandlineArgs>ENCLAVE_ID=test RESOURCES_DIR=${project.build.testOutputDirectory}/org/signal/cdsi/enclave ADDITIONAL_CFLAGS="-DINSECURE -DNO_NOISE_HFS" -C c ${make.docker.prefix}install_test</commandlineArgs>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-enforcer-plugin</artifactId>
|
|
|
|
<executions>
|
|
<execution>
|
|
<goals>
|
|
<goal>enforce</goal>
|
|
</goals>
|
|
<configuration>
|
|
<rules>
|
|
<dependencyConvergence/>
|
|
<requireMavenVersion>
|
|
<version>3.9.9</version>
|
|
</requireMavenVersion>
|
|
<bannedDependencies>
|
|
<excludes>
|
|
<!-- azure-cosmos currently depends on netty 4.1 -->
|
|
<exclude>io.netty:*:[4.2.0,)</exclude>
|
|
</excludes>
|
|
</bannedDependencies>
|
|
</rules>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>templating-maven-plugin</artifactId>
|
|
|
|
<executions>
|
|
<execution>
|
|
<id>filter-test-src</id>
|
|
<goals>
|
|
<goal>filter-test-sources</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
<profiles>
|
|
<profile>
|
|
<id>build-dev-enclave</id>
|
|
<activation>
|
|
<activeByDefault>true</activeByDefault>
|
|
</activation>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>exec-maven-plugin</artifactId>
|
|
|
|
<executions>
|
|
<execution>
|
|
<id>build-dev-enclave</id>
|
|
<phase>generate-resources</phase>
|
|
<goals>
|
|
<goal>exec</goal>
|
|
</goals>
|
|
<configuration>
|
|
<executable>make</executable>
|
|
<commandlineArgs>ENCLAVE_ID=dev CONFIG=cds-test.conf RESOURCES_DIR=${project.build.outputDirectory}/org/signal/cdsi/enclave ADDITIONAL_CFLAGS="-DINSECURE" -C c ${make.docker.prefix}install</commandlineArgs>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
</profiles>
|
|
</project>
|