mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Comment out build script changes for bouncycastle as currnet build script are not supporting that yet

Browse Source
This commit is contained in:
Manfred Karrer 2017-11-14 13:34:03 -05:00
parent 16f23cc310
commit 4d9c7260fc
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
1 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
gui/pom.xml
View File

@ -55,32 +55,34 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
<executions> <!-- TODO with current build scripts bouncy castle jar is still needed in jdk dir -->
<execution> <!--
<id>copy-bouncycastle</id> <executions>
<phase>package</phase> <execution>
<goals> <id>copy-bouncycastle</id>
<goal>copy</goal> <phase>package</phase>
</goals> <goals>
<configuration> <goal>copy</goal>
<stripVersion>true</stripVersion> </goals>
<artifactItems> <configuration>
<artifactItem> <stripVersion>true</stripVersion>
<groupId>org.bouncycastle</groupId> <artifactItems>
<artifactId>bcprov-jdk15on</artifactId> <artifactItem>
<overWrite>true</overWrite> <groupId>org.bouncycastle</groupId>
<outputDirectory>${project.build.directory}/lib</outputDirectory> <artifactId>bcprov-jdk15on</artifactId>
</artifactItem> <overWrite>true</overWrite>
<artifactItem> <outputDirectory>${project.build.directory}/lib</outputDirectory>
<groupId>org.bouncycastle</groupId> </artifactItem>
<artifactId>bcpg-jdk15on</artifactId> <artifactItem>
<overWrite>true</overWrite> <groupId>org.bouncycastle</groupId>
<outputDirectory>${project.build.directory}/lib</outputDirectory> <artifactId>bcpg-jdk15on</artifactId>
</artifactItem> <overWrite>true</overWrite>
</artifactItems> <outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration> </artifactItem>
</execution> </artifactItems>
</executions> </configuration>
</execution>
</executions>-->
</plugin> </plugin>
<plugin> <plugin>
@ -88,22 +90,31 @@
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<configuration> <configuration>
<!-- TODO with current build scripts bouncy castle jar is still needed in jdk dir -->
<!--
<artifactSet> <artifactSet>
<excludes> <excludes>
<exclude>org.bouncycastle:*:*:*</exclude> <exclude>org.bouncycastle:*:*:*</exclude>
</excludes> </excludes>
</artifactSet> </artifactSet>-->
<!-- broken with Java 8 (MSHADE-174), using ProGuard instead. --> <!-- broken with Java 8 (MSHADE-174), using ProGuard instead. -->
<minimizeJar>false</minimizeJar> <minimizeJar>false</minimizeJar>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer
<manifestEntries> implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<Main-Class>io.bisq.gui.app.BisqAppMain</Main-Class> <mainClass>io.bisq.gui.app.BisqAppMain</mainClass>
<!-- the specified bouncy castle jar classes -->
<Class-Path>lib/bcpg-jdk15on.jar lib/bcprov-jdk15on.jar</Class-Path>
</manifestEntries>
</transformer> </transformer>
</transformers> </transformers>
<!-- TODO with current build scripts bouncy castle jar is still needed in jdk dir -->
<!-- <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>io.bisq.gui.app.BisqAppMain</Main-Class>
&lt;!&ndash; the specified bouncy castle jar classes &ndash;&gt;
<Class-Path>lib/bcpg-jdk15on.jar lib/bcprov-jdk15on.jar</Class-Path>
</manifestEntries>
</transformer>
</transformers>-->
<shadedArtifactAttached>true</shadedArtifactAttached> <shadedArtifactAttached>true</shadedArtifactAttached>
<filters> <filters>
<filter> <filter>