Skip to content

Commit c4d10b3

Browse files
luigimaluigima
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/main/java/multichain/command/MultiChainCommand.java
2 parents 249477c + 54eb7a1 commit c4d10b3

File tree

72 files changed

+5790
-4524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+5790
-4524
lines changed

‎README.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,24 @@ https://github.com/SimplyUb/MultiChainJavaAPI
1414
These compilation instructions have been tested on Windows 7.0 and Ubuntu 12.4 x64 only with Java 1.7.0_80
1515

1616

17-
## Dependecies
17+
## Dependencies
1818

1919
* Java 1.7.0 is needed, upper version should be compatible.
2020
* All other dependencies are managed by Maven.
2121

22+
## Installation
23+
```
24+
.\install.sh
25+
```
26+
or manually :
27+
```
28+
mvn clean install
29+
```
30+
will create 2 jar files in local repository :
31+
- version : light version
32+
- version : full directly included all dependencies
33+
34+
2235
## Architecture
2336

2437
### Global Architecture

‎install.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
mvn clean install

‎pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>MultiChainJavaAPI</groupId>
4+
<groupId>com.multichainjavaapi</groupId>
55
<artifactId>MultiChainJavaAPI</artifactId>
6-
<version>0.4.11-SNAPSHOT</version>
6+
<version>0.4.15-SNAPSHOT</version>
77

88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -32,6 +32,22 @@
3232
<target>${java.version}</target>
3333
</configuration>
3434
</plugin>
35+
<plugin>
36+
<artifactId>maven-assembly-plugin</artifactId>
37+
<executions>
38+
<execution>
39+
<phase>package</phase>
40+
<goals>
41+
<goal>single</goal>
42+
</goals>
43+
</execution>
44+
</executions>
45+
<configuration>
46+
<descriptorRefs>
47+
<descriptorRef>jar-with-dependencies</descriptorRef>
48+
</descriptorRefs>
49+
</configuration>
50+
</plugin>
3551
</plugins>
3652
</build>
3753
<dependencies>

0 commit comments

Comments
 (0)