From a5f844bc7d9fa7ab74f55724d0f463c78c763b96 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie+github@signal.org>
Date: Fri, 22 Mar 2019 12:36:09 -0700
Subject: [PATCH] Temporarily revert ECS commits

---
 Dockerfile |  15 ------
 pom.xml    | 156 +++++++++++++++++++----------------------------------
 2 files changed, 55 insertions(+), 116 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 28b031683..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM openjdk:8-jre
-
-EXPOSE 8080
-EXPOSE 8081
-
-COPY target/lib /usr/share/signal/lib
-
-ARG CONFIG_FILE
-COPY config/${CONFIG_FILE} /usr/share/signal/config.yml
-
-ARG JAR_FILE
-COPY target/${JAR_FILE} /usr/share/signal/Signal-Service.jar
-
-ENTRYPOINT ["/usr/bin/java", "-server", "-Djava.awt.headless=true", "-Xmx2048m", "-Xss512k", "-jar", "/usr/share/signal/Signal-Service.jar", "server", "/usr/share/signal/config.yml"]
-
diff --git a/pom.xml b/pom.xml
index 1ee9bd8da..edf773ea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,6 +192,19 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -199,14 +212,45 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>org.whispersystems.textsecuregcm.WhisperServerService</mainClass>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.6</version>
+                <configuration>
+                    <createDependencyReducedPom>true</createDependencyReducedPom>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.whispersystems.textsecuregcm.WhisperServerService</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -215,117 +259,27 @@
             </plugin>
 
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <overWriteReleases>false</overWriteReleases>
-                            <includeScope>runtime</includeScope>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>1.4.8</version>
-                <executions>
-                    <execution>
-                        <id>production</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <configuration>
-                            <repository>${ecr.repository}/signal-service</repository>
-                            <pullNewerImage>false</pullNewerImage>
-                            <tag>${project.version}-production</tag>
-                            <buildArgs>
-                                <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
-                                <CONFIG_FILE>production.yml</CONFIG_FILE>
-                            </buildArgs>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>staging</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <configuration>
-                            <repository>${ecr.repository}/signal-service</repository>
-                            <pullNewerImage>false</pullNewerImage>
-                            <tag>${project.version}-staging</tag>
-                            <buildArgs>
-                                <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
-                                <CONFIG_FILE>staging.yml</CONFIG_FILE>
-                            </buildArgs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.signal</groupId>
-                <artifactId>ecs-maven-plugin</artifactId>
-                <version>1.1-SNAPSHOT</version>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
                 <configuration>
-                    <awsRegion>US_EAST_1</awsRegion>
-                    <taskFamily>signal-service</taskFamily>
-                    <environment>staging</environment>
-                    <version>${project.version}-staging</version>
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>staging</id>
+                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                        <phase>package</phase> <!-- bind to the packaging phase -->
                         <goals>
-                            <goal>create-task-revision</goal>
+                            <goal>single</goal>
                         </goals>
-                        <configuration>
-                            <environment>staging</environment>
-                            <version>${project.version}-staging</version>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>production</id>
-                        <goals>
-                            <goal>create-task-revision</goal>
-                        </goals>
-                        <configuration>
-                            <environment>production</environment>
-                            <version>${project.version}-production</version>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
 
         </plugins>
-
     </build>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-
-    </pluginRepositories>
     <repositories>
         <repository>
             <id>gcm-server-repository</id>