Skip to content

Commit

Permalink
Merge pull request #859 from cedricwalter/remove-bouncy-castle-copy
Browse files Browse the repository at this point in the history
Remove bouncy castle copy
  • Loading branch information
ManfredKarrer authored Jul 8, 2017
2 parents 0572f2e + d6a0bdd commit 1573671
Show file tree
Hide file tree
Showing 13 changed files with 483 additions and 306 deletions.
29 changes: 29 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
language: java
jdk:
- oraclejdk8

install:
- git clone -b bisq_0.14.4.1 https://github.com/bitsquare/bitcoinj.git
- cd bitcoinj
- mvn clean install
- git clone https://github.com/bitsquare/libdohj.git
- cd libdohj
- mvn clean install
- git clone https://github.com/bitsquare/btcd-cli4j.git
- cd btcd-cli4j
- mvn clean install
- cd ..

script: mvn clean install

#notifications:
# irc:
# channels: chat.freenode.net#bisq
# template:
# - '%{message} (%{repository}#%{build_number}, %{duration})'
# - '%{repository}/%{branch} %{commit} %{author}: %{commit_message}'
# - '%{build_url}'
# on_success: change
# on_failure: always
# use_notice: true
# skip_join: true
20 changes: 0 additions & 20 deletions _deactivated_.travis.yml

This file was deleted.

76 changes: 74 additions & 2 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,90 @@

<artifactId>common</artifactId>

<properties>
<protobuf.version>3.3.0</protobuf.version>
</properties>

<profiles>
<profile>
<id>windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<protobuf.classifier>windows-x86_64</protobuf.classifier>
<protobuf.exe>protoc.exe</protobuf.exe>
</properties>
</profile>
<profile>
<id>unix</id>
<activation>
<os>
<family>unix</family>
</os>
</activation>
<properties>
<protobuf.classifier>linux-x86_64</protobuf.classifier>
<protobuf.exe>protoc</protobuf.exe>
</properties>
</profile>
<profile>
<id>macos</id>
<activation>
<os>
<family>macos</family>
</os>
</activation>
<properties>
<protobuf.classifier>osx-x86_64</protobuf.classifier>
<protobuf.exe>protoc</protobuf.exe>
</properties>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>copy-protoc</id>
<phase>generate-sources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<version>${protobuf.version}</version>
<classifier>${protobuf.classifier}</classifier>
<type>exe</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
<destFileName>${protobuf.exe}</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<!-- https://www.xolstice.org/protobuf-maven-plugin/usage.html -->
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.0</version>
<configuration>
<protocExecutable>/usr/local/bin/protoc</protocExecutable>
<protocExecutable>${project.build.directory}/${protobuf.exe}</protocExecutable>
</configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>compile</goal>
<goal>test-compile</goal>
Expand All @@ -37,7 +109,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.3.0</version>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
Loading

0 comments on commit 1573671

Please sign in to comment.