POM Cleanup

- Updated properties for ecr.repository, this should now be set in an external settings file or in the user's ~/.m2/settings.xml file.
- Bumped ECS plugin version.
- Added sonatype snapshot plugin repo.
This commit is contained in:
bauer 2019-02-20 14:16:41 -08:00 committed by Moxie Marlinspike
parent 4fe25da30b
commit d7d143b97f
1 changed files with 13 additions and 21 deletions

34
pom.xml
View File

@ -15,9 +15,6 @@
<dropwizard.version>1.3.8</dropwizard.version> <dropwizard.version>1.3.8</dropwizard.version>
<jackson.api.version>2.9.8</jackson.api.version> <jackson.api.version>2.9.8</jackson.api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!--suppress UnresolvedMavenProperty -->
<ecr.repository>${env.ECR_REPOSITORY}</ecr.repository>
</properties> </properties>
<dependencies> <dependencies>
@ -245,8 +242,10 @@
</goals> </goals>
<configuration> <configuration>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> <transformer
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.whispersystems.textsecuregcm.WhisperServerService</mainClass> <mainClass>org.whispersystems.textsecuregcm.WhisperServerService</mainClass>
</transformer> </transformer>
</transformers> </transformers>
@ -338,7 +337,7 @@
<plugin> <plugin>
<groupId>org.signal</groupId> <groupId>org.signal</groupId>
<artifactId>ecs-maven-plugin</artifactId> <artifactId>ecs-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.1-SNAPSHOT</version>
<configuration> <configuration>
<awsRegion>US_EAST_1</awsRegion> <awsRegion>US_EAST_1</awsRegion>
<taskFamily>signal-service</taskFamily> <taskFamily>signal-service</taskFamily>
@ -379,26 +378,19 @@
</plugins> </plugins>
<extensions>
<extension>
<groupId>com.gkatzioura.maven.cloud</groupId>
<artifactId>s3-storage-wagon</artifactId>
<version>1.6</version>
</extension>
</extensions>
</build> </build>
<repositories> <pluginRepositories>
<repository> <pluginRepository>
<id>maven-staging-repo-snapshot</id> <id>sonatype-nexus-snapshots</id>
<url>s3://maven-staging-repo.signal.org/snapshot</url> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
</repository> </pluginRepository>
</pluginRepositories>
<repositories>
<repository> <repository>
<id>gcm-server-repository</id> <id>gcm-server-repository</id>
<url>https://raw.github.com/whispersystems/maven/master/gcm-server/releases/</url> <url>https://raw.github.com/whispersystems/maven/master/gcm-server/releases/</url>