Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bouncy castle copy #859

Merged
merged 12 commits into from
Jul 8, 2017
Merged

Remove bouncy castle copy #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a4db174
Replace \\" with \"
ManfredKarrer Jul 5, 2017
b193c25
added code to fix travis build
cedricwalter Jul 6, 2017
eb675d8
changed maven phase to test
cedricwalter Jul 6, 2017
8760a86
added code to build dependent projects using travis install capabilities
cedricwalter Jul 6, 2017
576956b
also now building bitsquare main code
cedricwalter Jul 6, 2017
3b78932
activating tests
cedricwalter Jul 6, 2017
8457802
added code to activate unlimited cipher strength when using jdk 9
cedricwalter Jul 8, 2017
cdb545f
removed the need to install protobuf dependenciy as root before build…
cedricwalter Jul 8, 2017
5d05326
ignored a test unit not having any test, added TODO and IGNORE
cedricwalter Jul 8, 2017
692bc1a
added dependency management for all bouncycastle dependencies, these …
cedricwalter Jul 8, 2017
76a8e53
removed need to set unlimited cipher strength, use reflection to set …
cedricwalter Jul 8, 2017
d6a0bdd
corrected a typo but did not change hash, (previous version was org.b…
cedricwalter Jul 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

76 changes: 74 additions & 2 deletions common/pom.xml
View file
Open in desktop
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