Fix proguard config with cli

patrickfav · Aug 11, 2018 · b9c6cca · b9c6cca
1 parent 08d43ce
commit b9c6cca
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 47 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,7 +37,7 @@ deploy:
       - "modules/bcrypt/target/bcrypt-*.jar"
       - "modules/bcrypt/target/*.sha256"
       - "modules/bcrypt/target/checksum-sha256.txt"
-      - "modules/bcrypt-cli/target/bcrypt-*.jar"
+      - "modules/bcrypt-cli/target/bcrypt-*-full.jar"
       - "modules/bcrypt-cli/target/*.sha256"
     skip_cleanup: true
     on:

diff --git a/modules/bcrypt-cli/pom.xml b/modules/bcrypt-cli/pom.xml
@@ -24,37 +24,21 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <groupId>com.github.chrisdchristo</groupId>
+                <artifactId>capsule-maven-plugin</artifactId>
+                <version>1.5.1</version>
+                <configuration>
+                    <appClass>at.favre.lib.crypto.bcrypt.cli.BcryptTool</appClass>
+                    <fileDesc>-full</fileDesc>
+                    <type>fat</type>
+                </configuration>
                 <executions>
                     <execution>
+                        <id>build-fat-jar</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>build</goal>
                         </goals>
-                        <configuration>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <minimizeJar>true</minimizeJar>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <dependencyReducedPomLocation>
-                                ${java.io.tmpdir}/dependency-reduced-pom.xml
-                            </dependencyReducedPomLocation>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>at.favre.lib.crypto.bcrypt.cli.BcryptTool</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -87,6 +71,7 @@
             <groupId>at.favre.lib</groupId>
             <artifactId>bcrypt</artifactId>
             <version>0.5.0</version>
+            <classifier>optimized</classifier>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

diff --git a/modules/bcrypt/pom.xml b/modules/bcrypt/pom.xml
@@ -107,6 +107,26 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jarsigner-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <id>sign</id>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>${project.skipJarSign}</skip>
+                    <keystore>${session.executionRootDirectory}/keystore.jks</keystore>
+                    <alias>pfopensource</alias>
+                    <storepass>${env.OPENSOURCE_PROJECTS_KS_PW}</storepass>
+                    <keypass>${env.OPENSOURCE_PROJECTS_KEY_PW}</keypass>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/pom.xml b/pom.xml
@@ -116,26 +116,6 @@
                 <artifactId>coveralls-maven-plugin</artifactId>
                 <version>4.3.0</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jarsigner-plugin</artifactId>
-                <version>1.4</version>
-                <executions>
-                    <execution>
-                        <id>sign</id>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <skip>${project.skipJarSign}</skip>
-                    <keystore>${session.executionRootDirectory}/keystore.jks</keystore>
-                    <alias>pfopensource</alias>
-                    <storepass>${env.OPENSOURCE_PROJECTS_KS_PW}</storepass>
-                    <keypass>${env.OPENSOURCE_PROJECTS_KEY_PW}</keypass>
-                </configuration>
-            </plugin>
         </plugins>
     </build>