Changed to using shade plugin for packaging the wallet

blockchain · Mar 29, 2016 · 7c0ed6f · 7c0ed6f
1 parent d97afb7
commit 7c0ed6f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,5 @@ config.json
 blockheaders
 
 thunder-core/blockheaders
+
+thunder-clientgui/dependency-reduced-pom.xml
diff --git a/thunder-clientgui/pom.xml b/thunder-clientgui/pom.xml
@@ -17,24 +17,45 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>wallettemplate.Main</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>wallettemplate.Main</mainClass>
+                                </transformer>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.bouncycastle:**</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
 
-
     <dependencies>
         <dependency>
             <groupId>org.bitcoinj</groupId>

diff --git a/thunder-clientgui/src/main/java/wallettemplate/MainController.java b/thunder-clientgui/src/main/java/wallettemplate/MainController.java
@@ -190,7 +190,9 @@ public void onBitcoinSetup () {
             public void changed (ObservableValue<? extends PubkeyIPObject> observable, PubkeyIPObject oldValue, PubkeyIPObject newValue) {
                 System.out.println("ListView selection changed from oldValue = "
                         + oldValue + " to newValue = " + newValue);
-                selectedNode = newValue;
+                if (newValue != null) {
+                    selectedNode = newValue;
+                }
             }
         });