Skip to content

Commit

Permalink
Solves IQSS#5274. Using only the S3 part of AWS SDK pom.xml gets ligh…
Browse files Browse the repository at this point in the history 
…ter.

This prepares the creation of the container Maven profile, as the TrueZIP
hacking is not usable with that.
  • Loading branch information
@poikilotherm
poikilotherm committed Dec 7, 2018
1 parent 2a02d7c commit 6f3da84
Showing 1 changed file with 8 additions and 44 deletions.
52 changes: 8 additions & 44 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

<aws.version>1.11.172</aws.version>
<jackson.version>2.9.6</jackson.version>
<joda.version>2.10.1</joda.version>
<commons.logging.version>1.2</commons.logging.version>
<httpcomponents.client.version>4.5.5</httpcomponents.client.version>

Expand Down Expand Up @@ -90,6 +91,11 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand Down Expand Up @@ -181,10 +187,8 @@
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<!-- Once on Eclipse Glassfish 5.1 or Payara 5.x, this should be changed to aws-java-sdk-s3,
rendering the WAR much lighter. The version tag needs to be removed then, too. -->
<artifactId>aws-java-sdk-bundle</artifactId>
<version>${aws.version}</version>
<artifactId>aws-java-sdk-s3</artifactId>
<!-- no version here as managed by BOM above! -->
</dependency>
<dependency>
<!-- required by org.swordapp.server.sword2-server -->
Expand Down Expand Up @@ -675,46 +679,6 @@
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.0.0</version>
</plugin>
<!-- v4.8: The truezip-maven-plugin below deletes two copies of a file that the AWS SDK bundle
includes called javamail.providers which breaks system emails. - bsilverstein 8/8/2017 -->
<!-- Once on Eclipse Glassfish 5.1 or Payara 5.x and changing to aws-java-sdk-s3, this can be deleted. -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>truezip-maven-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>remove-javamail-providers-from-exploded</id>
<goals>
<goal>remove</goal>
</goals>
<phase>package</phase>
<configuration>
<fileset>
<directory>target/dataverse-${project.version}/WEB-INF/lib/aws-java-sdk-bundle-${aws.version}.jar/META-INF</directory>
<includes>
<include>javamail.providers</include>
</includes>
</fileset>
</configuration>
</execution>
<execution>
<id>remove-javamail-providers-from-war</id>
<goals>
<goal>remove</goal>
</goals>
<phase>package</phase>
<configuration>
<fileset>
<directory>target/dataverse-${project.version}.war/WEB-INF/lib/aws-java-sdk-bundle-${aws.version}.jar/META-INF</directory>
<includes>
<include>javamail.providers</include>
</includes>
</fileset>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!-- https://stackoverflow.com/questions/46177921/how-to-run-unit-tests-in-excludedgroups-in-maven -->
<artifactId>maven-surefire-plugin</artifactId>
Expand Down

0 comments on commit 6f3da84

Please sign in to comment.