diff --git a/gcm-sender-async/pom.xml b/gcm-sender-async/pom.xml
index 99b2e6f36be2075c1df615bc4b9cc87c40fc0c4d..779eabe36401d6c6901461e5822c438a3222ba25 100644
--- a/gcm-sender-async/pom.xml
+++ b/gcm-sender-async/pom.xml
@@ -5,18 +5,15 @@
<parent>
<artifactId>TextSecureServer</artifactId>
<groupId>org.whispersystems.textsecure</groupId>
- <version>1.0</version>
+ <version>JGITVER</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>gcm-sender-async</artifactId>
- <version>${TextSecureServer.version}</version>
<dependencies>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-retry</artifactId>
- <version>${resilience4j.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -44,6 +41,11 @@
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 210877e8f151abbd44e68ae9797d1cdec6190d2b..1b7fac09bc8ab8212c5fbcada7911b12af5132b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,6 @@
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>
<packaging>pom</packaging>
- <prerequisites>
- <maven>3.0.0</maven>
- </prerequisites>
<repositories>
<repository>
@@ -32,21 +29,36 @@
</modules>
<properties>
- <dropwizard.version>2.0.21</dropwizard.version>
<aws.sdk.version>1.11.939</aws.sdk.version>
<aws.sdk2.version>2.16.66</aws.sdk2.version>
- <mockito.version>2.25.1</mockito.version>
+ <commons-codec.version>1.15</commons-codec.version>
+ <commons-csv.version>1.8</commons-csv.version>
+ <commons-io.version>2.9.0</commons-io.version>
+ <dropwizard.version>2.0.21</dropwizard.version>
+ <guava.version>30.1.1-jre</guava.version>
+ <jaxb.version>2.3.1</jaxb.version>
+ <jedis.version>2.9.0</jedis.version>
+ <lettuce.version>6.0.4.RELEASE</lettuce.version>
+ <libphonenumber.version>8.12.23</libphonenumber.version>
+ <logstash.logback.version>6.6</logstash.logback.version>
<micrometer.version>1.5.3</micrometer.version>
+ <mockito.version>2.25.1</mockito.version>
+ <netty.version>4.1.65.Final</netty.version>
+ <netty.tcnative-boringssl-static.version>2.0.39.Final</netty.tcnative-boringssl-static.version>
+ <opentest4j.version>1.2.0</opentest4j.version>
+ <postgresql.version>9.4-1201-jdbc41</postgresql.version>
+ <protobuf.version>2.6.1</protobuf.version>
<pushy.version>0.14.2</pushy.version>
<resilience4j.version>1.5.0</resilience4j.version>
+ <semver4j.version>3.1.0</semver4j.version>
+ <slf4j.version>1.7.30</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <TextSecureServer.version>5.95</TextSecureServer.version>
</properties>
<groupId>org.whispersystems.textsecure</groupId>
<artifactId>TextSecureServer</artifactId>
- <version>1.0</version>
+ <version>JGITVER</version>
<dependencyManagement>
<dependencies>
@@ -57,6 +69,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>${netty.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
@@ -85,6 +104,119 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.eatthepath</groupId>
+ <artifactId>pushy</artifactId>
+ <version>${pushy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.eatthepath</groupId>
+ <artifactId>pushy-dropwizard-metrics-listener</artifactId>
+ <version>${pushy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.libphonenumber</groupId>
+ <artifactId>libphonenumber</artifactId>
+ <version>${libphonenumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vdurmont</groupId>
+ <artifactId>semver4j</artifactId>
+ <version>${semver4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.lettuce</groupId>
+ <artifactId>lettuce-core</artifactId>
+ <version>${lettuce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-tcnative-boringssl-static</artifactId>
+ <version>${netty.tcnative-boringssl-static.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.logstash.logback</groupId>
+ <artifactId>logstash-logback-encoder</artifactId>
+ <version>${logstash.logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>${commons-csv.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opentest4j</groupId>
+ <artifactId>opentest4j</artifactId>
+ <version>${opentest4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>redis.clients</groupId>
+ <artifactId>jedis</artifactId>
+ <version>${jedis.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -132,19 +264,21 @@
<build>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<configuration>
<archive>
<manifest>
@@ -191,11 +325,39 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0-M3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <dependencyConvergence/>
+ <requireMavenVersion>
+ <version>3.0.0</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>3.0.0-M1</version>
<configuration>
- <rules>
- <dependencyConvergence/>
- </rules>
+ <skip>true</skip>
</configuration>
</plugin>
diff --git a/redis-dispatch/pom.xml b/redis-dispatch/pom.xml
index cc27b26eb0b3bd93c118761e706e2646a4482467..febe3a78245b4226227adaab23ec8f04dc23aeeb 100644
--- a/redis-dispatch/pom.xml
+++ b/redis-dispatch/pom.xml
@@ -5,12 +5,10 @@
<parent>
<artifactId>TextSecureServer</artifactId>
<groupId>org.whispersystems.textsecure</groupId>
- <version>1.0</version>
+ <version>JGITVER</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>redis-dispatch</artifactId>
- <version>${TextSecureServer.version}</version>
<dependencies>
<dependency>
diff --git a/service/assembly.xml b/service/assembly.xml
index 10259538c8f2fe150a8518a09aef8a075a0f4e7b..642e2cc964c863db4b580e5a7ad7411a4e530364 100644
--- a/service/assembly.xml
+++ b/service/assembly.xml
@@ -1,6 +1,6 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
@@ -18,8 +18,8 @@
<directory>${project.build.directory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>${parent.artifactId}-${TextSecureServer.version}.jar</include>
+ <include>${parent.artifactId}-${project.version}.jar</include>
</includes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/service/pom.xml b/service/pom.xml
index ea330bbfb0cd0ccf82280540624c5c52429321ab..29fcb9016b96611a3a7fc0506a141022b2420d43 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -5,16 +5,10 @@
<parent>
<artifactId>TextSecureServer</artifactId>
<groupId>org.whispersystems.textsecure</groupId>
- <version>1.0</version>
+ <version>JGITVER</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>service</artifactId>
- <version>${TextSecureServer.version}</version>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<dependencies>
<dependency>
@@ -33,29 +27,28 @@
<dependency>
<groupId>org.whispersystems.textsecure</groupId>
<artifactId>redis-dispatch</artifactId>
- <version>${TextSecureServer.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.whispersystems.textsecure</groupId>
<artifactId>websocket-resources</artifactId>
- <version>${TextSecureServer.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.whispersystems.textsecure</groupId>
<artifactId>gcm-sender-async</artifactId>
- <version>${TextSecureServer.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.signal</groupId>
<artifactId>zkgroup-java</artifactId>
<version>0.7.0</version>
</dependency>
+ <dependency>
+ <groupId>org.whispersystems</groupId>
+ <artifactId>curve25519-java</artifactId>
+ <version>0.5.0</version>
+ </dependency>
<dependency>
<groupId>io.dropwizard</groupId>
@@ -134,7 +127,6 @@
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
- <version>6.6</version>
</dependency>
<dependency>
@@ -178,8 +170,6 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.3.1</version>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -204,17 +194,10 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.13</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
- <groupId>io.vavr</groupId>
- <artifactId>vavr</artifactId>
- <version>0.10.2</version>
</dependency>
<dependency>
@@ -225,12 +208,6 @@
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-circuitbreaker</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
@@ -299,76 +276,52 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>2.9.0</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
- <version>6.0.4.RELEASE</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.4-1201-jdbc41</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.whispersystems</groupId>
- <artifactId>curve25519-java</artifactId>
- <version>0.5.0</version>
- </dependency>
-
<dependency>
<groupId>com.eatthepath</groupId>
<artifactId>pushy</artifactId>
- <version>${pushy.version}</version>
</dependency>
<dependency>
<groupId>com.eatthepath</groupId>
<artifactId>pushy-dropwizard-metrics-listener</artifactId>
- <version>${pushy.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>2.0.34.Final</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.vdurmont</groupId>
<artifactId>semver4j</artifactId>
- <version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.1.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.6.1</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
- <version>8.12.21</version>
</dependency>
<dependency>
@@ -470,12 +423,12 @@
<build>
- <finalName>${parent.artifactId}-${TextSecureServer.version}</finalName>
+ <finalName>${project.parent.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.6</version>
+ <version>3.2.4</version>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
<filters>
@@ -508,8 +461,9 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>3.3.0</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
diff --git a/websocket-resources/pom.xml b/websocket-resources/pom.xml
index c0d2886b17ed88366f1a6806b0ff4c7bb3673053..00e4b1b6964e4d332df82662db17ab2084d38e9e 100644
--- a/websocket-resources/pom.xml
+++ b/websocket-resources/pom.xml
@@ -5,12 +5,10 @@
<parent>
<artifactId>TextSecureServer</artifactId>
<groupId>org.whispersystems.textsecure</groupId>
- <version>1.0</version>
+ <version>JGITVER</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>websocket-resources</artifactId>
- <version>${TextSecureServer.version}</version>
<dependencies>
<dependency>
@@ -85,7 +83,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.6.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -103,7 +100,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
- <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>